Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 70 insertions, 0 deletions

diff --git a/tests/ui/use/use-from-trait-xc.stderr b/tests/ui/use/use-from-trait-xc.stderr
new file mode 100644
index 000000000..4c4c2f622
--- /dev/null
+++ b/tests/ui/use/use-from-trait-xc.stderr
@@ -0,0 +1,70 @@
+error[E0253]: `foo` is not directly importable
+  --> $DIR/use-from-trait-xc.rs:5:5
+   |
+LL | use use_from_trait_xc::Trait::foo;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be imported directly
+
+error[E0253]: `Assoc` is not directly importable
+  --> $DIR/use-from-trait-xc.rs:8:5
+   |
+LL | use use_from_trait_xc::Trait::Assoc;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be imported directly
+
+error[E0253]: `CONST` is not directly importable
+  --> $DIR/use-from-trait-xc.rs:11:5
+   |
+LL | use use_from_trait_xc::Trait::CONST;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot be imported directly
+
+error[E0432]: unresolved import `use_from_trait_xc::Foo`
+  --> $DIR/use-from-trait-xc.rs:14:24
+   |
+LL | use use_from_trait_xc::Foo::new;
+   |                        ^^^ `Foo` is a struct, not a module
+
+error[E0432]: unresolved import `use_from_trait_xc::Foo`
+  --> $DIR/use-from-trait-xc.rs:17:24
+   |
+LL | use use_from_trait_xc::Foo::C;
+   |                        ^^^ `Foo` is a struct, not a module
+
+error[E0432]: unresolved import `use_from_trait_xc::Bar`
+  --> $DIR/use-from-trait-xc.rs:20:24
+   |
+LL | use use_from_trait_xc::Bar::new as bnew;
+   |                        ^^^ `Bar` is a struct, not a module
+
+error[E0432]: unresolved import `use_from_trait_xc::Baz::new`
+  --> $DIR/use-from-trait-xc.rs:23:5
+   |
+LL | use use_from_trait_xc::Baz::new as baznew;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `new` in `sub::Baz`
+
+error[E0603]: struct `Foo` is private
+  --> $DIR/use-from-trait-xc.rs:14:24
+   |
+LL | use use_from_trait_xc::Foo::new;
+   |                        ^^^ private struct
+   |
+note: the struct `Foo` is defined here
+  --> $DIR/auxiliary/use-from-trait-xc.rs:9:1
+   |
+LL | struct Foo;
+   | ^^^^^^^^^^
+
+error[E0603]: struct `Foo` is private
+  --> $DIR/use-from-trait-xc.rs:17:24
+   |
+LL | use use_from_trait_xc::Foo::C;
+   |                        ^^^ private struct
+   |
+note: the struct `Foo` is defined here
+  --> $DIR/auxiliary/use-from-trait-xc.rs:9:1
+   |
+LL | struct Foo;
+   | ^^^^^^^^^^
+
+error: aborting due to 9 previous errors
+
+Some errors have detailed explanations: E0253, E0432, E0603.
+For more information about an error, try `rustc --explain E0253`.