diff options
| author | bors <bors@rust-lang.org> | 2025-09-05 05:50:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-05 05:50:24 +0000 |
| commit | ad85bc524b1ad696e42061ad8338d382dffbdbe5 (patch) | |
| tree | 64bb09729a7626ee6854ae9cc12ee2d458429e2c /compiler/rustc_resolve/src/diagnostics.rs | |
| parent | 91edc3ebccc4daa46c20a93f4709862376da1fdd (diff) | |
| parent | 235dfbab9cb4965a1d23c4d2278923c6ff8e193d (diff) | |
| download | rust-ad85bc524b1ad696e42061ad8338d382dffbdbe5.tar.gz rust-ad85bc524b1ad696e42061ad8338d382dffbdbe5.zip | |
Auto merge of #144737 - petrochenkov:extprelcache, r=davidtwco
resolve: Avoid finalizing extern prelude entries more than once
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 abbacc70b3e..f458a1f17b9 100644 --- a/compiler/rustc_resolve/src/diagnostics.rs +++ b/compiler/rustc_resolve/src/diagnostics.rs @@ -1986,7 +1986,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.as_ref().and_then(|pb| pb.get().binding()) == Some(b2) + && entry.flag_binding.as_ref().and_then(|pb| pb.get().0.binding()) == Some(b2) }) }; let (b1, b2, misc1, misc2, swapped) = if b2.span.is_dummy() && !b1.span.is_dummy() { |