XXX: pass Ident in assoc_item, instead of just the name

Author: nnethercote

compiler/rustc_resolve/src/late.rs

@@ -30,7 +30,7 @@ use rustc_session::lint::{self, BuiltinLintDiag};
 use rustc_session::parse::feature_err;
 use rustc_span::source_map::{Spanned, respan};
 use rustc_span::symbol::{Ident, Symbol, kw, sym};
-use rustc_span::{BytePos, Span, SyntaxContext};
+use rustc_span::{BytePos, Span};
 use smallvec::{SmallVec, smallvec};
 use tracing::{debug, instrument, trace};
 
@@ -4776,8 +4776,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
         self.r.traits_in_scope(
             self.current_trait_ref.as_ref().map(|(module, _)| *module),
             &self.parent_scope,
-            ident.span.ctxt(),
-            Some((ident.name, ns)),
+            Some((ident, ns)),
         )
     }
 
@@ -4869,7 +4868,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                 .entry(self.parent_scope.module.nearest_parent_mod().expect_local())
                 .or_insert_with(|| {
                     self.r
-                        .traits_in_scope(None, &self.parent_scope, SyntaxContext::root(), None)
+                        .traits_in_scope(None, &self.parent_scope, None)
                         .into_iter()
                         .filter_map(|tr| {
                             if !tr.def_id.is_local()

compiler/rustc_resolve/src/lib.rs

@@ -1750,8 +1750,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         &mut self,
         current_trait: Option<Module<'ra>>,
         parent_scope: &ParentScope<'ra>,
-        ctxt: SyntaxContext,
-        assoc_item: Option<(Symbol, Namespace)>,
+        assoc_item: Option<(Ident, Namespace)>,
     ) -> Vec<TraitCandidate> {
         let mut found_traits = Vec::new();
 
@@ -1762,6 +1761,11 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             }
         }
 
+        let ctxt = if let Some((ident, _)) = assoc_item {
+            ident.span.ctxt()
+        } else {
+            SyntaxContext::root()
+        };
         self.visit_scopes(ScopeSet::All(TypeNS), parent_scope, ctxt, |this, scope, _, _| {
             match scope {
                 Scope::Module(module, _) => {
@@ -1784,7 +1788,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
     fn traits_in_module(
         &mut self,
         module: Module<'ra>,
-        assoc_item: Option<(Symbol, Namespace)>,
+        assoc_item: Option<(Ident, Namespace)>,
         found_traits: &mut Vec<TraitCandidate>,
     ) {
         module.ensure_traits(self);
@@ -1806,14 +1810,14 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
     fn trait_may_have_item(
         &mut self,
         trait_module: Option<Module<'ra>>,
-        assoc_item: Option<(Symbol, Namespace)>,
+        assoc_item: Option<(Ident, Namespace)>,
     ) -> bool {
         match (trait_module, assoc_item) {
-            (Some(trait_module), Some((name, ns))) => self
+            (Some(trait_module), Some((ident, ns))) => self
                 .resolutions(trait_module)
                 .borrow()
                 .iter()
-                .any(|(key, _name_resolution)| key.ns == ns && key.ident.name == name),
+                .any(|(key, _name_resolution)| key.ns == ns && key.ident.name == ident.name),
             _ => true,
         }
     }