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

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../ui/coherence/coherence-overlap-upstream-inherent.rs  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 tests/ui/coherence/coherence-overlap-upstream-inherent.rs

(limited to 'tests/ui/coherence/coherence-overlap-upstream-inherent.rs')

diff --git a/tests/ui/coherence/coherence-overlap-upstream-inherent.rs b/tests/ui/coherence/coherence-overlap-upstream-inherent.rs
new file mode 100644
index 000000000..082d753de
--- /dev/null
+++ b/tests/ui/coherence/coherence-overlap-upstream-inherent.rs
@@ -0,0 +1,16 @@
+// Tests that we consider `i16: Remote` to be ambiguous, even
+// though the upstream crate doesn't implement it for now.
+
+// aux-build:coherence_lib.rs
+
+
+extern crate coherence_lib;
+
+use coherence_lib::Remote;
+
+struct A<X>(X);
+impl<T> A<T> where T: Remote { fn dummy(&self) { } }
+//~^ ERROR E0592
+impl A<i16> { fn dummy(&self) { } }
+
+fn main() {}
-- 
cgit v1.2.3