Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 41 deletions

diff --git a/src/test/ui/impl-trait/impl-generic-mismatch.rs b/src/test/ui/impl-trait/impl-generic-mismatch.rs
deleted file mode 100644
index fb8bde0d0..000000000
--- a/src/test/ui/impl-trait/impl-generic-mismatch.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use std::fmt::Debug;
-
-trait Foo {
-    fn foo(&self, _: &impl Debug);
-}
-
-impl Foo for () {
-    fn foo<U: Debug>(&self, _: &U) { }
-    //~^ Error method `foo` has incompatible signature for trait
-}
-
-trait Bar {
-    fn bar<U: Debug>(&self, _: &U);
-}
-
-impl Bar for () {
-    fn bar(&self, _: &impl Debug) { }
-    //~^ Error method `bar` has incompatible signature for trait
-}
-
-trait Baz {
-    fn baz<U: Debug, T: Debug>(&self, _: &U, _: &T);
-}
-
-impl Baz for () {
-    fn baz<T: Debug>(&self, _: &impl Debug, _: &T) { }
-    //~^ Error method `baz` has incompatible signature for trait
-}
-
-// With non-local trait (#49841):
-
-use std::hash::{Hash, Hasher};
-
-struct X;
-
-impl Hash for X {
-    fn hash(&self, hasher: &mut impl Hasher) {}
-    //~^ Error method `hash` has incompatible signature for trait
-}
-
-fn main() {}