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

diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr b/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr
new file mode 100644
index 000000000..abf068a1f
--- /dev/null
+++ b/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr
@@ -0,0 +1,15 @@
+error[E0254]: the name `std` is defined multiple times
+  --> $DIR/resolve-conflict-import-vs-extern-crate.rs:1:5
+   |
+LL | use std::slice as std;
+   |     ^^^^^^^^^^^^^^^^^ `std` reimported here
+   |
+   = note: `std` must be defined only once in the type namespace of this module
+help: you can use `as` to change the binding name of the import
+   |
+LL | use std::slice as other_std;
+   |     ~~~~~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0254`.