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/where-clauses/auxiliary/where_clauses_xc.rs b/src/test/ui/where-clauses/auxiliary/where_clauses_xc.rs
deleted file mode 100644
index 7c8043b20..000000000
--- a/src/test/ui/where-clauses/auxiliary/where_clauses_xc.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-pub trait Equal {
-    fn equal(&self, other: &Self) -> bool;
-    fn equals<T,U>(&self, this: &T, that: &T, x: &U, y: &U) -> bool
-            where T: Eq, U: Eq;
-}
-
-impl<T> Equal for T where T: Eq {
-    fn equal(&self, other: &T) -> bool {
-        self == other
-    }
-    fn equals<U,X>(&self, this: &U, other: &U, x: &X, y: &X) -> bool
-            where U: Eq, X: Eq {
-        this == other && x == y
-    }
-}
-
-pub fn equal<T>(x: &T, y: &T) -> bool where T: Eq {
-    x == y
-}