diff options
Diffstat (limited to 'crates/ra_analysis/src/hir/module/mod.rs')
-rw-r--r-- | crates/ra_analysis/src/hir/module/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_analysis/src/hir/module/mod.rs b/crates/ra_analysis/src/hir/module/mod.rs index 5bff11c90..55b6639be 100644 --- a/crates/ra_analysis/src/hir/module/mod.rs +++ b/crates/ra_analysis/src/hir/module/mod.rs | |||
@@ -64,7 +64,7 @@ impl ModuleDescriptor { | |||
64 | module_source: ModuleSource, | 64 | module_source: ModuleSource, |
65 | ) -> Cancelable<Option<ModuleDescriptor>> { | 65 | ) -> Cancelable<Option<ModuleDescriptor>> { |
66 | let source_root_id = db.file_source_root(file_id); | 66 | let source_root_id = db.file_source_root(file_id); |
67 | let module_tree = db._module_tree(source_root_id)?; | 67 | let module_tree = db.module_tree(source_root_id)?; |
68 | 68 | ||
69 | let res = match module_tree.any_module_for_source(module_source) { | 69 | let res = match module_tree.any_module_for_source(module_source) { |
70 | None => None, | 70 | None => None, |
@@ -82,7 +82,7 @@ impl ModuleDescriptor { | |||
82 | source_root_id: SourceRootId, | 82 | source_root_id: SourceRootId, |
83 | module_id: ModuleId, | 83 | module_id: ModuleId, |
84 | ) -> Cancelable<ModuleDescriptor> { | 84 | ) -> Cancelable<ModuleDescriptor> { |
85 | let module_tree = db._module_tree(source_root_id)?; | 85 | let module_tree = db.module_tree(source_root_id)?; |
86 | let res = ModuleDescriptor { | 86 | let res = ModuleDescriptor { |
87 | tree: module_tree, | 87 | tree: module_tree, |
88 | source_root_id, | 88 | source_root_id, |
@@ -148,7 +148,7 @@ impl ModuleDescriptor { | |||
148 | 148 | ||
149 | /// Returns a `ModuleScope`: a set of items, visible in this module. | 149 | /// Returns a `ModuleScope`: a set of items, visible in this module. |
150 | pub(crate) fn scope(&self, db: &impl HirDatabase) -> Cancelable<ModuleScope> { | 150 | pub(crate) fn scope(&self, db: &impl HirDatabase) -> Cancelable<ModuleScope> { |
151 | let item_map = db._item_map(self.source_root_id)?; | 151 | let item_map = db.item_map(self.source_root_id)?; |
152 | let res = item_map.per_module[&self.module_id].clone(); | 152 | let res = item_map.per_module[&self.module_id].clone(); |
153 | Ok(res) | 153 | Ok(res) |
154 | } | 154 | } |