Tweak E0412 label for proc-macros

estebank · estebank · commit f219ab5cad6f · 2023-03-15T15:56:46.000Z
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -214,17 +214,29 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
             let item_span = path.last().unwrap().ident.span;
             let sp = item_span.peel_ctxt();
             let ctxt_kind = sp.ctxt().outer_expn_data().kind;
-            let (mod_prefix, mod_str, suggestion) =
+            let (mod_prefix, mod_str, name, mod_label, suggestion) =
                 if let ExpnKind::Macro(MacroKind::Attr | MacroKind::Bang, name) = ctxt_kind
                     && sp.parent_callsite().map(|p| (p.lo(), p.hi())) == Some((sp.lo(), sp.hi()))
             {
                 // This span comes from a proc macro and it doesn't point at user code.
-                (String::new(), format!("the expanded code of procedural macro `{name}`"), None)
+                (
+                    String::new(),
+                    format!("the expanded code of procedural macro `{name}`"),
+                    format!("`{path_str}` "),
+                    format!("expanded code of this procedural macro"),
+                    None,
+                )
             } else if let ExpnKind::Macro(MacroKind::Derive, name) = ctxt_kind
                 && sp.parent_callsite().map(|p| (p.lo(), p.hi())) == Some((sp.lo(), sp.hi()))
             {
                 // This span comes from a `derive` macro and it doesn't point at user code.
-                (String::new(), format!("the expanded code of `derive` macro `{name}`"), None)
+                (
+                    String::new(),
+                    format!("the expanded code of `derive` macro `{name}`"),
+                    format!("`{path_str}` "),
+                    format!("expanded code of this `derive` macro"),
+                    None,
+                )
             } else if path.len() == 1 {
                 debug!(?self.diagnostic_metadata.current_impl_items);
                 debug!(?self.diagnostic_metadata.current_function);
@@ -259,26 +271,31 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
                 } else {
                     None
                 };
-                (String::new(), "this scope".to_string(), suggestion)
+                let s = "this scope".to_string();
+                (String::new(), s.clone(), String::new(), s, suggestion)
             } else if path.len() == 2 && path[0].ident.name == kw::PathRoot {
                 if self.r.tcx.sess.edition() > Edition::Edition2015 {
                     // In edition 2018 onwards, the `::foo` syntax may only pull from the extern prelude
                     // which overrides all other expectations of item type
                     expected = "crate";
-                    (String::new(), "the list of imported crates".to_string(), None)
+                    let s = "the list of imported crates".to_string();
+                    (String::new(), s.clone(), String::new(), s, None)
                 } else {
-                    (String::new(), "the crate root".to_string(), None)
+                    let s = "the crate root".to_string();
+                    (String::new(), s.clone(), String::new(), s, None)
                 }
             } else if path.len() == 2 && path[0].ident.name == kw::Crate {
-                (String::new(), "the crate root".to_string(), None)
+                let s = "the crate root".to_string();
+                (String::new(), s.clone(), String::new(), s, None)
             } else {
                 let mod_path = &path[..path.len() - 1];
                 let mod_prefix = match self.resolve_path(mod_path, Some(TypeNS), None) {
                     PathResult::Module(ModuleOrUniformRoot::Module(module)) => module.res(),
                     _ => None,
                 }
                 .map_or_else(String::new, |res| format!("{} ", res.descr()));
-                (mod_prefix, format!("`{}`", Segment::names_to_string(mod_path)), None)
+                let s = format!("`{}`", Segment::names_to_string(mod_path));
+                (mod_prefix, s.clone(), String::new(), s, None)
             };
 
             let (fallback_label, suggestion) = if path_str == "async"
@@ -302,7 +319,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
                     } else {
                         suggestion
                     };
