diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2025-08-29 17:36:10 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2025-08-29 18:42:04 +0300 |
| commit | f0dbfadaa2a5e6f6e839d49ed12951f0535ee03c (patch) | |
| tree | e9c2691f61977a320b7e02181f74dbd71c29c6fd /compiler/rustc_resolve/src/diagnostics.rs | |
| parent | 7aec84d485ec1159c3ead3800ba601fd6d1d7869 (diff) | |
| download | rust-f0dbfadaa2a5e6f6e839d49ed12951f0535ee03c.tar.gz rust-f0dbfadaa2a5e6f6e839d49ed12951f0535ee03c.zip | |
resolve: Merge `ExternPreludeEntry::only_item` into `flag_binding`
Diffstat (limited to 'compiler/rustc_resolve/src/diagnostics.rs')
| -rw-r--r-- | compiler/rustc_resolve/src/diagnostics.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_resolve/src/diagnostics.rs b/compiler/rustc_resolve/src/diagnostics.rs index 1ec527e3b81..5dfc4292a38 100644 --- a/compiler/rustc_resolve/src/diagnostics.rs +++ b/compiler/rustc_resolve/src/diagnostics.rs @@ -1846,7 +1846,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { let extern_prelude_ambiguity = || { self.extern_prelude.get(&Macros20NormalizedIdent::new(ident)).is_some_and(|entry| { entry.item_binding.map(|(b, _)| b) == Some(b1) - && entry.flag_binding.get() == Some(b2) + && entry.flag_binding.as_ref().and_then(|pb| pb.get().binding()) == Some(b2) }) }; let (b1, b2, misc1, misc2, swapped) = if b2.span.is_dummy() && !b1.span.is_dummy() { |