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>
---
 .../coherence/coherence-projection-conflict-ty-param.stderr  | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create 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
new file mode 100644
index 000000000..6492747bb
--- /dev/null
+++ b/src/test/ui/coherence/coherence-projection-conflict-ty-param.stderr
@@ -0,0 +1,12 @@
+error[E0119]: conflicting implementations of trait `Foo<_>` for type `std::option::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 `std::option::Option<_>`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0119`.
-- 
cgit v1.2.3