diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2025-07-07 00:15:13 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2025-07-17 02:09:01 +0300 |
| commit | 8b8889df2550fac573cbaddb1db1419080118d63 (patch) | |
| tree | 3eb6fb49421262e21093fc140368209f53f2895c /compiler/rustc_resolve/src/diagnostics.rs | |
| parent | 8d7193973f5beede7893969197b1661b43f254be (diff) | |
| download | rust-8b8889df2550fac573cbaddb1db1419080118d63.tar.gz rust-8b8889df2550fac573cbaddb1db1419080118d63.zip | |
resolve: Split `module_map` into two maps for local and extern modules
Diffstat (limited to 'compiler/rustc_resolve/src/diagnostics.rs')
| -rw-r--r-- | compiler/rustc_resolve/src/diagnostics.rs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/compiler/rustc_resolve/src/diagnostics.rs b/compiler/rustc_resolve/src/diagnostics.rs index d263ab25045..9e9ab7356b8 100644 --- a/compiler/rustc_resolve/src/diagnostics.rs +++ b/compiler/rustc_resolve/src/diagnostics.rs @@ -2159,7 +2159,16 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { .keys() .map(|ident| ident.name) .chain( - self.module_map + self.local_module_map + .iter() + .filter(|(_, module)| { + current_module.is_ancestor_of(**module) && current_module != **module + }) + .flat_map(|(_, module)| module.kind.name()), + ) + .chain( + self.extern_module_map + .borrow() .iter() .filter(|(_, module)| { current_module.is_ancestor_of(**module) && current_module != **module |