From a4b7ed7a42c716ab9f05e351f003d589124fd55d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:18:58 +0200
Subject: Adding upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/test/ui/error-codes/e0119/conflict-with-std.rs | 26 ----------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 src/test/ui/error-codes/e0119/conflict-with-std.rs

(limited to 'src/test/ui/error-codes/e0119/conflict-with-std.rs')

diff --git a/src/test/ui/error-codes/e0119/conflict-with-std.rs b/src/test/ui/error-codes/e0119/conflict-with-std.rs
deleted file mode 100644
index c9db2bab1..000000000
--- a/src/test/ui/error-codes/e0119/conflict-with-std.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use std::marker::PhantomData;
-use std::convert::{TryFrom, AsRef};
-
-struct Q;
-impl AsRef<Q> for Box<Q> { //~ ERROR conflicting implementations
-    fn as_ref(&self) -> &Q {
-        &**self
-    }
-}
-
-struct S;
-impl From<S> for S { //~ ERROR conflicting implementations
-    fn from(s: S) -> S {
-        s
-    }
-}
-
-struct X;
-impl TryFrom<X> for X { //~ ERROR conflicting implementations
-    type Error = ();
-    fn try_from(u: X) -> Result<X, ()> {
-        Ok(u)
-    }
-}
-
-fn main() {}
-- 
cgit v1.2.3