From 698f8c2f01ea549d77d7dc3338a12e04c11057b9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:02:58 +0200
Subject: Adding upstream version 1.64.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/test/ui/coherence/coherence-projection-conflict.stderr | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src/test/ui/coherence/coherence-projection-conflict.stderr

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

diff --git a/src/test/ui/coherence/coherence-projection-conflict.stderr b/src/test/ui/coherence/coherence-projection-conflict.stderr
new file mode 100644
index 000000000..7d2c584c3
--- /dev/null
+++ b/src/test/ui/coherence/coherence-projection-conflict.stderr
@@ -0,0 +1,12 @@
+error[E0119]: conflicting implementations of trait `Foo<i32>` for type `i32`
+  --> $DIR/coherence-projection-conflict.rs:11:1
+   |
+LL | impl Foo<i32> for i32 { }
+   | --------------------- first implementation here
+LL |
+LL | impl<A:Bar> Foo<A::Output> for A { }
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `i32`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0119`.
-- 
cgit v1.2.3