diff options
| -rw-r--r-- | compiler/rustc_ast_lowering/src/lib.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_resolve/src/lib.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs index a9950b82928..0ff1efd8165 100644 --- a/compiler/rustc_ast_lowering/src/lib.rs +++ b/compiler/rustc_ast_lowering/src/lib.rs @@ -198,7 +198,7 @@ pub trait ResolverAstLowering { fn next_node_id(&mut self) -> NodeId; - fn trait_map(&mut self) -> NodeMap<Vec<hir::TraitCandidate>>; + fn take_trait_map(&mut self) -> NodeMap<Vec<hir::TraitCandidate>>; fn opt_local_def_id(&self, node: NodeId) -> Option<LocalDefId>; @@ -502,7 +502,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { c.proc_macros.iter().map(|id| self.node_id_to_hir_id[*id].unwrap()).collect(); let mut trait_map: FxHashMap<_, FxHashMap<_, _>> = FxHashMap::default(); - for (k, v) in self.resolver.trait_map().into_iter() { + for (k, v) in self.resolver.take_trait_map().into_iter() { if let Some(Some(hir_id)) = self.node_id_to_hir_id.get(k) { let map = trait_map.entry(hir_id.owner).or_default(); map.insert(hir_id.local_id, v.into_boxed_slice()); diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs index e181b30f0e3..5e009d14832 100644 --- a/compiler/rustc_resolve/src/lib.rs +++ b/compiler/rustc_resolve/src/lib.rs @@ -1140,7 +1140,7 @@ impl ResolverAstLowering for Resolver<'_> { self.next_node_id() } - fn trait_map(&mut self) -> NodeMap<Vec<TraitCandidate>> { + fn take_trait_map(&mut self) -> NodeMap<Vec<TraitCandidate>> { #[cfg(debug_assertions)] { debug_assert!(!self.took_trait_map); |