Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 15 deletions

diff --git a/src/test/ui/unsized/box-instead-of-dyn-fn.rs b/src/test/ui/unsized/box-instead-of-dyn-fn.rs
deleted file mode 100644
index 2fa741bc1..000000000
--- a/src/test/ui/unsized/box-instead-of-dyn-fn.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use std::fmt::Debug;
-
-// Test to suggest boxing the return type, and the closure branch of the `if`
-
-fn print_on_or_the_other<'a>(a: i32, b: &'a String) -> dyn Fn() + 'a {
-    //~^ ERROR return type cannot have an unboxed trait object
-    if a % 2 == 0 {
-        move || println!("{a}")
-    } else {
-        Box::new(move || println!("{}", b))
-        //~^ ERROR `if` and `else` have incompatible types
-    }
-}
-
-fn main() {}