From 9f16c2ce59ac942e1c0415987012100756a44039 Mon Sep 17 00:00:00 2001 From: Aaron Turon Date: Wed, 30 Dec 2015 07:00:05 -0800 Subject: [PATCH] Adjust coherence test to reflect that only the orphan rule prevents you from adding *generalizing* impls --- src/test/compile-fail/coherence-cross-crate-conflict.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/compile-fail/coherence-cross-crate-conflict.rs b/src/test/compile-fail/coherence-cross-crate-conflict.rs index a020b518d82..9f74afbb2b3 100644 --- a/src/test/compile-fail/coherence-cross-crate-conflict.rs +++ b/src/test/compile-fail/coherence-cross-crate-conflict.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// Regression test for #3512 - conflicting trait impls in different crates should give a -// 'conflicting implementations' error message. +// The error here is strictly due to orphan rules; the impl here +// generalizes the one upstream // aux-build:trait_impl_conflict.rs extern crate trait_impl_conflict; @@ -17,7 +17,6 @@ impl Foo for A { //~^ ERROR type parameter `A` must be used as the type parameter for some local type - //~^^ ERROR E0119 } fn main() { -- 2.44.0