New upstream version 1.58.1+dfsg1

[rustc.git] / src / test / ui / macros / restricted-shadowing-modern.stderr

diff --git a/src/test/ui/macros/restricted-shadowing-modern.stderr b/src/test/ui/macros/restricted-shadowing-modern.stderr
index 12075d42b9a7cecb069afac97587bca070fb0b40..b169e63132e450eafef64bc0ba7e3c60c69a7909 100644 (file)
--- a/src/test/ui/macros/restricted-shadowing-modern.stderr
+++ b/src/test/ui/macros/restricted-shadowing-modern.stderr
@@ -1,12 +1,13 @@
-error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
+error[E0659]: `m` is ambiguous
   --> $DIR/restricted-shadowing-modern.rs:104:17
    |
 LL |                 m!();
    |                 ^ ambiguous name
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
    |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
 note: `m` could refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:91:9
    |
@@ -14,7 +15,7 @@ LL |         macro m() { Right }
    |         ^^^^^^^^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
 note: `m` could also refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:99:9
    |
@@ -22,17 +23,19 @@ LL |         macro m() {}
    |         ^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
+   = note: this error originates in the macro `gen_gen_inner_invoc` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
+error[E0659]: `m` is ambiguous
   --> $DIR/restricted-shadowing-modern.rs:147:33
    |
 LL |             macro gen_invoc() { m!() }
    |                                 ^ ambiguous name
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
    |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
 note: `m` could refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:91:9
    |
@@ -40,7 +43,7 @@ LL |         macro m() { Right }
    |         ^^^^^^^^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
 note: `m` could also refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:143:9
    |
@@ -48,17 +51,19 @@ LL |         macro m() {}
    |         ^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
+   = note: this error originates in the macro `gen_invoc` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
+error[E0659]: `m` is ambiguous
   --> $DIR/restricted-shadowing-modern.rs:156:13
    |
 LL |             m!();
    |             ^ ambiguous name
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
    |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
 note: `m` could refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:91:9
    |
@@ -66,7 +71,7 @@ LL |         macro m() { Right }
    |         ^^^^^^^^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
 note: `m` could also refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:153:9
    |
@@ -74,17 +79,19 @@ LL |         macro m() {}
    |         ^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
+   = note: this error originates in the macro `include` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
+error[E0659]: `m` is ambiguous
   --> $DIR/restricted-shadowing-modern.rs:172:13
    |
 LL |             m!();
    |             ^ ambiguous name
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
    |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
 note: `m` could refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:91:9
    |
@@ -92,7 +99,7 @@ LL |         macro m() { Right }
    |         ^^^^^^^^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
 note: `m` could also refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:87:9
    |
@@ -100,17 +107,19 @@ LL |         macro m() { Wrong }
    |         ^^^^^^^^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
+   = note: this error originates in the macro `include` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
+error[E0659]: `m` is ambiguous
   --> $DIR/restricted-shadowing-modern.rs:190:17
    |
 LL |                 m!();
    |                 ^ ambiguous name
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
    |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
 note: `m` could refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:91:9
    |
@@ -118,7 +127,7 @@ LL |         macro m() { Right }
    |         ^^^^^^^^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
 note: `m` could also refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:87:9
    |
@@ -126,17 +135,19 @@ LL |         macro m() { Wrong }
    |         ^^^^^^^^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
+   = note: this error originates in the macro `gen_gen_inner_invoc` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
+error[E0659]: `m` is ambiguous
   --> $DIR/restricted-shadowing-modern.rs:233:33
    |
 LL |             macro gen_invoc() { m!() }
    |                                 ^ ambiguous name
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
    |
+   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
 note: `m` could refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:91:9
    |
@@ -144,7 +155,7 @@ LL |         macro m() { Right }
    |         ^^^^^^^^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
 note: `m` could also refer to the macro defined here
   --> $DIR/restricted-shadowing-modern.rs:87:9
    |
@@ -152,7 +163,8 @@ LL |         macro m() { Wrong }
    |         ^^^^^^^^^^^^^^^^^^^
 ...
 LL | include!();
-   | ----------- in this macro invocation
+   | ---------- in this macro invocation
+   = note: this error originates in the macro `gen_invoc` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 6 previous errors