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, 23 insertions, 0 deletions

diff --git a/src/test/ui/error-codes/E0659.stderr b/src/test/ui/error-codes/E0659.stderr
new file mode 100644
index 000000000..b0c73c636
--- /dev/null
+++ b/src/test/ui/error-codes/E0659.stderr
@@ -0,0 +1,23 @@
+error[E0659]: `foo` is ambiguous
+  --> $DIR/E0659.rs:15:15
+   |
+LL |     collider::foo();
+   |               ^^^ ambiguous name
+   |
+   = note: ambiguous because of multiple glob imports of a name in the same module
+note: `foo` could refer to the function imported here
+  --> $DIR/E0659.rs:10:13
+   |
+LL |     pub use moon::*;
+   |             ^^^^^^^
+   = help: consider adding an explicit import of `foo` to disambiguate
+note: `foo` could also refer to the function imported here
+  --> $DIR/E0659.rs:11:13
+   |
+LL |     pub use earth::*;
+   |             ^^^^^^^^
+   = help: consider adding an explicit import of `foo` to disambiguate
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0659`.