Do not suggest binding from outside of a macro in macro

Author: estebank

compiler/rustc_resolve/src/diagnostics.rs

@@ -1437,14 +1437,17 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
         suggestion: Option<TypoSuggestion>,
         span: Span,
     ) -> bool {
+        if !span.can_be_used_for_suggestions() {
+            return false;
+        }
         let suggestion = match suggestion {
             None => return false,
             // We shouldn't suggest underscore.
             Some(suggestion) if suggestion.candidate == kw::Underscore => return false,
             Some(suggestion) => suggestion,
         };
         if let Some(def_span) = suggestion.res.opt_def_id().map(|def_id| self.def_span(def_id)) {
-            if span.overlaps(def_span) {
+            if span.overlaps(def_span) || !def_span.can_be_used_for_suggestions() {
                 // Don't suggest typo suggestion for itself like in the following:
                 // error[E0423]: expected function, tuple struct or tuple variant, found struct `X`
                 //   --> $DIR/issue-64792-bad-unicode-ctor.rs:3:14

compiler/rustc_span/src/lib.rs

@@ -604,15 +604,13 @@ impl Span {
             // FIXME: If this span comes from a `derive` macro but it points at code the user wrote,
             // the callsite span and the span will be pointing at different places. It also means that
             // we can safely provide suggestions on this span.
-            ExpnKind::Macro(MacroKind::Attr, _) | ExpnKind::Macro(MacroKind::Derive, _)
+            ExpnKind::Macro(..)
                 if self.parent_callsite().map(|p| (p.lo(), p.hi()))
                     != Some((self.lo(), self.hi())) =>
             {
                 true
             }
-            ExpnKind::Desugaring(DesugaringKind::Resize)
-            | ExpnKind::Macro(MacroKind::Bang, _)
-            | ExpnKind::Desugaring(_) => {
+            ExpnKind::Desugaring(DesugaringKind::Resize) | ExpnKind::Desugaring(_) => {
                 self.parent_callsite().unwrap().can_be_used_for_suggestions()
             }
             ExpnKind::Macro(..) => false,

tests/ui/proc-macro/generate-mod.stderr

@@ -4,8 +4,6 @@ error[E0412]: cannot find type `FromOutside` in the expanded code of procedural
 LL | generate_mod::check!();
    | ^^^^^^^^^^^^^^^^^^^^^^ `FromOutside` not found in expanded code of this procedural macro
    |
-   = help: consider importing this struct:
-           FromOutside
    = note: this error originates in the macro `generate_mod::check` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Outer` in the expanded code of procedural macro `generate_mod::check`
@@ -14,8 +12,6 @@ error[E0412]: cannot find type `Outer` in the expanded code of procedural macro
 LL | generate_mod::check!();
    | ^^^^^^^^^^^^^^^^^^^^^^ `Outer` not found in expanded code of this procedural macro
    |
-   = help: consider importing this struct:
-           Outer
    = note: this error originates in the macro `generate_mod::check` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `FromOutside` in the expanded code of procedural macro `generate_mod::check_attr`

tests/ui/proc-macro/lints_in_proc_macros.rs

@@ -8,7 +8,5 @@ fn main() {
     let foobar = 42;
     bang_proc_macro2!();
     //~^ ERROR cannot find value `foobar2`
-    //~| HELP a local variable with a similar name exists
-    //~| SUGGESTION foobar
     println!("{}", x);
 }

tests/ui/proc-macro/lints_in_proc_macros.stderr

@@ -2,7 +2,7 @@ error[E0425]: cannot find value `foobar2` in the expanded code of procedural mac
   --> $DIR/lints_in_proc_macros.rs:9:5
    |
 LL |     bang_proc_macro2!();
-   |     ^^^^^^^^^^^^^^^^^^^ help: a local variable with a similar name exists: `foobar`
+   |     ^^^^^^^^^^^^^^^^^^^ `foobar2` not found in expanded code of this procedural macro
    |
    = note: this error originates in the macro `bang_proc_macro2` (in Nightly builds, run with -Z macro-backtrace for more info)
 

tests/ui/proc-macro/mixed-site-span.stderr

@@ -10,7 +10,7 @@ error[E0425]: cannot find value `local_use` in the expanded code of procedural m
   --> $DIR/mixed-site-span.rs:13:9
    |
 LL |         proc_macro_rules!();
-   |         ^^^^^^^^^^^^^^^^^^^ help: a local variable with a similar name exists: `local_def`
+   |         ^^^^^^^^^^^^^^^^^^^ `local_use` not found in expanded code of this procedural macro
    |
    = note: this error originates in the macro `proc_macro_rules` (in Nightly builds, run with -Z macro-backtrace for more info)
 

tests/ui/proc-macro/parent-source-spans.stderr

@@ -140,41 +140,32 @@ error[E0425]: cannot find value `ok` in the expanded code of procedural macro `p
   --> $DIR/parent-source-spans.rs:29:5
    |
 LL |     parent_source_spans!($($tokens)*);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: a tuple variant with a similar name exists: `Ok`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `ok` not found in expanded code of this procedural macro
 ...
 LL |     one!("hello", "world");
    |     ---------------------- in this macro invocation
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-   = note: similarly named tuple variant `Ok` defined here
    |
    = note: this error originates in the macro `parent_source_spans` which comes from the expansion of the macro `one` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `ok` in the expanded code of procedural macro `parent_source_spans`
   --> $DIR/parent-source-spans.rs:29:5
    |
 LL |     parent_source_spans!($($tokens)*);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: a tuple variant with a similar name exists: `Ok`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `ok` not found in expanded code of this procedural macro
 ...
 LL |     two!("yay", "rust");
    |     ------------------- in this macro invocation
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-   = note: similarly named tuple variant `Ok` defined here
    |
    = note: this error originates in the macro `parent_source_spans` which comes from the expansion of the macro `two` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `ok` in the expanded code of procedural macro `parent_source_spans`
   --> $DIR/parent-source-spans.rs:29:5
    |
 LL |     parent_source_spans!($($tokens)*);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: a tuple variant with a similar name exists: `Ok`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `ok` not found in expanded code of this procedural macro
 ...
 LL |     three!("hip", "hop");
    |     -------------------- in this macro invocation
-  --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-   = note: similarly named tuple variant `Ok` defined here
    |
    = note: this error originates in the macro `parent_source_spans` which comes from the expansion of the macro `three` (in Nightly builds, run with -Z macro-backtrace for more info)