Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 81 deletions

diff --git a/src/test/ui/traits/default-method/xc.rs b/src/test/ui/traits/default-method/xc.rs
deleted file mode 100644
index 76a1573d6..000000000
--- a/src/test/ui/traits/default-method/xc.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-#![allow(non_camel_case_types)]
-
-// aux-build:xc.rs
-
-
-extern crate xc as aux;
-use aux::{A, TestEquality, Something};
-use aux::B;
-
-fn f<T: aux::A>(i: T) {
-    assert_eq!(i.g(), 10);
-}
-
-fn welp<T>(i: isize, _x: &T) -> isize {
-    i.g()
-}
-
-mod stuff {
-    pub struct thing { pub x: isize }
-}
-
-impl A for stuff::thing {
-    fn f(&self) -> isize { 10 }
-}
-
-fn g<T, U, V: B<T>>(i: V, j: T, k: U) -> (T, U) {
-    i.thing(j, k)
-}
-
-fn eq<T: TestEquality>(lhs: &T, rhs: &T) -> bool {
-    lhs.test_eq(rhs)
-}
-fn neq<T: TestEquality>(lhs: &T, rhs: &T) -> bool {
-    lhs.test_neq(rhs)
-}
-
-
-impl TestEquality for stuff::thing {
-    fn test_eq(&self, rhs: &stuff::thing) -> bool {
-        //self.x.test_eq(&rhs.x)
-        eq(&self.x, &rhs.x)
-    }
-}
-
-
-pub fn main() {
-    // Some tests of random things
-    f(0);
-
-    assert_eq!(A::lurr(&0, &1), 21);
-
-    let a = stuff::thing { x: 0 };
-    let b = stuff::thing { x: 1 };
-    let c = Something { x: 1 };
-
-    assert_eq!(0.g(), 10);
-    assert_eq!(a.g(), 10);
-    assert_eq!(a.h(), 11);
-    assert_eq!(c.h(), 11);
-
-    assert_eq!(0.thing(3.14f64, 1), (3.14f64, 1));
-    assert_eq!(B::staticthing(&0, 3.14f64, 1), (3.14f64, 1));
-    assert_eq!(B::<f64>::staticthing::<isize>(&0, 3.14, 1), (3.14, 1));
-
-    assert_eq!(g(0, 3.14f64, 1), (3.14f64, 1));
-    assert_eq!(g(false, 3.14f64, 1), (3.14, 1));
-
-
-    // Trying out a real one
-    assert!(12.test_neq(&10));
-    assert!(!10.test_neq(&10));
-    assert!(a.test_neq(&b));
-    assert!(!a.test_neq(&a));
-
-    assert!(neq(&12, &10));
-    assert!(!neq(&10, &10));
-    assert!(neq(&a, &b));
-    assert!(!neq(&a, &a));
-}