diff options
Diffstat (limited to 'crates/hir_def/src/nameres/collector.rs')
| -rw-r--r-- | crates/hir_def/src/nameres/collector.rs | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs index 59b6644c3..386287518 100644 --- a/crates/hir_def/src/nameres/collector.rs +++ b/crates/hir_def/src/nameres/collector.rs | |||
| @@ -1116,17 +1116,20 @@ impl ModCollector<'_, '_> { | |||
| 1116 | &self.item_tree[module.visibility], | 1116 | &self.item_tree[module.visibility], |
| 1117 | ); | 1117 | ); |
| 1118 | 1118 | ||
| 1119 | ModCollector { | 1119 | if let Some(mod_dir) = self.mod_dir.descend_into_definition(&module.name, path_attr) |
| 1120 | def_collector: &mut *self.def_collector, | 1120 | { |
| 1121 | macro_depth: self.macro_depth, | 1121 | ModCollector { |
| 1122 | module_id, | 1122 | def_collector: &mut *self.def_collector, |
| 1123 | file_id: self.file_id, | 1123 | macro_depth: self.macro_depth, |
| 1124 | item_tree: self.item_tree, | 1124 | module_id, |
| 1125 | mod_dir: self.mod_dir.descend_into_definition(&module.name, path_attr), | 1125 | file_id: self.file_id, |
| 1126 | } | 1126 | item_tree: self.item_tree, |
| 1127 | .collect(&*items); | 1127 | mod_dir, |
| 1128 | if is_macro_use { | 1128 | } |
| 1129 | self.import_all_legacy_macros(module_id); | 1129 | .collect(&*items); |
| 1130 | if is_macro_use { | ||
| 1131 | self.import_all_legacy_macros(module_id); | ||
| 1132 | } | ||
| 1130 | } | 1133 | } |
| 1131 | } | 1134 | } |
| 1132 | // out of line module, resolve, parse and recurse | 1135 | // out of line module, resolve, parse and recurse |