-                (format!("not found in {mod_str}"), override_suggestion)
+                (format!("{name}not found in {mod_label}"), override_suggestion)
             };
 
             BaseError {
diff --git a/tests/ui/feature-gates/feature-gate-concat_idents2.stderr b/tests/ui/feature-gates/feature-gate-concat_idents2.stderr
@@ -11,7 +11,7 @@ error[E0425]: cannot find value `ab` in the expanded code of procedural macro `c
   --> $DIR/feature-gate-concat_idents2.rs:2:5
    |
 LL |     concat_idents!(a, b);
-   |     ^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `concat_idents`
+   |     ^^^^^^^^^^^^^^^^^^^^ `ab` not found in expanded code of this procedural macro
    |
    = note: this error originates in the macro `concat_idents` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/tests/ui/issues/issue-32950.stderr b/tests/ui/issues/issue-32950.stderr
@@ -8,7 +8,7 @@ error[E0412]: cannot find type `FooBar` in the expanded code of procedural macro
   --> $DIR/issue-32950.rs:5:5
    |
 LL |     concat_idents!(Foo, Bar)
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `concat_idents`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^ `FooBar` not found in expanded code of this procedural macro
    |
    = note: this error originates in the macro `concat_idents` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/tests/ui/macros/issue-100199.stderr b/tests/ui/macros/issue-100199.stderr
@@ -2,7 +2,7 @@ error[E0405]: cannot find trait `MyTrait` in the expanded code of procedural mac
   --> $DIR/issue-100199.rs:1:1
    |
 LL | #[issue_100199::struct_with_bound]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `issue_100199::struct_with_bound`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `crate::MyTrait` not found in expanded code of this procedural macro
    |
    = note: this error originates in the attribute macro `issue_100199::struct_with_bound` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/tests/ui/proc-macro/generate-mod.stderr b/tests/ui/proc-macro/generate-mod.stderr
@@ -2,7 +2,7 @@ error[E0412]: cannot find type `FromOutside` in the expanded code of procedural
   --> $DIR/generate-mod.rs:9:1
    |
 LL | generate_mod::check!();
-   | ^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `generate_mod::check`
+   | ^^^^^^^^^^^^^^^^^^^^^^ `FromOutside` not found in expanded code of this procedural macro
    |
    = help: consider importing this struct:
            FromOutside
@@ -12,7 +12,7 @@ error[E0412]: cannot find type `Outer` in the expanded code of procedural macro
   --> $DIR/generate-mod.rs:9:1
    |
 LL | generate_mod::check!();
-   | ^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `generate_mod::check`
+   | ^^^^^^^^^^^^^^^^^^^^^^ `Outer` not found in expanded code of this procedural macro
    |
    = help: consider importing this struct:
            Outer
@@ -22,15 +22,15 @@ error[E0412]: cannot find type `FromOutside` in the expanded code of procedural
   --> $DIR/generate-mod.rs:12:1
    |
 LL | #[generate_mod::check_attr]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `generate_mod::check_attr`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `FromOutside` not found in expanded code of this procedural macro
    |
    = note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `OuterAttr` in the expanded code of procedural macro `generate_mod::check_attr`
   --> $DIR/generate-mod.rs:12:1
    |
 LL | #[generate_mod::check_attr]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `generate_mod::check_attr`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `OuterAttr` not found in expanded code of this procedural macro
    |
    = note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/tests/ui/proc-macro/issue-38586.stderr b/tests/ui/proc-macro/issue-38586.stderr
@@ -2,7 +2,7 @@ error[E0425]: cannot find value `foo` in the expanded code of `derive` macro `A`
   --> $DIR/issue-38586.rs:6:10
    |
 LL | #[derive(A)]
-   |          ^ not found in the expanded code of `derive` macro `A`
+   |          ^ `foo` not found in expanded code of this `derive` macro
    |
    = note: this error originates in the derive macro `A` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/tests/ui/proc-macro/issue-83510.stderr b/tests/ui/proc-macro/issue-83510.stderr
@@ -2,7 +2,7 @@ error[E0412]: cannot find type `Foo` in the expanded code of procedural macro `i
   --> $DIR/issue-83510.rs:5:1
    |
 LL | issue_83510::dance_like_you_want_to_ice!();
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `issue_83510::dance_like_you_want_to_ice`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Foo` not found in expanded code of this procedural macro
    |
    = note: this error originates in the macro `issue_83510::dance_like_you_want_to_ice` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -18,7 +18,7 @@ error[E0405]: cannot find trait `Baz` in the expanded code of procedural macro `
   --> $DIR/issue-83510.rs:5:1
    |
 LL | issue_83510::dance_like_you_want_to_ice!();
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `issue_83510::dance_like_you_want_to_ice`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Baz` not found in expanded code of this procedural macro
    |
    = note: this error originates in the macro `issue_83510::dance_like_you_want_to_ice` (in Nightly builds, run with -Z macro-backtrace for more info)
 

Original file line number	Diff line number	Diff line change
@@ -11,7 +11,7 @@ error[E0425]: cannot find value `ab` in the expanded code of procedural macro `c
`11`	`11`	`--> $DIR/feature-gate-concat_idents2.rs:2:5`
`12`	`12`	`\|`
`13`	`13`	`LL \| concat_idents!(a, b);`
`14`		- \| ^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `concat_idents`
	`14`	+ \| ^^^^^^^^^^^^^^^^^^^^ `ab` not found in expanded code of this procedural macro
`15`	`15`	`\|`
`16`	`16`	= note: this error originates in the macro `concat_idents` (in Nightly builds, run with -Z macro-backtrace for more info)
`17`	`17`
Original file line number	Diff line number	Diff line change
@@ -8,7 +8,7 @@ error[E0412]: cannot find type `FooBar` in the expanded code of procedural macro
`8`	`8`	`--> $DIR/issue-32950.rs:5:5`
`9`	`9`	`\|`
`10`	`10`	`LL \| concat_idents!(Foo, Bar)`
`11`		- \| ^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `concat_idents`
	`11`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^^ `FooBar` not found in expanded code of this procedural macro
`12`	`12`	`\|`
`13`	`13`	= note: this error originates in the macro `concat_idents` (in Nightly builds, run with -Z macro-backtrace for more info)
`14`	`14`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0405]: cannot find trait `MyTrait` in the expanded code of procedural mac
`2`	`2`	`--> $DIR/issue-100199.rs:1:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[issue_100199::struct_with_bound]`
`5`		- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `issue_100199::struct_with_bound`
	`5`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `crate::MyTrait` not found in expanded code of this procedural macro
