Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 22 deletions

diff --git a/src/test/ui/suggestions/box-future-wrong-output.rs b/src/test/ui/suggestions/box-future-wrong-output.rs
deleted file mode 100644
index d49819fcb..000000000
--- a/src/test/ui/suggestions/box-future-wrong-output.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Issue #72117
-// edition:2018
-
-use core::future::Future;
-use core::pin::Pin;
-
-pub type BoxFuture<'a, T> = Pin<Box<dyn Future<Output = T> + Send + 'a>>;
-
-impl<T: ?Sized> FutureExt for T where T: Future {}
-trait FutureExt: Future {
-    fn boxed<'a>(self) -> BoxFuture<'a, Self::Output>
-    where
-        Self: Sized + Send + 'a,
-    {
-        Box::pin(self)
-    }
-}
-
-fn main() {
-    let _: BoxFuture<'static, bool> = async {}.boxed();
-    //~^ ERROR: mismatched types
-}