Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 16 deletions

diff --git a/src/test/ui/coherence/coherence-overlap-negative-trait.rs b/src/test/ui/coherence/coherence-overlap-negative-trait.rs
deleted file mode 100644
index 8059d23ff..000000000
--- a/src/test/ui/coherence/coherence-overlap-negative-trait.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// check-pass
-// aux-build:error_lib.rs
-//
-// Check that if we promise to not impl what would overlap it doesn't actually overlap
-
-#![feature(with_negative_coherence)]
-
-extern crate error_lib as lib;
-use lib::Error;
-
-trait From<T> {}
-
-impl From<&str> for Box<dyn Error> {}
-impl<E> From<E> for Box<dyn Error> where E: Error {}
-
-fn main() {}