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>
---
 ...lanket-conflicts-with-specific-multidispatch.rs | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs

(limited to 'src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs')

diff --git a/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs
new file mode 100644
index 000000000..6a9db2173
--- /dev/null
+++ b/src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs
@@ -0,0 +1,27 @@
+use std::fmt::Debug;
+use std::default::Default;
+
+// Test that a blank impl for all T conflicts with an impl for some
+// specific T, even when there are multiple type parameters involved.
+
+trait MyTrait<T> {
+    fn get(&self) -> T;
+}
+
+impl<T> MyTrait<T> for T {
+    fn get(&self) -> T {
+        panic!()
+    }
+}
+
+#[derive(Clone)]
+struct MyType {
+    dummy: usize
+}
+
+impl MyTrait<MyType> for MyType {
+//~^ ERROR E0119
+    fn get(&self) -> usize { (*self).clone() }
+}
+
+fn main() { }
-- 
cgit v1.2.3