about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAaron Turon <aturon@mozilla.com>2015-12-30 06:56:06 -0800
committerAaron Turon <aturon@mozilla.com>2016-03-14 15:04:38 -0700
commit7976e3654400a53fc9ef98cda19769fabd57b846 (patch)
tree63c6ab49744558f0ebf2f6b835dd6f865c61b18a /src
parentd8160799b5c464ccdb99e4bab7196440106c1972 (diff)
downloadrust-7976e3654400a53fc9ef98cda19769fabd57b846.tar.gz
rust-7976e3654400a53fc9ef98cda19769fabd57b846.zip
Adjust test for new overlap message on default trait impls
Diffstat (limited to 'src')
-rw-r--r--src/test/compile-fail/coherence-default-trait-impl.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/compile-fail/coherence-default-trait-impl.rs b/src/test/compile-fail/coherence-default-trait-impl.rs
index 0705702b031..3d109de76cc 100644
--- a/src/test/compile-fail/coherence-default-trait-impl.rs
+++ b/src/test/compile-fail/coherence-default-trait-impl.rs
@@ -15,7 +15,7 @@ trait MyTrait {}
 impl MyTrait for .. {}
 
 impl MyTrait for .. {}
-//~^ ERROR conflicting implementations of trait `MyTrait`
+//~^ ERROR redundant default implementations of trait `MyTrait`
 
 trait MySafeTrait {}