Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 18 deletions

diff --git a/src/test/ui/issues/issue-21974.rs b/src/test/ui/issues/issue-21974.rs
deleted file mode 100644
index f7c659be1..000000000
--- a/src/test/ui/issues/issue-21974.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Test that (for now) we report an ambiguity error here, because
-// specific trait relationships are ignored for the purposes of trait
-// matching. This behavior should likely be improved such that this
-// test passes. See #21974 for more details.
-
-trait Foo {
-    fn foo(self);
-}
-
-fn foo<'a,'b,T>(x: &'a T, y: &'b T)
-    where &'a T : Foo, //~ ERROR type annotations needed
-          &'b T : Foo
-{
-    x.foo();
-    y.foo();
-}
-
-fn main() { }