Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 48 insertions, 0 deletions

diff --git a/tests/ui/privacy/private-variant-reexport.stderr b/tests/ui/privacy/private-variant-reexport.stderr
new file mode 100644
index 000000000..78771ee30
--- /dev/null
+++ b/tests/ui/privacy/private-variant-reexport.stderr
@@ -0,0 +1,48 @@
+error[E0364]: `V` is only public within the crate, and cannot be re-exported outside
+  --> $DIR/private-variant-reexport.rs:2:13
+   |
+LL |     pub use ::E::V;
+   |             ^^^^^^
+   |
+note: consider marking `V` as `pub` in the imported module
+  --> $DIR/private-variant-reexport.rs:2:13
+   |
+LL |     pub use ::E::V;
+   |             ^^^^^^
+
+error[E0364]: `V` is only public within the crate, and cannot be re-exported outside
+  --> $DIR/private-variant-reexport.rs:6:19
+   |
+LL |     pub use ::E::{V};
+   |                   ^
+   |
+note: consider marking `V` as `pub` in the imported module
+  --> $DIR/private-variant-reexport.rs:6:19
+   |
+LL |     pub use ::E::{V};
+   |                   ^
+
+error[E0365]: `V` is only public within the crate, and cannot be re-exported outside
+  --> $DIR/private-variant-reexport.rs:10:22
+   |
+LL |     pub use ::E::V::{self};
+   |                      ^^^^ re-export of crate public `V`
+   |
+   = note: consider declaring type or module `V` with `pub`
+
+error: glob import doesn't reexport anything because no candidate is public enough
+  --> $DIR/private-variant-reexport.rs:15:13
+   |
+LL |     pub use ::E::*;
+   |             ^^^^^^
+   |
+note: the lint level is defined here
+  --> $DIR/private-variant-reexport.rs:13:8
+   |
+LL | #[deny(unused_imports)]
+   |        ^^^^^^^^^^^^^^
+
+error: aborting due to 4 previous errors
+
+Some errors have detailed explanations: E0364, E0365.
+For more information about an error, try `rustc --explain E0364`.