Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 40 deletions

diff --git a/src/test/ui/traits/alias/import.rs b/src/test/ui/traits/alias/import.rs
deleted file mode 100644
index 802a8f156..000000000
--- a/src/test/ui/traits/alias/import.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// run-pass
-
-#![feature(trait_alias)]
-
-mod inner {
-    pub trait Foo {
-        fn foo(&self);
-    }
-
-    pub struct Qux;
-
-    impl Foo for Qux {
-        fn foo(&self) {}
-    }
-
-    pub trait Bar = Foo;
-}
-
-mod two {
-    pub trait A {
-        fn foo();
-    }
-
-    impl A for u8 {
-        fn foo() {}
-    }
-}
-
-// Import only the alias, not the `Foo` trait.
-use inner::{Bar, Qux};
-
-// Declaring an alias also brings in aliased methods.
-trait Two = two::A;
-
-fn main() {
-    let q = Qux;
-    q.foo(); // From Bar.
-
-    u8::foo(); // From A.
-}