Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 25 deletions

diff --git a/src/test/ui/object-safety/issue-102933.rs b/src/test/ui/object-safety/issue-102933.rs
deleted file mode 100644
index 843391cff..000000000
--- a/src/test/ui/object-safety/issue-102933.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// check-pass
-
-use std::future::Future;
-
-pub trait Service {
-    type Response;
-    type Future: Future<Output = Self::Response>;
-}
-
-pub trait A1: Service<Response = i32> {}
-
-pub trait A2: Service<Future = Box<dyn Future<Output = i32>>> + A1 {
-    fn foo(&self) {}
-}
-
-pub trait B1: Service<Future = Box<dyn Future<Output = i32>>> {}
-
-pub trait B2: Service<Response = i32> + B1 {
-    fn foo(&self) {}
-}
-
-fn main() {
-    let x: &dyn A2 = todo!();
-    let x: &dyn B2 = todo!();
-}