Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 17 deletions

diff --git a/src/test/ui/coherence/coherence-overlap-negative-trait2.rs b/src/test/ui/coherence/coherence-overlap-negative-trait2.rs
deleted file mode 100644
index cc8c463b8..000000000
--- a/src/test/ui/coherence/coherence-overlap-negative-trait2.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// check-pass
-// aux-build:option_future.rs
-//
-// Check that if we promise to not impl what would overlap it doesn't actually overlap
-
-#![feature(rustc_attrs)]
-#![feature(with_negative_coherence)]
-
-extern crate option_future as lib;
-use lib::Future;
-
-trait Termination {}
-
-impl<E> Termination for Option<E> where E: Sized {}
-impl<F> Termination for F where F: Future + Sized {}
-
-fn main() {}