diff options
| author | b-naber <bn263@gmx.de> | 2025-07-11 10:57:54 +0200 |
|---|---|---|
| committer | LorrensP-2158466 <lorrens.pantelis@student.uhasselt.be> | 2025-07-12 15:06:32 +0200 |
| commit | 9ed5378cfd5b6a34000fe5218f94bd14976c3de7 (patch) | |
| tree | 15215c287e2a102e69785153de43222d03d7de20 /compiler/rustc_resolve/src/diagnostics.rs | |
| parent | 2f9c9cede68be26774ea44efc79d0391f1c58af2 (diff) | |
| download | rust-9ed5378cfd5b6a34000fe5218f94bd14976c3de7.tar.gz rust-9ed5378cfd5b6a34000fe5218f94bd14976c3de7.zip | |
replace binding and shadowed_glob on NameResolution with non_glob_binding and glob_binding
Diffstat (limited to 'compiler/rustc_resolve/src/diagnostics.rs')
| -rw-r--r-- | compiler/rustc_resolve/src/diagnostics.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_resolve/src/diagnostics.rs b/compiler/rustc_resolve/src/diagnostics.rs index c4ff5770e76..b2f16fb1dfb 100644 --- a/compiler/rustc_resolve/src/diagnostics.rs +++ b/compiler/rustc_resolve/src/diagnostics.rs @@ -1440,7 +1440,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { |(key, name_resolution)| { if key.ns == TypeNS && key.ident == ident - && let Some(binding) = name_resolution.borrow().binding + && let Some(binding) = name_resolution.borrow().best_binding() { match binding.res() { // No disambiguation needed if the identically named item we @@ -1494,7 +1494,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { return None; }; for (_, resolution) in this.resolutions(m).borrow().iter() { - let Some(binding) = resolution.borrow().binding else { + let Some(binding) = resolution.borrow().best_binding() else { continue; }; let Res::Def(DefKind::Macro(MacroKind::Derive | MacroKind::Attr), def_id) = |