Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 26 deletions

diff --git a/src/test/ui/use/use-from-trait-xc.rs b/src/test/ui/use/use-from-trait-xc.rs
deleted file mode 100644
index 695ed66a1..000000000
--- a/src/test/ui/use/use-from-trait-xc.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// aux-build:use-from-trait-xc.rs
-
-extern crate use_from_trait_xc;
-
-use use_from_trait_xc::Trait::foo;
-//~^ ERROR `foo` is not directly importable
-
-use use_from_trait_xc::Trait::Assoc;
-//~^ ERROR `Assoc` is not directly importable
-
-use use_from_trait_xc::Trait::CONST;
-//~^ ERROR `CONST` is not directly importable
-
-use use_from_trait_xc::Foo::new; //~ ERROR struct `Foo` is private
-//~^ ERROR unresolved import `use_from_trait_xc::Foo`
-
-use use_from_trait_xc::Foo::C; //~ ERROR struct `Foo` is private
-//~^ ERROR unresolved import `use_from_trait_xc::Foo`
-
-use use_from_trait_xc::Bar::new as bnew;
-//~^ ERROR unresolved import `use_from_trait_xc::Bar`
-
-use use_from_trait_xc::Baz::new as baznew;
-//~^ ERROR unresolved import `use_from_trait_xc::Baz::new`
-
-fn main() {}