From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:03 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- .../coherence/coherence-overlap-downstream-inherent.rs | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/test/ui/coherence/coherence-overlap-downstream-inherent.rs (limited to 'src/test/ui/coherence/coherence-overlap-downstream-inherent.rs') diff --git a/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs b/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs deleted file mode 100644 index 5dea33e33..000000000 --- a/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs +++ /dev/null @@ -1,17 +0,0 @@ -// Tests that we consider `T: Sugar + Fruit` to be ambiguous, even -// though no impls are found. - -struct Sweet(X); -pub trait Sugar {} -pub trait Fruit {} -impl Sweet { fn dummy(&self) { } } -//~^ ERROR E0592 -impl Sweet { fn dummy(&self) { } } - -trait Bar {} -struct A(T, X); -impl A where T: Bar { fn f(&self) {} } -//~^ ERROR E0592 -impl A { fn f(&self) {} } - -fn main() {} -- cgit v1.2.3