Adding upstream version 1.64.0+dfsg1.upstream/1.64.0+dfsg1

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

1 files changed, 25 insertions, 0 deletions

diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr
new file mode 100644
index 000000000..771d2c10c
--- /dev/null
+++ b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr
@@ -0,0 +1,25 @@
+error[E0659]: `std` is ambiguous
+  --> $DIR/ambiguity-macros.rs:7:5
+   |
+LL | use std::io;
+   |     ^^^ ambiguous name
+   |
+   = note: ambiguous because of multiple potential import sources
+   = note: `std` could refer to a built-in crate
+   = help: use `::std` to refer to this crate unambiguously
+note: `std` could also refer to the module defined here
+  --> $DIR/ambiguity-macros.rs:12:9
+   |
+LL | /         mod std {
+LL | |             pub struct io;
+LL | |         }
+   | |_________^
+...
+LL |   m!();
+   |   ---- in this macro invocation
+   = help: use `crate::std` to refer to this module unambiguously
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0659`.