Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 46 deletions

diff --git a/src/test/ui/traits/issue-6334.rs b/src/test/ui/traits/issue-6334.rs
deleted file mode 100644
index acf48da15..000000000
--- a/src/test/ui/traits/issue-6334.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// run-pass
-// Tests that everything still compiles and runs fine even when
-// we reorder the bounds.
-
-
-trait A {
-    fn a(&self) -> usize;
-}
-
-trait B {
-    fn b(&self) -> usize;
-}
-
-trait C {
-    fn combine<T:A+B>(&self, t: &T) -> usize;
-}
-
-struct Foo;
-
-impl A for Foo {
-    fn a(&self) -> usize { 1 }
-}
-
-impl B for Foo {
-    fn b(&self) -> usize { 2 }
-}
-
-struct Bar;
-
-impl C for Bar {
-    // Note below: bounds in impl decl are in reverse order.
-    fn combine<T:B+A>(&self, t: &T) -> usize {
-        (t.a() * 100) + t.b()
-    }
-}
-
-fn use_c<S:C, T:B+A>(s: &S, t: &T) -> usize {
-    s.combine(t)
-}
-
-pub fn main() {
-    let foo = Foo;
-    let bar = Bar;
-    let r = use_c(&bar, &foo);
-    assert_eq!(r, 102);
-}