Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 21 deletions

diff --git a/src/test/ui/fn/fn-trait-formatting.rs b/src/test/ui/fn/fn-trait-formatting.rs
deleted file mode 100644
index 636ac7107..000000000
--- a/src/test/ui/fn/fn-trait-formatting.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-fn needs_fn<F>(x: F) where F: Fn(isize) -> isize {}
-
-
-
-fn main() {
-    let _: () = Box::new(|_: isize| {}) as Box<dyn FnOnce(isize)>;
-    //~^ ERROR mismatched types
-    //~| expected unit type `()`
-    //~| found struct `Box<dyn FnOnce(isize)>`
-    let _: () = Box::new(|_: isize, isize| {}) as Box<dyn Fn(isize, isize)>;
-    //~^ ERROR mismatched types
-    //~| expected unit type `()`
-    //~| found struct `Box<dyn Fn(isize, isize)>`
-    let _: () = Box::new(|| -> isize { unimplemented!() }) as Box<dyn FnMut() -> isize>;
-    //~^ ERROR mismatched types
-    //~| expected unit type `()`
-    //~| found struct `Box<dyn FnMut() -> isize>`
-
-    needs_fn(1);
-    //~^ ERROR expected a `Fn<(isize,)>` closure, found `{integer}`
-}