Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 14:03:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use a HashMap instead of Vec

Browse source 
This is no longer enforcing stack discipline, so a Vec isn't necessary
or helpful
This commit is contained in:
Jonas Schievink 2020-06-24 16:26:26 +02:00
parent 59d4640b64
commit 3b50b0b2b6
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/ra_hir_def/src/body/lower.rs
View file

@ -36,6 +36,7 @@ use crate::{
use super::{ExprSource, PatSource}; use super::{ExprSource, PatSource};
use ast::AstChildren; use ast::AstChildren;
use rustc_hash::FxHashMap;
use std::sync::Arc; use std::sync::Arc;
pub(crate) struct LowerCtx { pub(crate) struct LowerCtx {
@ -74,7 +75,11 @@ pub(super) fn lower(
body_expr: dummy_expr_id(), body_expr: dummy_expr_id(),
item_scope: Default::default(), item_scope: Default::default(),
}, },
item_trees: vec![(expander.current_file_id, item_tree)], item_trees: {
let mut map = FxHashMap::default();
map.insert(expander.current_file_id, item_tree);
map
},
expander, expander,
} }
.collect(params, body) .collect(params, body)
@ -87,7 +92,7 @@ struct ExprCollector<'a> {
body: Body, body: Body,
source_map: BodySourceMap, source_map: BodySourceMap,
item_trees: Vec<(HirFileId, Arc<ItemTree>)>, item_trees: FxHashMap<HirFileId, Arc<ItemTree>>,
} }
impl ExprCollector<'_> { impl ExprCollector<'_> {
@ -541,7 +546,7 @@ impl ExprCollector<'_> {
.insert(macro_call, self.expander.current_file_id); .insert(macro_call, self.expander.current_file_id);
let item_tree = self.db.item_tree(self.expander.current_file_id); let item_tree = self.db.item_tree(self.expander.current_file_id);
self.item_trees.push((self.expander.current_file_id, item_tree)); self.item_trees.insert(self.expander.current_file_id, item_tree);
let id = self.collect_expr(expansion); let id = self.collect_expr(expansion);
self.expander.exit(self.db, mark); self.expander.exit(self.db, mark);
id id
@ -557,11 +562,7 @@ impl ExprCollector<'_> {
} }
fn find_inner_item<S: ItemTreeNode>(&self, id: AstId<ast::ModuleItem>) -> FileItemTreeId<S> { fn find_inner_item<S: ItemTreeNode>(&self, id: AstId<ast::ModuleItem>) -> FileItemTreeId<S> {
let index = let tree = &self.item_trees[&id.file_id];
self.item_trees.iter().position(|(file, _)| *file == id.file_id).unwrap_or_else(|| {
panic!("couldn't find item tree for file {:?}", id.file_id);
});
let tree = &self.item_trees[index].1;
// FIXME: This probably breaks with `use` items, since they produce multiple item tree nodes // FIXME: This probably breaks with `use` items, since they produce multiple item tree nodes