diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-24 16:06:58 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-24 16:06:58 +0000 |
commit | ac9ba5eb32073c16608acaa04324e7dc46d303d6 (patch) | |
tree | a88c9a76a24787c1eac988f318e938406a288677 /crates | |
parent | b0581c2403f49c68738c039065fa2cfc41345738 (diff) | |
parent | 434f108adad75b7c5e25db745a9f9fefa5cdaa31 (diff) |
Merge #2387
2387: Simplify r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_cli/src/analysis_stats.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir/src/code_model.rs | 4 | ||||
-rw-r--r-- | crates/ra_hir/src/expr.rs | 6 | ||||
-rw-r--r-- | crates/ra_hir/src/test_db.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir/src/ty/infer.rs | 4 | ||||
-rw-r--r-- | crates/ra_hir_def/src/adt.rs | 6 | ||||
-rw-r--r-- | crates/ra_hir_def/src/body.rs | 28 | ||||
-rw-r--r-- | crates/ra_hir_def/src/body/scope.rs | 4 | ||||
-rw-r--r-- | crates/ra_hir_def/src/lang_item.rs | 5 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres.rs | 32 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres/collector.rs | 5 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres/raw.rs | 20 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres/tests.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/resolver.rs | 8 | ||||
-rw-r--r-- | crates/ra_hir_def/src/trace.rs | 42 |
15 files changed, 74 insertions, 96 deletions
diff --git a/crates/ra_cli/src/analysis_stats.rs b/crates/ra_cli/src/analysis_stats.rs index 9cd21e4b6..135de7ffb 100644 --- a/crates/ra_cli/src/analysis_stats.rs +++ b/crates/ra_cli/src/analysis_stats.rs | |||
@@ -109,7 +109,7 @@ pub fn run( | |||
109 | } | 109 | } |
110 | let body = f.body(db); | 110 | let body = f.body(db); |
111 | let inference_result = f.infer(db); | 111 | let inference_result = f.infer(db); |
112 | for (expr_id, _) in body.exprs() { | 112 | for (expr_id, _) in body.exprs.iter() { |
113 | let ty = &inference_result[expr_id]; | 113 | let ty = &inference_result[expr_id]; |
114 | num_exprs += 1; | 114 | num_exprs += 1; |
115 | if let Ty::Unknown = ty { | 115 | if let Ty::Unknown = ty { |
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index b3e2ff1c2..9f06b147c 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs | |||
@@ -62,7 +62,7 @@ impl Crate { | |||
62 | } | 62 | } |
63 | 63 | ||
64 | pub fn root_module(self, db: &impl DefDatabase) -> Option<Module> { | 64 | pub fn root_module(self, db: &impl DefDatabase) -> Option<Module> { |
65 | let module_id = db.crate_def_map(self.crate_id).root(); | 65 | let module_id = db.crate_def_map(self.crate_id).root; |
66 | Some(Module::new(self, module_id)) | 66 | Some(Module::new(self, module_id)) |
67 | } | 67 | } |
68 | 68 | ||
@@ -195,7 +195,7 @@ impl Module { | |||
195 | /// in the module tree of any target in `Cargo.toml`. | 195 | /// in the module tree of any target in `Cargo.toml`. |
196 | pub fn crate_root(self, db: &impl DefDatabase) -> Module { | 196 | pub fn crate_root(self, db: &impl DefDatabase) -> Module { |
197 | let def_map = db.crate_def_map(self.id.krate); | 197 | let def_map = db.crate_def_map(self.id.krate); |
198 | self.with_module_id(def_map.root()) | 198 | self.with_module_id(def_map.root) |
199 | } | 199 | } |
200 | 200 | ||
201 | /// Finds a child module with the specified name. | 201 | /// Finds a child module with the specified name. |
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index 6b703d8b4..43fedde7a 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs | |||
@@ -44,15 +44,15 @@ impl<'a, 'b> ExprValidator<'a, 'b> { | |||
44 | pub(crate) fn validate_body(&mut self, db: &impl HirDatabase) { | 44 | pub(crate) fn validate_body(&mut self, db: &impl HirDatabase) { |
45 | let body = self.func.body(db); | 45 | let body = self.func.body(db); |
46 | 46 | ||
47 | for e in body.exprs() { | 47 | for e in body.exprs.iter() { |
48 | if let (id, Expr::RecordLit { path, fields, spread }) = e { | 48 | if let (id, Expr::RecordLit { path, fields, spread }) = e { |
49 | self.validate_record_literal(id, path, fields, *spread, db); | 49 | self.validate_record_literal(id, path, fields, *spread, db); |
50 | } | 50 | } |
51 | } | 51 | } |
52 | 52 | ||
53 | let body_expr = &body[body.body_expr()]; | 53 | let body_expr = &body[body.body_expr]; |
54 | if let Expr::Block { statements: _, tail: Some(t) } = body_expr { | 54 | if let Expr::Block { statements: _, tail: Some(t) } = body_expr { |
55 | self.validate_results_in_tail_expr(body.body_expr(), *t, db); | 55 | self.validate_results_in_tail_expr(body.body_expr, *t, db); |
56 | } | 56 | } |
57 | } | 57 | } |
58 | 58 | ||
diff --git a/crates/ra_hir/src/test_db.rs b/crates/ra_hir/src/test_db.rs index 03c7ac155..efee2f658 100644 --- a/crates/ra_hir/src/test_db.rs +++ b/crates/ra_hir/src/test_db.rs | |||
@@ -80,7 +80,7 @@ impl TestDB { | |||
80 | let crate_graph = self.crate_graph(); | 80 | let crate_graph = self.crate_graph(); |
81 | for krate in crate_graph.iter().next() { | 81 | for krate in crate_graph.iter().next() { |
82 | let crate_def_map = self.crate_def_map(krate); | 82 | let crate_def_map = self.crate_def_map(krate); |
83 | for module_id in crate_def_map.modules() { | 83 | for (module_id, _) in crate_def_map.modules.iter() { |
84 | let module_id = ModuleId { krate, module_id }; | 84 | let module_id = ModuleId { krate, module_id }; |
85 | let module = crate::Module::from(module_id); | 85 | let module = crate::Module::from(module_id); |
86 | module.diagnostics( | 86 | module.diagnostics( |
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index 471bdc387..2e744e5ec 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs | |||
@@ -565,7 +565,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
565 | 565 | ||
566 | fn collect_fn(&mut self, data: &FunctionData) { | 566 | fn collect_fn(&mut self, data: &FunctionData) { |
567 | let body = Arc::clone(&self.body); // avoid borrow checker problem | 567 | let body = Arc::clone(&self.body); // avoid borrow checker problem |
568 | for (type_ref, pat) in data.params.iter().zip(body.params()) { | 568 | for (type_ref, pat) in data.params.iter().zip(body.params.iter()) { |
569 | let ty = self.make_ty(type_ref); | 569 | let ty = self.make_ty(type_ref); |
570 | 570 | ||
571 | self.infer_pat(*pat, &ty, BindingMode::default()); | 571 | self.infer_pat(*pat, &ty, BindingMode::default()); |
@@ -574,7 +574,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
574 | } | 574 | } |
575 | 575 | ||
576 | fn infer_body(&mut self) { | 576 | fn infer_body(&mut self) { |
577 | self.infer_expr(self.body.body_expr(), &Expectation::has_type(self.return_ty.clone())); | 577 | self.infer_expr(self.body.body_expr, &Expectation::has_type(self.return_ty.clone())); |
578 | } | 578 | } |
579 | 579 | ||
580 | fn resolve_into_iter_item(&self) -> Option<TypeAlias> { | 580 | fn resolve_into_iter_item(&self) -> Option<TypeAlias> { |
diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs index 20e9a1eb5..a43f553aa 100644 --- a/crates/ra_hir_def/src/adt.rs +++ b/crates/ra_hir_def/src/adt.rs | |||
@@ -95,7 +95,7 @@ fn lower_enum( | |||
95 | name: var.name().map(|it| it.as_name()), | 95 | name: var.name().map(|it| it.as_name()), |
96 | variant_data: Arc::new(VariantData::new(var.kind())), | 96 | variant_data: Arc::new(VariantData::new(var.kind())), |
97 | }, | 97 | }, |
98 | ) | 98 | ); |
99 | } | 99 | } |
100 | } | 100 | } |
101 | 101 | ||
@@ -160,7 +160,7 @@ fn lower_struct( | |||
160 | name: Name::new_tuple_field(i), | 160 | name: Name::new_tuple_field(i), |
161 | type_ref: TypeRef::from_ast_opt(fd.type_ref()), | 161 | type_ref: TypeRef::from_ast_opt(fd.type_ref()), |
162 | }, | 162 | }, |
163 | ) | 163 | ); |
164 | } | 164 | } |
165 | StructKind::Tuple | 165 | StructKind::Tuple |
166 | } | 166 | } |
@@ -172,7 +172,7 @@ fn lower_struct( | |||
172 | name: fd.name().map(|n| n.as_name()).unwrap_or_else(Name::missing), | 172 | name: fd.name().map(|n| n.as_name()).unwrap_or_else(Name::missing), |
173 | type_ref: TypeRef::from_ast_opt(fd.ascribed_type()), | 173 | type_ref: TypeRef::from_ast_opt(fd.ascribed_type()), |
174 | }, | 174 | }, |
175 | ) | 175 | ); |
176 | } | 176 | } |
177 | StructKind::Record | 177 | StructKind::Record |
178 | } | 178 | } |
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs index c06997cf1..45a36d793 100644 --- a/crates/ra_hir_def/src/body.rs +++ b/crates/ra_hir_def/src/body.rs | |||
@@ -20,7 +20,7 @@ use crate::{ | |||
20 | DefWithBodyId, HasModule, HasSource, Lookup, ModuleId, | 20 | DefWithBodyId, HasModule, HasSource, Lookup, ModuleId, |
21 | }; | 21 | }; |
22 | 22 | ||
23 | pub struct Expander { | 23 | struct Expander { |
24 | crate_def_map: Arc<CrateDefMap>, | 24 | crate_def_map: Arc<CrateDefMap>, |
25 | current_file_id: HirFileId, | 25 | current_file_id: HirFileId, |
26 | hygiene: Hygiene, | 26 | hygiene: Hygiene, |
@@ -28,7 +28,7 @@ pub struct Expander { | |||
28 | } | 28 | } |
29 | 29 | ||
30 | impl Expander { | 30 | impl Expander { |
31 | pub fn new(db: &impl DefDatabase, current_file_id: HirFileId, module: ModuleId) -> Expander { | 31 | fn new(db: &impl DefDatabase, current_file_id: HirFileId, module: ModuleId) -> Expander { |
32 | let crate_def_map = db.crate_def_map(module.krate); | 32 | let crate_def_map = db.crate_def_map(module.krate); |
33 | let hygiene = Hygiene::new(db, current_file_id); | 33 | let hygiene = Hygiene::new(db, current_file_id); |
34 | Expander { crate_def_map, current_file_id, hygiene, module } | 34 | Expander { crate_def_map, current_file_id, hygiene, module } |
@@ -101,17 +101,17 @@ impl Drop for Mark { | |||
101 | /// The body of an item (function, const etc.). | 101 | /// The body of an item (function, const etc.). |
102 | #[derive(Debug, Eq, PartialEq)] | 102 | #[derive(Debug, Eq, PartialEq)] |
103 | pub struct Body { | 103 | pub struct Body { |
104 | exprs: Arena<ExprId, Expr>, | 104 | pub exprs: Arena<ExprId, Expr>, |
105 | pats: Arena<PatId, Pat>, | 105 | pub pats: Arena<PatId, Pat>, |
106 | /// The patterns for the function's parameters. While the parameter types are | 106 | /// The patterns for the function's parameters. While the parameter types are |
107 | /// part of the function signature, the patterns are not (they don't change | 107 | /// part of the function signature, the patterns are not (they don't change |
108 | /// the external type of the function). | 108 | /// the external type of the function). |
109 | /// | 109 | /// |
110 | /// If this `Body` is for the body of a constant, this will just be | 110 | /// If this `Body` is for the body of a constant, this will just be |
111 | /// empty. | 111 | /// empty. |
112 | params: Vec<PatId>, | 112 | pub params: Vec<PatId>, |
113 | /// The `ExprId` of the actual body expression. | 113 | /// The `ExprId` of the actual body expression. |
114 | body_expr: ExprId, | 114 | pub body_expr: ExprId, |
115 | } | 115 | } |
116 | 116 | ||
117 | pub type ExprPtr = Either<AstPtr<ast::Expr>, AstPtr<ast::RecordField>>; | 117 | pub type ExprPtr = Either<AstPtr<ast::Expr>, AstPtr<ast::RecordField>>; |
@@ -182,22 +182,6 @@ impl Body { | |||
182 | ) -> (Body, BodySourceMap) { | 182 | ) -> (Body, BodySourceMap) { |
183 | lower::lower(db, expander, params, body) | 183 | lower::lower(db, expander, params, body) |
184 | } | 184 | } |
185 | |||
186 | pub fn params(&self) -> &[PatId] { | ||
187 | &self.params | ||
188 | } | ||
189 | |||
190 | pub fn body_expr(&self) -> ExprId { | ||
191 | self.body_expr | ||
192 | } | ||
193 | |||
194 | pub fn exprs(&self) -> impl Iterator<Item = (ExprId, &Expr)> { | ||
195 | self.exprs.iter() | ||
196 | } | ||
197 | |||
198 | pub fn pats(&self) -> impl Iterator<Item = (PatId, &Pat)> { | ||
199 | self.pats.iter() | ||
200 | } | ||
201 | } | 185 | } |
202 | 186 | ||
203 | impl Index<ExprId> for Body { | 187 | impl Index<ExprId> for Body { |
diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs index 20d707bc4..5240a59d5 100644 --- a/crates/ra_hir_def/src/body/scope.rs +++ b/crates/ra_hir_def/src/body/scope.rs | |||
@@ -54,8 +54,8 @@ impl ExprScopes { | |||
54 | let mut scopes = | 54 | let mut scopes = |
55 | ExprScopes { scopes: Arena::default(), scope_by_expr: FxHashMap::default() }; | 55 | ExprScopes { scopes: Arena::default(), scope_by_expr: FxHashMap::default() }; |
56 | let root = scopes.root_scope(); | 56 | let root = scopes.root_scope(); |
57 | scopes.add_params_bindings(body, root, body.params()); | 57 | scopes.add_params_bindings(body, root, &body.params); |
58 | compute_expr_scopes(body.body_expr(), body, &mut scopes, root); | 58 | compute_expr_scopes(body.body_expr, body, &mut scopes, root); |
59 | scopes | 59 | scopes |
60 | } | 60 | } |
61 | 61 | ||
diff --git a/crates/ra_hir_def/src/lang_item.rs b/crates/ra_hir_def/src/lang_item.rs index 3b9fb0328..f15c23db9 100644 --- a/crates/ra_hir_def/src/lang_item.rs +++ b/crates/ra_hir_def/src/lang_item.rs | |||
@@ -39,8 +39,9 @@ impl LangItems { | |||
39 | let crate_def_map = db.crate_def_map(krate); | 39 | let crate_def_map = db.crate_def_map(krate); |
40 | 40 | ||
41 | crate_def_map | 41 | crate_def_map |
42 | .modules() | 42 | .modules |
43 | .filter_map(|module_id| db.module_lang_items(ModuleId { krate, module_id })) | 43 | .iter() |
44 | .filter_map(|(module_id, _)| db.module_lang_items(ModuleId { krate, module_id })) | ||
44 | .for_each(|it| lang_items.items.extend(it.items.iter().map(|(k, v)| (k.clone(), *v)))); | 45 | .for_each(|it| lang_items.items.extend(it.items.iter().map(|(k, v)| (k.clone(), *v)))); |
45 | 46 | ||
46 | Arc::new(lang_items) | 47 | Arc::new(lang_items) |
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index 5919771b0..2359386c2 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs | |||
@@ -80,16 +80,16 @@ use crate::{ | |||
80 | /// Contains all top-level defs from a macro-expanded crate | 80 | /// Contains all top-level defs from a macro-expanded crate |
81 | #[derive(Debug, PartialEq, Eq)] | 81 | #[derive(Debug, PartialEq, Eq)] |
82 | pub struct CrateDefMap { | 82 | pub struct CrateDefMap { |
83 | krate: CrateId, | 83 | pub root: LocalModuleId, |
84 | edition: Edition, | 84 | pub modules: Arena<LocalModuleId, ModuleData>, |
85 | pub(crate) krate: CrateId, | ||
85 | /// The prelude module for this crate. This either comes from an import | 86 | /// The prelude module for this crate. This either comes from an import |
86 | /// marked with the `prelude_import` attribute, or (in the normal case) from | 87 | /// marked with the `prelude_import` attribute, or (in the normal case) from |
87 | /// a dependency (`std` or `core`). | 88 | /// a dependency (`std` or `core`). |
88 | prelude: Option<ModuleId>, | 89 | pub(crate) prelude: Option<ModuleId>, |
89 | extern_prelude: FxHashMap<Name, ModuleDefId>, | 90 | pub(crate) extern_prelude: FxHashMap<Name, ModuleDefId>, |
90 | root: LocalModuleId, | ||
91 | modules: Arena<LocalModuleId, ModuleData>, | ||
92 | 91 | ||
92 | edition: Edition, | ||
93 | diagnostics: Vec<DefDiagnostic>, | 93 | diagnostics: Vec<DefDiagnostic>, |
94 | } | 94 | } |
95 | 95 | ||
@@ -229,22 +229,6 @@ impl CrateDefMap { | |||
229 | Arc::new(def_map) | 229 | Arc::new(def_map) |
230 | } | 230 | } |
231 | 231 | ||
232 | pub fn krate(&self) -> CrateId { | ||
233 | self.krate | ||
234 | } | ||
235 | |||
236 | pub fn root(&self) -> LocalModuleId { | ||
237 | self.root | ||
238 | } | ||
239 | |||
240 | pub fn prelude(&self) -> Option<ModuleId> { | ||
241 | self.prelude | ||
242 | } | ||
243 | |||
244 | pub fn extern_prelude(&self) -> &FxHashMap<Name, ModuleDefId> { | ||
245 | &self.extern_prelude | ||
246 | } | ||
247 | |||
248 | pub fn add_diagnostics( | 232 | pub fn add_diagnostics( |
249 | &self, | 233 | &self, |
250 | db: &impl DefDatabase, | 234 | db: &impl DefDatabase, |
@@ -254,10 +238,6 @@ impl CrateDefMap { | |||
254 | self.diagnostics.iter().for_each(|it| it.add_to(db, module, sink)) | 238 | self.diagnostics.iter().for_each(|it| it.add_to(db, module, sink)) |
255 | } | 239 | } |
256 | 240 | ||
257 | pub fn modules(&self) -> impl Iterator<Item = LocalModuleId> + '_ { | ||
258 | self.modules.iter().map(|(id, _data)| id) | ||
259 | } | ||
260 | |||
261 | pub fn modules_for_file(&self, file_id: FileId) -> impl Iterator<Item = LocalModuleId> + '_ { | 241 | pub fn modules_for_file(&self, file_id: FileId) -> impl Iterator<Item = LocalModuleId> + '_ { |
262 | self.modules | 242 | self.modules |
263 | .iter() | 243 | .iter() |
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index df01a20e1..41becf8df 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs | |||
@@ -1,4 +1,7 @@ | |||
1 | //! FIXME: write short doc here | 1 | //! The core of the module-level name resolution algorithm. |
2 | //! | ||
3 | //! `DefCollector::collect` contains the fixed-point iteration loop which | ||
4 | //! resolves imports and expands macros. | ||
2 | 5 | ||
3 | use hir_expand::{ | 6 | use hir_expand::{ |
4 | builtin_macro::find_builtin_macro, | 7 | builtin_macro::find_builtin_macro, |
diff --git a/crates/ra_hir_def/src/nameres/raw.rs b/crates/ra_hir_def/src/nameres/raw.rs index 2ec84f2cc..401af031c 100644 --- a/crates/ra_hir_def/src/nameres/raw.rs +++ b/crates/ra_hir_def/src/nameres/raw.rs | |||
@@ -22,7 +22,8 @@ use ra_syntax::{ | |||
22 | use test_utils::tested_by; | 22 | use test_utils::tested_by; |
23 | 23 | ||
24 | use crate::{ | 24 | use crate::{ |
25 | attr::Attrs, db::DefDatabase, path::Path, FileAstId, HirFileId, LocalImportId, Source, | 25 | attr::Attrs, db::DefDatabase, path::Path, trace::Trace, FileAstId, HirFileId, LocalImportId, |
26 | Source, | ||
26 | }; | 27 | }; |
27 | 28 | ||
28 | /// `RawItems` is a set of top-level items in a file (except for impls). | 29 | /// `RawItems` is a set of top-level items in a file (except for impls). |
@@ -48,10 +49,6 @@ pub struct ImportSourceMap { | |||
48 | type ImportSourcePtr = Either<AstPtr<ast::UseTree>, AstPtr<ast::ExternCrateItem>>; | 49 | type ImportSourcePtr = Either<AstPtr<ast::UseTree>, AstPtr<ast::ExternCrateItem>>; |
49 | 50 | ||
50 | impl ImportSourceMap { | 51 | impl ImportSourceMap { |
51 | fn insert(&mut self, import: LocalImportId, ptr: ImportSourcePtr) { | ||
52 | self.map.insert(import, ptr) | ||
53 | } | ||
54 | |||
55 | pub fn get(&self, import: LocalImportId) -> ImportSourcePtr { | 52 | pub fn get(&self, import: LocalImportId) -> ImportSourcePtr { |
56 | self.map[import].clone() | 53 | self.map[import].clone() |
57 | } | 54 | } |
@@ -72,7 +69,7 @@ impl RawItems { | |||
72 | let mut collector = RawItemsCollector { | 69 | let mut collector = RawItemsCollector { |
73 | raw_items: RawItems::default(), | 70 | raw_items: RawItems::default(), |
74 | source_ast_id_map: db.ast_id_map(file_id), | 71 | source_ast_id_map: db.ast_id_map(file_id), |
75 | source_map: ImportSourceMap::default(), | 72 | imports: Trace::new(), |
76 | file_id, | 73 | file_id, |
77 | hygiene: Hygiene::new(db, file_id), | 74 | hygiene: Hygiene::new(db, file_id), |
78 | }; | 75 | }; |
@@ -83,7 +80,11 @@ impl RawItems { | |||
83 | collector.process_module(None, item_list); | 80 | collector.process_module(None, item_list); |
84 | } | 81 | } |
85 | } | 82 | } |
86 | (Arc::new(collector.raw_items), Arc::new(collector.source_map)) | 83 | let mut raw_items = collector.raw_items; |
84 | let (arena, map) = collector.imports.into_arena_and_map(); | ||
85 | raw_items.imports = arena; | ||
86 | let source_map = ImportSourceMap { map }; | ||
87 | (Arc::new(raw_items), Arc::new(source_map)) | ||
87 | } | 88 | } |
88 | 89 | ||
89 | pub(super) fn items(&self) -> &[RawItem] { | 90 | pub(super) fn items(&self) -> &[RawItem] { |
@@ -207,8 +208,8 @@ pub(super) struct ImplData { | |||
207 | 208 | ||
208 | struct RawItemsCollector { | 209 | struct RawItemsCollector { |
209 | raw_items: RawItems, | 210 | raw_items: RawItems, |
211 | imports: Trace<LocalImportId, ImportData, ImportSourcePtr>, | ||
210 | source_ast_id_map: Arc<AstIdMap>, | 212 | source_ast_id_map: Arc<AstIdMap>, |
211 | source_map: ImportSourceMap, | ||
212 | file_id: HirFileId, | 213 | file_id: HirFileId, |
213 | hygiene: Hygiene, | 214 | hygiene: Hygiene, |
214 | } | 215 | } |
@@ -392,8 +393,7 @@ impl RawItemsCollector { | |||
392 | data: ImportData, | 393 | data: ImportData, |
393 | source: ImportSourcePtr, | 394 | source: ImportSourcePtr, |
394 | ) { | 395 | ) { |
395 | let import = self.raw_items.imports.alloc(data); | 396 | let import = self.imports.alloc(|| source, || data); |
396 | self.source_map.insert(import, source); | ||
397 | self.push_item(current_module, attrs, RawItemKind::Import(import)) | 397 | self.push_item(current_module, attrs, RawItemKind::Import(import)) |
398 | } | 398 | } |
399 | 399 | ||
diff --git a/crates/ra_hir_def/src/nameres/tests.rs b/crates/ra_hir_def/src/nameres/tests.rs index f0b86af7c..f502f1cb3 100644 --- a/crates/ra_hir_def/src/nameres/tests.rs +++ b/crates/ra_hir_def/src/nameres/tests.rs | |||
@@ -25,7 +25,7 @@ fn compute_crate_def_map(fixture: &str) -> Arc<CrateDefMap> { | |||
25 | 25 | ||
26 | fn render_crate_def_map(map: &CrateDefMap) -> String { | 26 | fn render_crate_def_map(map: &CrateDefMap) -> String { |
27 | let mut buf = String::new(); | 27 | let mut buf = String::new(); |
28 | go(&mut buf, map, "\ncrate", map.root()); | 28 | go(&mut buf, map, "\ncrate", map.root); |
29 | return buf.trim().to_string(); | 29 | return buf.trim().to_string(); |
30 | 30 | ||
31 | fn go(buf: &mut String, map: &CrateDefMap, path: &str, module: LocalModuleId) { | 31 | fn go(buf: &mut String, map: &CrateDefMap, path: &str, module: LocalModuleId) { |
diff --git a/crates/ra_hir_def/src/resolver.rs b/crates/ra_hir_def/src/resolver.rs index 7182b8a4d..c24a9b165 100644 --- a/crates/ra_hir_def/src/resolver.rs +++ b/crates/ra_hir_def/src/resolver.rs | |||
@@ -321,7 +321,7 @@ impl Resolver { | |||
321 | let mut traits = FxHashSet::default(); | 321 | let mut traits = FxHashSet::default(); |
322 | for scope in &self.scopes { | 322 | for scope in &self.scopes { |
323 | if let Scope::ModuleScope(m) = scope { | 323 | if let Scope::ModuleScope(m) = scope { |
324 | if let Some(prelude) = m.crate_def_map.prelude() { | 324 | if let Some(prelude) = m.crate_def_map.prelude { |
325 | let prelude_def_map = db.crate_def_map(prelude.krate); | 325 | let prelude_def_map = db.crate_def_map(prelude.krate); |
326 | traits.extend(prelude_def_map[prelude.module_id].scope.traits()); | 326 | traits.extend(prelude_def_map[prelude.module_id].scope.traits()); |
327 | } | 327 | } |
@@ -340,7 +340,7 @@ impl Resolver { | |||
340 | } | 340 | } |
341 | 341 | ||
342 | pub fn krate(&self) -> Option<CrateId> { | 342 | pub fn krate(&self) -> Option<CrateId> { |
343 | self.module().map(|t| t.0.krate()) | 343 | self.module().map(|t| t.0.krate) |
344 | } | 344 | } |
345 | 345 | ||
346 | pub fn where_predicates_in_scope<'a>( | 346 | pub fn where_predicates_in_scope<'a>( |
@@ -395,10 +395,10 @@ impl Scope { | |||
395 | m.crate_def_map[m.module_id].scope.legacy_macros().for_each(|(name, macro_)| { | 395 | m.crate_def_map[m.module_id].scope.legacy_macros().for_each(|(name, macro_)| { |
396 | f(name.clone(), ScopeDef::PerNs(PerNs::macros(macro_))); | 396 | f(name.clone(), ScopeDef::PerNs(PerNs::macros(macro_))); |
397 | }); | 397 | }); |
398 | m.crate_def_map.extern_prelude().iter().for_each(|(name, &def)| { | 398 | m.crate_def_map.extern_prelude.iter().for_each(|(name, &def)| { |
399 | f(name.clone(), ScopeDef::PerNs(PerNs::types(def.into()))); | 399 | f(name.clone(), ScopeDef::PerNs(PerNs::types(def.into()))); |
400 | }); | 400 | }); |
401 | if let Some(prelude) = m.crate_def_map.prelude() { | 401 | if let Some(prelude) = m.crate_def_map.prelude { |
402 | let prelude_def_map = db.crate_def_map(prelude.krate); | 402 | let prelude_def_map = db.crate_def_map(prelude.krate); |
403 | prelude_def_map[prelude.module_id].scope.entries().for_each(|(name, res)| { | 403 | prelude_def_map[prelude.module_id].scope.entries().for_each(|(name, res)| { |
404 | f(name.clone(), ScopeDef::PerNs(res.def)); | 404 | f(name.clone(), ScopeDef::PerNs(res.def)); |
diff --git a/crates/ra_hir_def/src/trace.rs b/crates/ra_hir_def/src/trace.rs index fc26f5a48..2bcd707bc 100644 --- a/crates/ra_hir_def/src/trace.rs +++ b/crates/ra_hir_def/src/trace.rs | |||
@@ -12,38 +12,48 @@ | |||
12 | use ra_arena::{map::ArenaMap, Arena, ArenaId, RawId}; | 12 | use ra_arena::{map::ArenaMap, Arena, ArenaId, RawId}; |
13 | 13 | ||
14 | pub(crate) struct Trace<ID: ArenaId, T, V> { | 14 | pub(crate) struct Trace<ID: ArenaId, T, V> { |
15 | for_arena: bool, | 15 | arena: Option<Arena<ID, T>>, |
16 | arena: Arena<ID, T>, | 16 | map: Option<ArenaMap<ID, V>>, |
17 | map: ArenaMap<ID, V>, | ||
18 | len: u32, | 17 | len: u32, |
19 | } | 18 | } |
20 | 19 | ||
21 | impl<ID: ra_arena::ArenaId, T, V> Trace<ID, T, V> { | 20 | impl<ID: ra_arena::ArenaId + Copy, T, V> Trace<ID, T, V> { |
21 | pub(crate) fn new() -> Trace<ID, T, V> { | ||
22 | Trace { arena: Some(Arena::default()), map: Some(ArenaMap::default()), len: 0 } | ||
23 | } | ||
24 | |||
22 | pub(crate) fn new_for_arena() -> Trace<ID, T, V> { | 25 | pub(crate) fn new_for_arena() -> Trace<ID, T, V> { |
23 | Trace { for_arena: true, arena: Arena::default(), map: ArenaMap::default(), len: 0 } | 26 | Trace { arena: Some(Arena::default()), map: None, len: 0 } |
24 | } | 27 | } |
25 | 28 | ||
26 | pub(crate) fn new_for_map() -> Trace<ID, T, V> { | 29 | pub(crate) fn new_for_map() -> Trace<ID, T, V> { |
27 | Trace { for_arena: false, arena: Arena::default(), map: ArenaMap::default(), len: 0 } | 30 | Trace { arena: None, map: Some(ArenaMap::default()), len: 0 } |
28 | } | 31 | } |
29 | 32 | ||
30 | pub(crate) fn alloc(&mut self, value: impl Fn() -> V, data: impl Fn() -> T) { | 33 | pub(crate) fn alloc(&mut self, value: impl FnOnce() -> V, data: impl FnOnce() -> T) -> ID { |
31 | if self.for_arena { | 34 | let id = if let Some(arena) = &mut self.arena { |
32 | self.arena.alloc(data()); | 35 | arena.alloc(data()) |
33 | } else { | 36 | } else { |
34 | let id = ID::from_raw(RawId::from(self.len)); | 37 | let id = ID::from_raw(RawId::from(self.len)); |
35 | self.len += 1; | 38 | self.len += 1; |
36 | self.map.insert(id, value()); | 39 | id |
40 | }; | ||
41 | |||
42 | if let Some(map) = &mut self.map { | ||
43 | map.insert(id, value()); | ||
37 | } | 44 | } |
45 | id | ||
46 | } | ||
47 | |||
48 | pub(crate) fn into_arena(mut self) -> Arena<ID, T> { | ||
49 | self.arena.take().unwrap() | ||
38 | } | 50 | } |
39 | 51 | ||
40 | pub(crate) fn into_arena(self) -> Arena<ID, T> { | 52 | pub(crate) fn into_map(mut self) -> ArenaMap<ID, V> { |
41 | assert!(self.for_arena); | 53 | self.map.take().unwrap() |
42 | self.arena | ||
43 | } | 54 | } |
44 | 55 | ||
45 | pub(crate) fn into_map(self) -> ArenaMap<ID, V> { | 56 | pub(crate) fn into_arena_and_map(mut self) -> (Arena<ID, T>, ArenaMap<ID, V>) { |
46 | assert!(!self.for_arena); | 57 | (self.arena.take().unwrap(), self.map.take().unwrap()) |
47 | self.map | ||
48 | } | 58 | } |
49 | } | 59 | } |