Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-29 20:46:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

resolve: Cleanup some uses of extern prelude in diagnostics

Browse Source
This commit is contained in:
Vadim Petrochenkov
2025-07-31 20:33:33 +03:00
parent 73096965fb
commit e58e6f857f
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_resolve/src/diagnostics.rs
+2 -2
View File
@@ -1098,7 +1098,7 @@ fn early_lookup_typo_candidate(
}
}
Scope::ExternPrelude => {
suggestions.extend(this.extern_prelude.iter().filter_map(|(ident, _)| {
suggestions.extend(this.extern_prelude.keys().filter_map(|ident| {
let res = Res::Def(DefKind::Mod, CRATE_DEF_ID.to_def_id());
filter_fn(res).then_some(TypoSuggestion::typo_from_ident(*ident, res))
}));
@@ -1411,7 +1411,7 @@ pub(crate) fn lookup_import_candidates<FilterFn>(
);
if lookup_ident.span.at_least_rust_2018() {
for ident in self.extern_prelude.clone().into_keys() {
for &ident in self.extern_prelude.keys() {
if ident.span.from_expansion() {
// Idents are adjusted to the root context before being
// resolved in the extern prelude, so reporting this to the
compiler/rustc_resolve/src/late/diagnostics.rs
+4 -13
View File
@@ -2477,19 +2477,10 @@ fn lookup_typo_candidate(
} else {
// Items from the prelude
if !module.no_implicit_prelude {
let extern_prelude = self.r.extern_prelude.clone();
names.extend(extern_prelude.iter().flat_map(|(ident, _)| {
self.r
.cstore_mut()
.maybe_process_path_extern(self.r.tcx, ident.name)
.and_then(|crate_id| {
let crate_mod =
Res::Def(DefKind::Mod, crate_id.as_def_id());
filter_fn(crate_mod).then(|| {
TypoSuggestion::typo_from_ident(*ident, crate_mod)
})
})
names.extend(self.r.extern_prelude.keys().flat_map(|ident| {
let res = Res::Def(DefKind::Mod, CRATE_DEF_ID.to_def_id());
filter_fn(res)
.then_some(TypoSuggestion::typo_from_ident(*ident, res))
}));
if let Some(prelude) = self.r.prelude {