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/conflicting-impl-with-err.rs b/src/test/ui/coherence/conflicting-impl-with-err.rs
deleted file mode 100644
index 3e0234b87..000000000
--- a/src/test/ui/coherence/conflicting-impl-with-err.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-struct ErrorKind;
-struct Error(ErrorKind);
-
-impl From<nope::Thing> for Error { //~ ERROR failed to resolve
-    fn from(_: nope::Thing) -> Self { //~ ERROR failed to resolve
-        unimplemented!()
-    }
-}
-
-impl From<ErrorKind> for Error {
-    fn from(_: ErrorKind) -> Self {
-        unimplemented!()
-    }
-}
-
-fn main() {}