From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../ui/coherence/coherence-overlap-messages.stderr | 44 ----------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 src/test/ui/coherence/coherence-overlap-messages.stderr

(limited to 'src/test/ui/coherence/coherence-overlap-messages.stderr')

diff --git a/src/test/ui/coherence/coherence-overlap-messages.stderr b/src/test/ui/coherence/coherence-overlap-messages.stderr
deleted file mode 100644
index 5a97296ee..000000000
--- a/src/test/ui/coherence/coherence-overlap-messages.stderr
+++ /dev/null
@@ -1,44 +0,0 @@
-error[E0119]: conflicting implementations of trait `Foo`
-  --> $DIR/coherence-overlap-messages.rs:4:1
-   |
-LL | impl<T> Foo for T {}
-   | ----------------- first implementation here
-LL | impl<U> Foo for U {}
-   | ^^^^^^^^^^^^^^^^^ conflicting implementation
-
-error[E0119]: conflicting implementations of trait `Bar` for type `(u8, u8)`
-  --> $DIR/coherence-overlap-messages.rs:11:1
-   |
-LL | impl<T> Bar for (T, u8) {}
-   | ----------------------- first implementation here
-LL | impl<T> Bar for (u8, T) {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(u8, u8)`
-
-error[E0119]: conflicting implementations of trait `Baz<u8>` for type `u8`
-  --> $DIR/coherence-overlap-messages.rs:17:1
-   |
-LL | impl<T> Baz<u8> for T {}
-   | --------------------- first implementation here
-LL | impl<T> Baz<T> for u8 {}
-   | ^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `u8`
-
-error[E0119]: conflicting implementations of trait `Quux<_, _>`
-  --> $DIR/coherence-overlap-messages.rs:23:1
-   |
-LL | impl<T, U, V> Quux<U, V> for T {}
-   | ------------------------------ first implementation here
-LL | impl<T, U> Quux<U, U> for T {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
-
-error[E0119]: conflicting implementations of trait `Quux<_, _>`
-  --> $DIR/coherence-overlap-messages.rs:25:1
-   |
-LL | impl<T, U, V> Quux<U, V> for T {}
-   | ------------------------------ first implementation here
-...
-LL | impl<T, V> Quux<T, V> for T {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0119`.
-- 
cgit v1.2.3