Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 37 deletions

diff --git a/src/test/ui/structs/struct-path-associated-type.rs b/src/test/ui/structs/struct-path-associated-type.rs
deleted file mode 100644
index 2dd7174a9..000000000
--- a/src/test/ui/structs/struct-path-associated-type.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-struct S;
-
-trait Tr {
-    type A;
-}
-
-impl Tr for S {
-    type A = S;
-}
-
-fn f<T: Tr>() {
-    let s = T::A {};
-    //~^ ERROR expected struct, variant or union type, found associated type
-    let z = T::A::<u8> {};
-    //~^ ERROR expected struct, variant or union type, found associated type
-    //~| ERROR this associated type takes 0 generic arguments but 1 generic argument was supplied
-    match S {
-        T::A {} => {}
-        //~^ ERROR expected struct, variant or union type, found associated type
-    }
-}
-
-fn g<T: Tr<A = S>>() {
-    let s = T::A {}; // OK
-    let z = T::A::<u8> {}; //~ ERROR this associated type takes 0 generic arguments but 1 generic argument was supplied
-    match S {
-        T::A {} => {} // OK
-    }
-}
-
-fn main() {
-    let s = S::A {}; //~ ERROR ambiguous associated type
-    let z = S::A::<u8> {}; //~ ERROR ambiguous associated type
-    match S {
-        S::A {} => {} //~ ERROR ambiguous associated type
-    }
-}