Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 10 deletions

diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs b/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs
deleted file mode 100644
index 20ff87549..000000000
--- a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Test that we give suitable error messages when the user attempts to
-// impl a trait `Trait` for its own object type.
-
-// If the trait is not object-safe, we give a more tailored message
-// because we're such schnuckels:
-trait NotObjectSafe { fn eq(&self, other: Self); }
-impl NotObjectSafe for dyn NotObjectSafe { }
-//~^ ERROR E0038
-
-fn main() { }