Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 22 deletions

diff --git a/src/test/ui/use/use-from-trait.rs b/src/test/ui/use/use-from-trait.rs
deleted file mode 100644
index eab4bb6e3..000000000
--- a/src/test/ui/use/use-from-trait.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use Trait::foo; //~ ERROR `foo` is not directly importable
-use Trait::Assoc; //~ ERROR `Assoc` is not directly importable
-use Trait::C; //~ ERROR `C` is not directly importable
-
-use Foo::new; //~ ERROR unresolved import `Foo` [E0432]
-
-use Foo::C2; //~ ERROR unresolved import `Foo` [E0432]
-
-pub trait Trait {
-    fn foo();
-    type Assoc;
-    const C: u32;
-}
-
-struct Foo;
-
-impl Foo {
-    fn new() {}
-    const C2: u32 = 0;
-}
-
-fn main() {}