Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 26 deletions

diff --git a/src/test/ui/compare-method/bad-self-type.rs b/src/test/ui/compare-method/bad-self-type.rs
deleted file mode 100644
index f42a9e49a..000000000
--- a/src/test/ui/compare-method/bad-self-type.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use std::future::Future;
-use std::task::{Context, Poll};
-
-fn main() {}
-
-struct MyFuture {}
-
-impl Future for MyFuture {
-    type Output = ();
-    fn poll(self, _: &mut Context<'_>) -> Poll<()> {
-    //~^ ERROR method `poll` has an incompatible type for trait
-        todo!()
-    }
-}
-
-trait T {
-    fn foo(self);
-    fn bar(self) -> Option<()>;
-}
-
-impl T for MyFuture {
-    fn foo(self: Box<Self>) {}
-    //~^ ERROR method `foo` has an incompatible type for trait
-    fn bar(self) {}
-    //~^ ERROR method `bar` has an incompatible type for trait
-}