Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 74 insertions, 0 deletions

diff --git a/tests/ui/imports/duplicate.stderr b/tests/ui/imports/duplicate.stderr
new file mode 100644
index 000000000..997a2741b
--- /dev/null
+++ b/tests/ui/imports/duplicate.stderr
@@ -0,0 +1,74 @@
+error[E0252]: the name `foo` is defined multiple times
+  --> $DIR/duplicate.rs:15:9
+   |
+LL |     use a::foo;
+   |         ------ previous import of the value `foo` here
+LL |     use a::foo;
+   |         ^^^^^^ `foo` reimported here
+   |
+   = note: `foo` must be defined only once in the value namespace of this module
+
+error[E0659]: `foo` is ambiguous
+  --> $DIR/duplicate.rs:46:15
+   |
+LL |     use self::foo::bar;
+   |               ^^^ ambiguous name
+   |
+   = note: ambiguous because of multiple glob imports of a name in the same module
+note: `foo` could refer to the module imported here
+  --> $DIR/duplicate.rs:43:9
+   |
+LL |     use self::m1::*;
+   |         ^^^^^^^^^^^
+   = help: consider adding an explicit import of `foo` to disambiguate
+note: `foo` could also refer to the module imported here
+  --> $DIR/duplicate.rs:44:9
+   |
+LL |     use self::m2::*;
+   |         ^^^^^^^^^^^
+   = help: consider adding an explicit import of `foo` to disambiguate
+
+error[E0659]: `foo` is ambiguous
+  --> $DIR/duplicate.rs:35:8
+   |
+LL |     f::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/duplicate.rs:24:13
+   |
+LL |     pub use a::*;
+   |             ^^^^
+   = help: consider adding an explicit import of `foo` to disambiguate
+note: `foo` could also refer to the function imported here
+  --> $DIR/duplicate.rs:25:13
+   |
+LL |     pub use b::*;
+   |             ^^^^
+   = help: consider adding an explicit import of `foo` to disambiguate
+
+error[E0659]: `foo` is ambiguous
+  --> $DIR/duplicate.rs:49:9
+   |
+LL |         foo::bar();
+   |         ^^^ ambiguous name
+   |
+   = note: ambiguous because of multiple glob imports of a name in the same module
+note: `foo` could refer to the module imported here
+  --> $DIR/duplicate.rs:43:9
+   |
+LL |     use self::m1::*;
+   |         ^^^^^^^^^^^
+   = help: consider adding an explicit import of `foo` to disambiguate
+note: `foo` could also refer to the module imported here
+  --> $DIR/duplicate.rs:44:9
+   |
+LL |     use self::m2::*;
+   |         ^^^^^^^^^^^
+   = help: consider adding an explicit import of `foo` to disambiguate
+
+error: aborting due to 4 previous errors
+
+Some errors have detailed explanations: E0252, E0659.
+For more information about an error, try `rustc --explain E0252`.