Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/ui/macros/macro-path-prelude-shadowing.stderr b/tests/ui/macros/macro-path-prelude-shadowing.stderr
new file mode 100644
index 000000000..4a864c2e9
--- /dev/null
+++ b/tests/ui/macros/macro-path-prelude-shadowing.stderr
@@ -0,0 +1,19 @@
+error[E0659]: `std` is ambiguous
+  --> $DIR/macro-path-prelude-shadowing.rs:29:9
+   |
+LL |         std::panic!();
+   |         ^^^ ambiguous name
+   |
+   = note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
+   = note: `std` could refer to a built-in crate
+note: `std` could also refer to the module imported here
+  --> $DIR/macro-path-prelude-shadowing.rs:27:9
+   |
+LL |     use m2::*; // glob-import user-defined `std`
+   |         ^^^^^
+   = help: consider adding an explicit import of `std` to disambiguate
+   = help: or use `self::std` to refer to this module unambiguously
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0659`.