about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorChris Stankus <cdstankus@gmail.com>2016-08-04 15:30:21 -0500
committerChris Stankus <cdstankus@gmail.com>2016-08-04 15:53:48 -0500
commit2f36ecfff0fd6f4d5bd83ba61fc1685c4844dd04 (patch)
treeafed1039c7cfb0f8d6ee5dd2bb6985b8905de40c /src/test
parente804a3cf256106c097d44f6e0212cd183122da07 (diff)
downloadrust-2f36ecfff0fd6f4d5bd83ba61fc1685c4844dd04.tar.gz
rust-2f36ecfff0fd6f4d5bd83ba61fc1685c4844dd04.zip
E0119 update error format
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/E0119.rs3
-rw-r--r--src/test/compile-fail/issue-28568.rs3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/compile-fail/E0119.rs b/src/test/compile-fail/E0119.rs
index 9528631b304..56820bcd184 100644
--- a/src/test/compile-fail/E0119.rs
+++ b/src/test/compile-fail/E0119.rs
@@ -12,7 +12,7 @@ trait MyTrait {
     fn get(&self) -> usize;
 }
 
-impl<T> MyTrait for T {
+impl<T> MyTrait for T { //~ NOTE first implementation here
     fn get(&self) -> usize { 0 }
 }
 
@@ -21,6 +21,7 @@ struct Foo {
 }
 
 impl MyTrait for Foo { //~ ERROR E0119
+                       //~| NOTE conflicting implementation for `Foo`
     fn get(&self) -> usize { self.value }
 }
 
diff --git a/src/test/compile-fail/issue-28568.rs b/src/test/compile-fail/issue-28568.rs
index 7c051784f61..f03daafc637 100644
--- a/src/test/compile-fail/issue-28568.rs
+++ b/src/test/compile-fail/issue-28568.rs
@@ -11,12 +11,13 @@
 struct MyStruct;
 
 impl Drop for MyStruct {
-//~^ NOTE conflicting implementation is here
+//~^ NOTE first implementation here
     fn drop(&mut self) { }
 }
 
 impl Drop for MyStruct {
 //~^ ERROR conflicting implementations of trait
+//~| NOTE conflicting implementation for `MyStruct`
     fn drop(&mut self) { }
 }