Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 17 deletions

diff --git a/src/test/ui/traits/default-method/auxiliary/xc_2.rs b/src/test/ui/traits/default-method/auxiliary/xc_2.rs
deleted file mode 100644
index 979233820..000000000
--- a/src/test/ui/traits/default-method/auxiliary/xc_2.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// aux-build:xc.rs
-
-extern crate xc as aux;
-use aux::A;
-
-pub struct a_struct { pub x: isize }
-
-impl A for a_struct {
-    fn f(&self) -> isize { 10 }
-}
-
-// This function will need to get inlined, and badness may result.
-pub fn welp<A>(x: A) -> A {
-    let a = a_struct { x: 0 };
-    a.g();
-    x
-}