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

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

diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr b/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr
deleted file mode 100644
index b1ee0795b..000000000
--- a/src/test/ui/coherence/coherence-projection-conflict-orphan.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0119]: conflicting implementations of trait `Foo<i32>` for type `i32`
-  --> $DIR/coherence-projection-conflict-orphan.rs:16:1
-   |
-LL | impl Foo<i32> for i32 { }
-   | --------------------- first implementation here
-LL |
-LL | impl<A:Iterator> Foo<A::Item> for A { }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `i32`
-   |
-   = note: upstream crates may add a new impl of trait `std::iter::Iterator` for type `i32` in future versions
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0119`.
-- 
cgit v1.2.3