Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 31 deletions

diff --git a/src/test/ui/traits/issue-26339.rs b/src/test/ui/traits/issue-26339.rs
deleted file mode 100644
index bedd87cc4..000000000
--- a/src/test/ui/traits/issue-26339.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// run-pass
-// Test that the right implementation is called through a trait
-// object when supertraits include multiple references to the
-// same trait, with different type parameters.
-
-trait A: PartialEq<Foo> + PartialEq<Bar> { }
-
-struct Foo;
-struct Bar;
-
-struct Aimpl;
-
-impl PartialEq<Foo> for Aimpl {
-    fn eq(&self, _rhs: &Foo) -> bool {
-        true
-    }
-}
-
-impl PartialEq<Bar> for Aimpl {
-    fn eq(&self, _rhs: &Bar) -> bool {
-        false
-    }
-}
-
-impl A for Aimpl { }
-
-fn main() {
-    let a = &Aimpl as &dyn A;
-
-    assert!(*a == Foo);
-}