Adjust tests to new error message

aturon · aturon · commit 2234b557bbd0 · 2016-03-11T10:59:40.000-08:00
diff --git a/src/test/compile-fail/associated-item-duplicate-names-2.rs b/src/test/compile-fail/associated-item-duplicate-names-2.rs
@@ -14,7 +14,7 @@ struct Foo;
 
 impl Foo {
     const bar: bool = true;
-    fn bar() {} //~ ERROR duplicate associated function
+    fn bar() {} //~ ERROR duplicate definitions
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/associated-item-duplicate-names-3.rs b/src/test/compile-fail/associated-item-duplicate-names-3.rs
@@ -20,7 +20,7 @@ struct Baz;
 
 impl Foo for Baz {
     type Bar = i16;
-    type Bar = u16; //~ ERROR duplicate associated type
+    type Bar = u16; //~ ERROR duplicate definitions
 }
 
 fn main() {
diff --git a/src/test/compile-fail/associated-item-duplicate-names.rs b/src/test/compile-fail/associated-item-duplicate-names.rs
@@ -19,9 +19,9 @@ trait Foo {
 
 impl Foo for () {
     type Ty = ();
-    type Ty = usize; //~ ERROR duplicate associated type
+    type Ty = usize; //~ ERROR duplicate definitions
     const BAR: u32 = 7;
-    const BAR: u32 = 8; //~ ERROR duplicate associated constant
+    const BAR: u32 = 8; //~ ERROR duplicate definitions
 }
 
 fn main() {
diff --git a/src/test/compile-fail/impl-duplicate-methods.rs b/src/test/compile-fail/impl-duplicate-methods.rs
@@ -11,7 +11,7 @@
 struct Foo;
 impl Foo {
     fn orange(&self){}
-    fn orange(&self){}   //~ ERROR duplicate method
+    fn orange(&self){}   //~ ERROR duplicate definitions
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/issue-4265.rs b/src/test/compile-fail/issue-4265.rs
@@ -17,7 +17,7 @@ impl Foo {
         Foo { baz: 0 }.bar();
     }
 
-    fn bar() { //~ ERROR duplicate associated function
+    fn bar() { //~ ERROR duplicate definitions
     }
 }
 
diff --git a/src/test/compile-fail/issue-8153.rs b/src/test/compile-fail/issue-8153.rs
@@ -18,7 +18,7 @@ trait Bar {
 
 impl Bar for Foo {
     fn bar(&self) -> isize {1}
-    fn bar(&self) -> isize {2} //~ ERROR duplicate method
+    fn bar(&self) -> isize {2} //~ ERROR duplicate definitions
 }
 
 fn main() {
diff --git a/src/test/compile-fail/method-macro-backtrace.rs b/src/test/compile-fail/method-macro-backtrace.rs
@@ -29,7 +29,7 @@ impl S {
 
     // Cause an error. It shouldn't have any macro backtrace frames.
     fn bar(&self) { }
-    fn bar(&self) { } //~ ERROR duplicate method
+    fn bar(&self) { } //~ ERROR duplicate definitions
 }
 
 fn main() { }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ struct Foo;`
`14`	`14`
`15`	`15`	`impl Foo {`
`16`	`16`	`const bar: bool = true;`
`17`		`- fn bar() {} //~ ERROR duplicate associated function`
	`17`	`+ fn bar() {} //~ ERROR duplicate definitions`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`fn main() {}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ struct Baz;`
`20`	`20`
`21`	`21`	`impl Foo for Baz {`
`22`	`22`	`type Bar = i16;`
`23`		`- type Bar = u16; //~ ERROR duplicate associated type`
	`23`	`+ type Bar = u16; //~ ERROR duplicate definitions`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`struct Foo;`
`12`	`12`	`impl Foo {`
`13`	`13`	`fn orange(&self){}`
`14`		`- fn orange(&self){} //~ ERROR duplicate method`
	`14`	`+ fn orange(&self){} //~ ERROR duplicate definitions`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`fn main() {}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ impl Foo {`
`17`	`17`	`Foo { baz: 0 }.bar();`
`18`	`18`	`}`
`19`	`19`
`20`		`- fn bar() { //~ ERROR duplicate associated function`
	`20`	`+ fn bar() { //~ ERROR duplicate definitions`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ trait Bar {`
`18`	`18`
`19`	`19`	`impl Bar for Foo {`
`20`	`20`	`fn bar(&self) -> isize {1}`
`21`		`- fn bar(&self) -> isize {2} //~ ERROR duplicate method`
	`21`	`+ fn bar(&self) -> isize {2} //~ ERROR duplicate definitions`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`fn main() {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ impl S {`
`29`	`29`
`30`	`30`	`// Cause an error. It shouldn't have any macro backtrace frames.`
`31`	`31`	`fn bar(&self) { }`
`32`		`- fn bar(&self) { } //~ ERROR duplicate method`
	`32`	`+ fn bar(&self) { } //~ ERROR duplicate definitions`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`fn main() { }`