`6`	`6`	`\|`
`7`	`7`	= note: this error originates in the attribute macro `issue_100199::struct_with_bound` (in Nightly builds, run with -Z macro-backtrace for more info)
`8`	`8`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0412]: cannot find type `FromOutside` in the expanded code of procedural
`2`	`2`	`--> $DIR/generate-mod.rs:9:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| generate_mod::check!();`
`5`		- \| ^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `generate_mod::check`
	`5`	+ \| ^^^^^^^^^^^^^^^^^^^^^^ `FromOutside` not found in expanded code of this procedural macro
`6`	`6`	`\|`
`7`	`7`	`= help: consider importing this struct:`
`8`	`8`	`FromOutside`
@@ -12,7 +12,7 @@ error[E0412]: cannot find type `Outer` in the expanded code of procedural macro
`12`	`12`	`--> $DIR/generate-mod.rs:9:1`
`13`	`13`	`\|`
`14`	`14`	`LL \| generate_mod::check!();`
`15`		- \| ^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `generate_mod::check`
	`15`	+ \| ^^^^^^^^^^^^^^^^^^^^^^ `Outer` not found in expanded code of this procedural macro
`16`	`16`	`\|`
`17`	`17`	`= help: consider importing this struct:`
`18`	`18`	`Outer`
@@ -22,15 +22,15 @@ error[E0412]: cannot find type `FromOutside` in the expanded code of procedural
`22`	`22`	`--> $DIR/generate-mod.rs:12:1`
`23`	`23`	`\|`
`24`	`24`	`LL \| #[generate_mod::check_attr]`
`25`		- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `generate_mod::check_attr`
	`25`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `FromOutside` not found in expanded code of this procedural macro
`26`	`26`	`\|`
`27`	`27`	= note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
`28`	`28`
`29`	`29`	error[E0412]: cannot find type `OuterAttr` in the expanded code of procedural macro `generate_mod::check_attr`
`30`	`30`	`--> $DIR/generate-mod.rs:12:1`
`31`	`31`	`\|`
`32`	`32`	`LL \| #[generate_mod::check_attr]`
`33`		- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `generate_mod::check_attr`
	`33`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `OuterAttr` not found in expanded code of this procedural macro
`34`	`34`	`\|`
`35`	`35`	= note: this error originates in the attribute macro `generate_mod::check_attr` (in Nightly builds, run with -Z macro-backtrace for more info)
`36`	`36`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0425]: cannot find value `foo` in the expanded code of `derive` macro `A`
`2`	`2`	`--> $DIR/issue-38586.rs:6:10`
`3`	`3`	`\|`
`4`	`4`	`LL \| #[derive(A)]`
`5`		- \| ^ not found in the expanded code of `derive` macro `A`
	`5`	+ \| ^ `foo` not found in expanded code of this `derive` macro
`6`	`6`	`\|`
`7`	`7`	= note: this error originates in the derive macro `A` (in Nightly builds, run with -Z macro-backtrace for more info)
`8`	`8`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0412]: cannot find type `Foo` in the expanded code of procedural macro `i
`2`	`2`	`--> $DIR/issue-83510.rs:5:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| issue_83510::dance_like_you_want_to_ice!();`
`5`		- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `issue_83510::dance_like_you_want_to_ice`
	`5`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Foo` not found in expanded code of this procedural macro
`6`	`6`	`\|`
`7`	`7`	= note: this error originates in the macro `issue_83510::dance_like_you_want_to_ice` (in Nightly builds, run with -Z macro-backtrace for more info)
`8`	`8`
@@ -18,7 +18,7 @@ error[E0405]: cannot find trait `Baz` in the expanded code of procedural macro `
`18`	`18`	`--> $DIR/issue-83510.rs:5:1`
`19`	`19`	`\|`
`20`	`20`	`LL \| issue_83510::dance_like_you_want_to_ice!();`
`21`		- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not found in the expanded code of procedural macro `issue_83510::dance_like_you_want_to_ice`
	`21`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Baz` not found in expanded code of this procedural macro
`22`	`22`	`\|`
`23`	`23`	= note: this error originates in the macro `issue_83510::dance_like_you_want_to_ice` (in Nightly builds, run with -Z macro-backtrace for more info)
`24`	`24`