EII nameres changes

Author: jdonszelmann

compiler/rustc_resolve/src/ident.rs

@@ -296,7 +296,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         ribs: &[Rib<'ra>],
         ignore_binding: Option<NameBinding<'ra>>,
     ) -> Option<LexicalScopeBinding<'ra>> {
-        assert!(ns == TypeNS || ns == ValueNS);
         let orig_ident = ident;
         let (general_span, normalized_span) = if ident.name == kw::SelfUpper {
             // FIXME(jseyfried) improve `Self` hygiene

compiler/rustc_resolve/src/late.rs

@@ -440,6 +440,8 @@ pub(crate) enum PathSource<'a, 'ast, 'ra> {
     ReturnTypeNotation,
     /// Paths from `#[define_opaque]` attributes
     DefineOpaques,
+    /// Resolving a macro
+    Macro,
 }
 
 impl PathSource<'_, '_, '_> {
@@ -456,6 +458,7 @@ impl PathSource<'_, '_, '_> {
             | PathSource::ReturnTypeNotation => ValueNS,
             PathSource::TraitItem(ns, _) => ns,
             PathSource::PreciseCapturingArg(ns) => ns,
+            PathSource::Macro => MacroNS,
         }
     }
 
@@ -471,7 +474,8 @@ impl PathSource<'_, '_, '_> {
             | PathSource::TraitItem(..)
             | PathSource::DefineOpaques
             | PathSource::Delegation
-            | PathSource::PreciseCapturingArg(..) => false,
+            | PathSource::PreciseCapturingArg(..)
+            | PathSource::Macro => false,
         }
     }
 
@@ -513,6 +517,7 @@ impl PathSource<'_, '_, '_> {
             },
             PathSource::ReturnTypeNotation | PathSource::Delegation => "function",
             PathSource::PreciseCapturingArg(..) => "type or const parameter",
+            PathSource::Macro => "macro",
         }
     }
 
@@ -607,6 +612,7 @@ impl PathSource<'_, '_, '_> {
                 Res::Def(DefKind::TyParam, _) | Res::SelfTyParam { .. } | Res::SelfTyAlias { .. }
             ),
             PathSource::PreciseCapturingArg(MacroNS) => false,
+            PathSource::Macro => matches!(res, Res::Def(DefKind::Macro(_), _)),
         }
     }
 
@@ -626,6 +632,7 @@ impl PathSource<'_, '_, '_> {
             (PathSource::TraitItem(..) | PathSource::ReturnTypeNotation, false) => E0576,
             (PathSource::PreciseCapturingArg(..), true) => E0799,
             (PathSource::PreciseCapturingArg(..), false) => E0800,
+            (PathSource::Macro, _) => E0425,
         }
     }
 }
@@ -1051,6 +1058,12 @@ impl<'ast, 'ra, 'tcx> Visitor<'ast> for LateResolutionVisitor<'_, 'ast, 'ra, 'tc
         };
         debug!("(resolving function) entering function");
 
+        if let FnKind::Fn(_, _, f) = fn_kind {
+            for EiiImpl { node_id, eii_macro_path, .. } in &f.eii_impls {
+                self.smart_resolve_path(*node_id, &None, &eii_macro_path, PathSource::Macro);
+            }
+        }
+
         // Create a value rib for the function.
         self.with_rib(ValueNS, RibKind::FnOrCoroutine, |this| {
             // Create a label rib for the function.
@@ -2005,7 +2018,8 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                 | PathSource::TraitItem(..)
                 | PathSource::Type
                 | PathSource::PreciseCapturingArg(..)
-                | PathSource::ReturnTypeNotation => false,
+                | PathSource::ReturnTypeNotation
+                | PathSource::Macro => false,
                 PathSource::Expr(..)
                 | PathSource::Pat
                 | PathSource::Struct(_)
@@ -2759,6 +2773,17 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                     let def_id = self.r.local_def_id(item.id);
                     self.parent_scope.macro_rules = self.r.macro_rules_scopes[&def_id];
                 }
+
+                if let Some(EiiExternTarget { extern_item_path, impl_unsafe: _, span: _ }) =
+                    &macro_def.eii_extern_target
+                {
+                    self.smart_resolve_path(
+                        item.id,
+                        &None,
+                        extern_item_path,
+                        PathSource::Expr(None),
+                    );
+                }
             }
 
             ItemKind::ForeignMod(_) | ItemKind::GlobalAsm(_) => {