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>
---
 .../coherence/coherence-projection-conflict-ty-param.stderr  | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr

(limited to 'src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr')

diff --git a/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr b/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr
deleted file mode 100644
index 94d242eaa..000000000
--- a/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0119]: conflicting implementations of trait `Foo<_>` for type `Option<_>`
-  --> $DIR/coherence-projection-conflict-ty-param.rs:10:1
-   |
-LL | impl <P, T: Foo<P>> Foo<P> for Option<T> {}
-   | ---------------------------------------- first implementation here
-LL |
-LL | impl<T, U> Foo<T> for Option<U> { }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Option<_>`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0119`.
-- 
cgit v1.2.3