Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 19 deletions

diff --git a/src/test/ui/traits/object/exclusion.rs b/src/test/ui/traits/object/exclusion.rs
deleted file mode 100644
index 766dceeaf..000000000
--- a/src/test/ui/traits/object/exclusion.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// run-pass
-trait Future: 'static {
-    // The requirement for Self: Sized must prevent instantiation of
-    // Future::forget in vtables, otherwise there's an infinite type
-    // recursion through <Map<...> as Future>::forget.
-    fn forget(self) where Self: Sized {
-        Box::new(Map(self)) as Box<dyn Future>;
-    }
-}
-
-struct Map<A>(#[allow(unused_tuple_struct_fields)] A);
-impl<A: Future> Future for Map<A> {}
-
-pub struct Promise;
-impl Future for Promise {}
-
-fn main() {
-    Promise.forget();
-}