Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 93 deletions

diff --git a/src/test/ui/issues/issue-14254.rs b/src/test/ui/issues/issue-14254.rs
deleted file mode 100644
index 6f9308376..000000000
--- a/src/test/ui/issues/issue-14254.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-// check-pass
-// pretty-expanded FIXME #23616
-
-trait Foo: Sized {
-    fn bar(&self);
-    fn baz(&self) { }
-    fn bah(_: Option<Self>) { }
-}
-
-struct BarTy {
-    x : isize,
-    y : f64,
-}
-
-impl BarTy {
-    fn a() {}
-    fn b(&self) {}
-}
-
-// If these fail, it's necessary to update rustc_resolve and the cfail tests.
-impl Foo for *const BarTy {
-    fn bar(&self) {
-        self.baz();
-        BarTy::a();
-        Foo::bah(None::<*const BarTy>);
-    }
-}
-
-// If these fail, it's necessary to update rustc_resolve and the cfail tests.
-impl<'a> Foo for &'a BarTy {
-    fn bar(&self) {
-        self.baz();
-        self.x;
-        self.y;
-        BarTy::a();
-        Foo::bah(None::<&BarTy>);
-        self.b();
-    }
-}
-
-// If these fail, it's necessary to update rustc_resolve and the cfail tests.
-impl<'a> Foo for &'a mut BarTy {
-    fn bar(&self) {
-        self.baz();
-        self.x;
-        self.y;
-        BarTy::a();
-        Foo::bah(None::<&mut BarTy>);
-        self.b();
-    }
-}
-
-// If these fail, it's necessary to update rustc_resolve and the cfail tests.
-impl Foo for Box<BarTy> {
-    fn bar(&self) {
-        self.baz();
-        Foo::bah(None::<Box<BarTy>>);
-    }
-}
-
-// If these fail, it's necessary to update rustc_resolve and the cfail tests.
-impl Foo for *const isize {
-    fn bar(&self) {
-        self.baz();
-        Foo::bah(None::<*const isize>);
-    }
-}
-
-// If these fail, it's necessary to update rustc_resolve and the cfail tests.
-impl<'a> Foo for &'a isize {
-    fn bar(&self) {
-        self.baz();
-        Foo::bah(None::<&isize>);
-    }
-}
-
-// If these fail, it's necessary to update rustc_resolve and the cfail tests.
-impl<'a> Foo for &'a mut isize {
-    fn bar(&self) {
-        self.baz();
-        Foo::bah(None::<&mut isize>);
-    }
-}
-
-// If these fail, it's necessary to update rustc_resolve and the cfail tests.
-impl Foo for Box<isize> {
-    fn bar(&self) {
-        self.baz();
-        Foo::bah(None::<Box<isize>>);
-    }
-}
-
-fn main() {}