Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 21 deletions

diff --git a/src/test/ui/traits/issue-35869.rs b/src/test/ui/traits/issue-35869.rs
deleted file mode 100644
index b9b4c972e..000000000
--- a/src/test/ui/traits/issue-35869.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-trait Foo {
-    fn foo(_: fn(u8) -> ());
-    fn bar(_: Option<u8>);
-    fn baz(_: (u8, u16));
-    fn qux() -> u8;
-}
-
-struct Bar;
-
-impl Foo for Bar {
-    fn foo(_: fn(u16) -> ()) {}
-    //~^ ERROR method `foo` has an incompatible type for trait
-    fn bar(_: Option<u16>) {}
-    //~^ ERROR method `bar` has an incompatible type for trait
-    fn baz(_: (u16, u16)) {}
-    //~^ ERROR method `baz` has an incompatible type for trait
-    fn qux() -> u16 { 5u16 }
-    //~^ ERROR method `qux` has an incompatible type for trait
-}
-
-fn main() {}