rollup merge of #17355 : gamazeps/issue17210

[rust.git] / src / test / compile-fail / conflicting-implementations.rs

diff --git a/src/test/compile-fail/conflicting-implementations.rs b/src/test/compile-fail/conflicting-implementations.rs
index a56b69c07de0857a5f990edd9add1de521d2d160..b5a04491111bf7bb00370ed5efd32326787774df 100644 (file)
--- a/src/test/compile-fail/conflicting-implementations.rs
+++ b/src/test/compile-fail/conflicting-implementations.rs
@@ -8,15 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: conflicting implementations for trait Foo
 trait Foo {
 }
 
-impl Foo for int {
+impl Foo for int { //~ ERROR conflicting implementations
 
 }
 
-impl<A> Foo for A {
+impl<A> Foo for A { //~ NOTE conflicting implementation here
 
 }