From 698f8c2f01ea549d77d7dc3338a12e04c11057b9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:02:58 +0200
Subject: Adding upstream version 1.64.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/test/ui/variants/variant-namespacing.stderr | 93 +++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 src/test/ui/variants/variant-namespacing.stderr

(limited to 'src/test/ui/variants/variant-namespacing.stderr')

diff --git a/src/test/ui/variants/variant-namespacing.stderr b/src/test/ui/variants/variant-namespacing.stderr
new file mode 100644
index 000000000..9e91ff717
--- /dev/null
+++ b/src/test/ui/variants/variant-namespacing.stderr
@@ -0,0 +1,93 @@
+error[E0255]: the name `XStruct` is defined multiple times
+  --> $DIR/variant-namespacing.rs:24:35
+   |
+LL | type XStruct = u8;
+   | ------------------ previous definition of the type `XStruct` here
+...
+LL | pub use variant_namespacing::XE::{XStruct, XTuple, XUnit};
+   |                                   ^^^^^^^ `XStruct` reimported here
+   |
+   = note: `XStruct` 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 | pub use variant_namespacing::XE::{XStruct as OtherXStruct, XTuple, XUnit};
+   |                                   ~~~~~~~~~~~~~~~~~~~~~~~
+
+error[E0255]: the name `XTuple` is defined multiple times
+  --> $DIR/variant-namespacing.rs:24:44
+   |
+LL | type XTuple = u8;
+   | ----------------- previous definition of the type `XTuple` here
+...
+LL | pub use variant_namespacing::XE::{XStruct, XTuple, XUnit};
+   |                                            ^^^^^^ `XTuple` reimported here
+   |
+   = note: `XTuple` 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 | pub use variant_namespacing::XE::{XStruct, XTuple as OtherXTuple, XUnit};
+   |                                            ~~~~~~~~~~~~~~~~~~~~~
+
+error[E0255]: the name `XUnit` is defined multiple times
+  --> $DIR/variant-namespacing.rs:24:52
+   |
+LL | type XUnit = u8;
+   | ---------------- previous definition of the type `XUnit` here
+...
+LL | pub use variant_namespacing::XE::{XStruct, XTuple, XUnit};
+   |                                                    ^^^^^ `XUnit` reimported here
+   |
+   = note: `XUnit` 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 | pub use variant_namespacing::XE::{XStruct, XTuple, XUnit as OtherXUnit};
+   |                                                    ~~~~~~~~~~~~~~~~~~~
+
+error[E0255]: the name `Struct` is defined multiple times
+  --> $DIR/variant-namespacing.rs:28:13
+   |
+LL | type Struct = u8;
+   | ----------------- previous definition of the type `Struct` here
+...
+LL | pub use E::{Struct, Tuple, Unit};
+   |             ^^^^^^ `Struct` reimported here
+   |
+   = note: `Struct` 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 | pub use E::{Struct as OtherStruct, Tuple, Unit};
+   |             ~~~~~~~~~~~~~~~~~~~~~
+
+error[E0255]: the name `Tuple` is defined multiple times
+  --> $DIR/variant-namespacing.rs:28:21
+   |
+LL | type Tuple = u8;
+   | ---------------- previous definition of the type `Tuple` here
+...
+LL | pub use E::{Struct, Tuple, Unit};
+   |                     ^^^^^ `Tuple` reimported here
+   |
+   = note: `Tuple` 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 | pub use E::{Struct, Tuple as OtherTuple, Unit};
+   |                     ~~~~~~~~~~~~~~~~~~~
+
+error[E0255]: the name `Unit` is defined multiple times
+  --> $DIR/variant-namespacing.rs:28:28
+   |
+LL | type Unit = u8;
+   | --------------- previous definition of the type `Unit` here
+...
+LL | pub use E::{Struct, Tuple, Unit};
+   |                            ^^^^ `Unit` reimported here
+   |
+   = note: `Unit` 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 | pub use E::{Struct, Tuple, Unit as OtherUnit};
+   |                            ~~~~~~~~~~~~~~~~~
+
+error: aborting due to 6 previous errors
+
+For more information about this error, try `rustc --explain E0255`.
-- 
cgit v1.2.3