itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-03 13:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch AstIdMap to hashbrown::HashTable from the raw API

Browse Source 
It's the intended use.
This commit is contained in:
Chayim Refael Friedman 2025-04-25 12:57:13 +03:00
parent 4d95ae52f8
commit f44e01e3d0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/span/src/ast_id.rs
View File

@ -132,7 +132,7 @@ pub struct AstIdMap {
/// Maps stable id to unstable ptr. /// Maps stable id to unstable ptr.
arena: Arena<SyntaxNodePtr>, arena: Arena<SyntaxNodePtr>,
/// Reverse: map ptr to id. /// Reverse: map ptr to id.
map: hashbrown::HashMap<Idx<SyntaxNodePtr>, (), ()>, map: hashbrown::HashTable<Idx<SyntaxNodePtr>>,
} }
impl fmt::Debug for AstIdMap { impl fmt::Debug for AstIdMap {
@ -169,13 +169,13 @@ impl AstIdMap {
TreeOrder::DepthFirst TreeOrder::DepthFirst
} }
}); });
res.map = hashbrown::HashMap::with_capacity_and_hasher(res.arena.len(), ()); res.map = hashbrown::HashTable::with_capacity(res.arena.len());
for (idx, ptr) in res.arena.iter() { for (idx, ptr) in res.arena.iter() {
let hash = hash_ptr(ptr); let hash = hash_ptr(ptr);
match res.map.raw_entry_mut().from_hash(hash, |idx2| *idx2 == idx) { match res.map.entry(hash, |&idx2| idx2 == idx, |&idx| hash_ptr(&res.arena[idx])) {
hashbrown::hash_map::RawEntryMut::Occupied(_) => unreachable!(), hashbrown::hash_table::Entry::Occupied(_) => unreachable!(),
hashbrown::hash_map::RawEntryMut::Vacant(entry) => { hashbrown::hash_table::Entry::Vacant(entry) => {
entry.insert_with_hasher(hash, idx, (), |&idx| hash_ptr(&res.arena[idx])); entry.insert(idx);
} }
} }
} }
@ -196,8 +196,8 @@ impl AstIdMap {
pub fn ast_id_for_ptr<N: AstIdNode>(&self, ptr: AstPtr<N>) -> FileAstId<N> { pub fn ast_id_for_ptr<N: AstIdNode>(&self, ptr: AstPtr<N>) -> FileAstId<N> {
let ptr = ptr.syntax_node_ptr(); let ptr = ptr.syntax_node_ptr();
let hash = hash_ptr(&ptr); let hash = hash_ptr(&ptr);
match self.map.raw_entry().from_hash(hash, |&idx| self.arena[idx] == ptr) { match self.map.find(hash, |&idx| self.arena[idx] == ptr) {
Some((&raw, &())) => FileAstId { Some(&raw) => FileAstId {
raw: ErasedFileAstId(raw.into_raw().into_u32()), raw: ErasedFileAstId(raw.into_raw().into_u32()),
covariant: PhantomData, covariant: PhantomData,
}, },
@ -221,8 +221,8 @@ impl AstIdMap {
fn erased_ast_id(&self, item: &SyntaxNode) -> ErasedFileAstId { fn erased_ast_id(&self, item: &SyntaxNode) -> ErasedFileAstId {
let ptr = SyntaxNodePtr::new(item); let ptr = SyntaxNodePtr::new(item);
let hash = hash_ptr(&ptr); let hash = hash_ptr(&ptr);
match self.map.raw_entry().from_hash(hash, |&idx| self.arena[idx] == ptr) { match self.map.find(hash, |&idx| self.arena[idx] == ptr) {
Some((&idx, &())) => ErasedFileAstId(idx.into_raw().into_u32()), Some(&idx) => ErasedFileAstId(idx.into_raw().into_u32()),
None => panic!( None => panic!(
"Can't find {:?} in AstIdMap:\n{:?}\n source text: {}", "Can't find {:?} in AstIdMap:\n{:?}\n source text: {}",
item, item,