Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/ui/error-codes/E0252.stderr b/tests/ui/error-codes/E0252.stderr
new file mode 100644
index 000000000..2722dfe5e
--- /dev/null
+++ b/tests/ui/error-codes/E0252.stderr
@@ -0,0 +1,17 @@
+error[E0252]: the name `baz` is defined multiple times
+  --> $DIR/E0252.rs:4:5
+   |
+LL | use foo::baz;
+   |     -------- previous import of the type `baz` here
+LL | use bar::baz;
+   |     ^^^^^^^^ `baz` reimported here
+   |
+   = note: `baz` 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 bar::baz as other_baz;
+   |     ~~~~~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0252`.