Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 20 deletions

diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait.rs b/src/test/ui/coherence/coherence-impl-trait-for-trait.rs
deleted file mode 100644
index 195a37f15..000000000
--- a/src/test/ui/coherence/coherence-impl-trait-for-trait.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Test that we give suitable error messages when the user attempts to
-// impl a trait `Trait` for its own object type.
-
-trait Foo { fn dummy(&self) { } }
-trait Bar: Foo { }
-trait Baz: Bar { }
-
-// Supertraits of Baz are not legal:
-impl Foo for dyn Baz { }
-//~^ ERROR E0371
-impl Bar for dyn Baz { }
-//~^ ERROR E0371
-impl Baz for dyn Baz { }
-//~^ ERROR E0371
-
-// But other random traits are:
-trait Other { }
-impl Other for dyn Baz { } // OK, Other not a supertrait of Baz
-
-fn main() { }