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>
---
 ...oherence-conflicting-negative-trait-impl.stderr | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr

(limited to 'src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr')

diff --git a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
deleted file mode 100644
index 2463f38a9..000000000
--- a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
+++ /dev/null
@@ -1,22 +0,0 @@
-error[E0751]: found both positive and negative implementation of trait `Send` for type `TestType<_>`:
-  --> $DIR/coherence-conflicting-negative-trait-impl.rs:11:1
-   |
-LL | unsafe impl<T: MyTrait + 'static> Send for TestType<T> {}
-   | ------------------------------------------------------ positive implementation here
-LL |
-LL | impl<T: MyTrait> !Send for TestType<T> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ negative implementation here
-
-error[E0119]: conflicting implementations of trait `Send` for type `TestType<_>`
-  --> $DIR/coherence-conflicting-negative-trait-impl.rs:13:1
-   |
-LL | unsafe impl<T: MyTrait + 'static> Send for TestType<T> {}
-   | ------------------------------------------------------ first implementation here
-...
-LL | unsafe impl<T: 'static> Send for TestType<T> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `TestType<_>`
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0119, E0751.
-For more information about an error, try `rustc --explain E0119`.
-- 
cgit v1.2.3