about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorathulappadan <a4athulappadan@gmail.com>2016-08-30 10:29:24 +0530
committerathulappadan <a4athulappadan@gmail.com>2016-08-30 10:29:24 +0530
commitfb65fe95ebb51ae2fc153d96127cfd6b5860dd02 (patch)
tree98d9631ddd46103149e95fc3dba2df2aea0ef207 /src/test
parentaddb7537620feb228d6c9fe149b9c069d3686199 (diff)
downloadrust-fb65fe95ebb51ae2fc153d96127cfd6b5860dd02.tar.gz
rust-fb65fe95ebb51ae2fc153d96127cfd6b5860dd02.zip
Update compiler error 0034 to use new format.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/E0034.rs14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/test/compile-fail/E0034.rs b/src/test/compile-fail/E0034.rs
index 669bece0f7d..136a74f7a8b 100644
--- a/src/test/compile-fail/E0034.rs
+++ b/src/test/compile-fail/E0034.rs
@@ -18,9 +18,17 @@ trait Trait2 {
     fn foo();
 }
 
-impl Trait1 for Test { fn foo() {} }
-impl Trait2 for Test { fn foo() {} }
+impl Trait1 for Test {
+    fn foo() {}
+    //~^ NOTE candidate #1 is defined in an impl of the trait `Trait1` for the type `Test`
+}
+
+impl Trait2 for Test {
+    fn foo() {}
+    //~^ NOTE candidate #2 is defined in an impl of the trait `Trait2` for the type `Test`
+}
 
 fn main() {
-    Test::foo() //~ ERROR E0034
+    Test::foo() //~ ERROR multiple applicable items in scope
+    //~| NOTE multiple `foo` found
 }