aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_def/src/nameres/collector.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/hir_def/src/nameres/collector.rs')
-rw-r--r--crates/hir_def/src/nameres/collector.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs
index 0cd61698c..61da56340 100644
--- a/crates/hir_def/src/nameres/collector.rs
+++ b/crates/hir_def/src/nameres/collector.rs
@@ -31,7 +31,7 @@ use crate::{
31 }, 31 },
32 nameres::{ 32 nameres::{
33 diagnostics::DefDiagnostic, mod_resolution::ModDir, path_resolution::ReachedFixedPoint, 33 diagnostics::DefDiagnostic, mod_resolution::ModDir, path_resolution::ReachedFixedPoint,
34 BuiltinShadowMode, CrateDefMap, ModuleData, ModuleOrigin, ResolveMode, 34 BuiltinShadowMode, DefMap, ModuleData, ModuleOrigin, ResolveMode,
35 }, 35 },
36 path::{ImportAlias, ModPath, PathKind}, 36 path::{ImportAlias, ModPath, PathKind},
37 per_ns::PerNs, 37 per_ns::PerNs,
@@ -45,7 +45,7 @@ const GLOB_RECURSION_LIMIT: usize = 100;
45const EXPANSION_DEPTH_LIMIT: usize = 128; 45const EXPANSION_DEPTH_LIMIT: usize = 128;
46const FIXED_POINT_LIMIT: usize = 8192; 46const FIXED_POINT_LIMIT: usize = 8192;
47 47
48pub(super) fn collect_defs(db: &dyn DefDatabase, mut def_map: CrateDefMap) -> CrateDefMap { 48pub(super) fn collect_defs(db: &dyn DefDatabase, mut def_map: DefMap) -> DefMap {
49 let crate_graph = db.crate_graph(); 49 let crate_graph = db.crate_graph();
50 50
51 // populate external prelude 51 // populate external prelude
@@ -210,7 +210,7 @@ struct DefData<'a> {
210/// Walks the tree of module recursively 210/// Walks the tree of module recursively
211struct DefCollector<'a> { 211struct DefCollector<'a> {
212 db: &'a dyn DefDatabase, 212 db: &'a dyn DefDatabase,
213 def_map: CrateDefMap, 213 def_map: DefMap,
214 glob_imports: FxHashMap<LocalModuleId, Vec<(LocalModuleId, Visibility)>>, 214 glob_imports: FxHashMap<LocalModuleId, Vec<(LocalModuleId, Visibility)>>,
215 unresolved_imports: Vec<ImportDirective>, 215 unresolved_imports: Vec<ImportDirective>,
216 resolved_imports: Vec<ImportDirective>, 216 resolved_imports: Vec<ImportDirective>,
@@ -859,7 +859,7 @@ impl DefCollector<'_> {
859 .collect(item_tree.top_level_items()); 859 .collect(item_tree.top_level_items());
860 } 860 }
861 861
862 fn finish(mut self) -> CrateDefMap { 862 fn finish(mut self) -> DefMap {
863 // Emit diagnostics for all remaining unexpanded macros. 863 // Emit diagnostics for all remaining unexpanded macros.
864 864
865 for directive in &self.unexpanded_macros { 865 for directive in &self.unexpanded_macros {
@@ -1474,7 +1474,7 @@ mod tests {
1474 1474
1475 use super::*; 1475 use super::*;
1476 1476
1477 fn do_collect_defs(db: &dyn DefDatabase, def_map: CrateDefMap) -> CrateDefMap { 1477 fn do_collect_defs(db: &dyn DefDatabase, def_map: DefMap) -> DefMap {
1478 let mut collector = DefCollector { 1478 let mut collector = DefCollector {
1479 db, 1479 db,
1480 def_map, 1480 def_map,
@@ -1493,7 +1493,7 @@ mod tests {
1493 collector.def_map 1493 collector.def_map
1494 } 1494 }
1495 1495
1496 fn do_resolve(code: &str) -> CrateDefMap { 1496 fn do_resolve(code: &str) -> DefMap {
1497 let (db, _file_id) = TestDB::with_single_file(&code); 1497 let (db, _file_id) = TestDB::with_single_file(&code);
1498 let krate = db.test_crate(); 1498 let krate = db.test_crate();
1499 1499
@@ -1501,7 +1501,7 @@ mod tests {
1501 let edition = db.crate_graph()[krate].edition; 1501 let edition = db.crate_graph()[krate].edition;
1502 let mut modules: Arena<ModuleData> = Arena::default(); 1502 let mut modules: Arena<ModuleData> = Arena::default();
1503 let root = modules.alloc(ModuleData::default()); 1503 let root = modules.alloc(ModuleData::default());
1504 CrateDefMap { 1504 DefMap {
1505 krate, 1505 krate,
1506 edition, 1506 edition,
1507 extern_prelude: FxHashMap::default(), 1507 extern_prelude: FxHashMap::default(),