Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 19 deletions

diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.rs b/src/test/ui/coherence/coherence-projection-conflict-orphan.rs
deleted file mode 100644
index 637dd2506..000000000
--- a/src/test/ui/coherence/coherence-projection-conflict-orphan.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-#![feature(rustc_attrs)]
-
-// Here we expect a coherence conflict because, even though `i32` does
-// not implement `Iterator`, we cannot rely on that negative reasoning
-// due to the orphan rules. Therefore, `A::Item` may yet turn out to
-// be `i32`.
-
-pub trait Foo<P> { fn foo() {} }
-
-pub trait Bar {
-    type Output: 'static;
-}
-
-impl Foo<i32> for i32 { }
-
-impl<A:Iterator> Foo<A::Item> for A { }
-//~^ ERROR E0119
-
-fn main() {}