Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 49 deletions

diff --git a/src/test/ui/impl-trait/impl-trait-plus-priority.rs b/src/test/ui/impl-trait/impl-trait-plus-priority.rs
deleted file mode 100644
index dfac9c0f1..000000000
--- a/src/test/ui/impl-trait/impl-trait-plus-priority.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-// compile-flags: -Z parse-only
-
-fn f() -> impl A + {} // OK
-fn f() -> impl A + B {} // OK
-fn f() -> dyn A + B {} // OK
-fn f() -> A + B {} // OK
-
-impl S {
-    fn f(self) -> impl A + { // OK
-        let _ = |a, b| -> impl A + {}; // OK
-    }
-    fn f(self) -> impl A + B { // OK
-        let _ = |a, b| -> impl A + B {}; // OK
-    }
-    fn f(self) -> dyn A + B { // OK
-        let _ = |a, b| -> dyn A + B {}; // OK
-    }
-    fn f(self) -> A + B { // OK
-        let _ = |a, b| -> A + B {}; // OK
-    }
-}
-
-type A = fn() -> impl A +;
-//~^ ERROR ambiguous `+` in a type
-type A = fn() -> impl A + B;
-//~^ ERROR ambiguous `+` in a type
-type A = fn() -> dyn A + B;
-//~^ ERROR ambiguous `+` in a type
-type A = fn() -> A + B;
-//~^ ERROR expected a path on the left-hand side of `+`, not `fn() -> A`
-
-type A = Fn() -> impl A +;
-//~^ ERROR ambiguous `+` in a type
-type A = Fn() -> impl A + B;
-//~^ ERROR ambiguous `+` in a type
-type A = Fn() -> dyn A + B;
-//~^ ERROR ambiguous `+` in a type
-type A = Fn() -> A + B; // OK, interpreted as `(Fn() -> A) + B` for compatibility
-
-type A = &impl A +;
-//~^ ERROR ambiguous `+` in a type
-type A = &impl A + B;
-//~^ ERROR ambiguous `+` in a type
-type A = &dyn A + B;
-//~^ ERROR ambiguous `+` in a type
-type A = &A + B;
-//~^ ERROR expected a path on the left-hand side of `+`, not `&A`
-
-fn main() {}