Unify tests

Implement compile tests as variants of existing tests

Author: weiznich

src/test/ui/coherence/coherence-all-remote.rs

@@ -1,9 +1,13 @@
 // aux-build:coherence_lib.rs
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
 
 extern crate coherence_lib as lib;
 use lib::Remote1;
 
 impl<T> Remote1<T> for isize { }
-//~^ ERROR E0210
+//[old]~^ ERROR E0210
+//[re]~^^ ERROR E0210
 
 fn main() { }

src/test/ui/coherence/coherence-bigint-param.rs

@@ -1,11 +1,15 @@
 // aux-build:coherence_lib.rs
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
 
 extern crate coherence_lib as lib;
 use lib::Remote1;
 
 pub struct BigInt;
 
 impl<T> Remote1<BigInt> for T { }
-//~^ ERROR type parameter `T` must be used as the type parameter for some local type
+//[old]~^ ERROR type parameter `T` must be used as the type parameter for some local type
+//[re]~^^ ERROR E0210
 
 fn main() { }

src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.rs

@@ -1,3 +1,7 @@
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
+
 use std::fmt::Debug;
 use std::default::Default;
 
@@ -21,7 +25,10 @@ impl<T:Even> MyTrait for T {
     fn get(&self) -> usize { 0 }
 }
 
-impl<T:Odd> MyTrait for T { //~ ERROR E0119
+impl<T:Odd> MyTrait for T {
+//[old]~^ ERROR E0119
+//[re]~^^ ERROR E0119
+
     fn get(&self) -> usize { 0 }
 }
 

src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.rs

@@ -1,3 +1,7 @@
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
+
 use std::fmt::Debug;
 use std::default::Default;
 
@@ -17,7 +21,9 @@ impl<T:Even> MyTrait for T {
     fn get(&self) -> usize { 0 }
 }
 
-impl<T:Odd> MyTrait for T { //~ ERROR E0119
+impl<T:Odd> MyTrait for T {
+//[old]~^ ERROR E0119
+//[re]~^^ ERROR E0119
     fn get(&self) -> usize { 0 }
 }
 

src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.rs

@@ -1,4 +1,7 @@
 // aux-build:go_trait.rs
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
 
 extern crate go_trait;
 
@@ -12,7 +15,9 @@ impl Go for MyThingy {
     fn go(&self, arg: isize) { }
 }
 
-impl GoMut for MyThingy { //~ ERROR conflicting implementations
+impl GoMut for MyThingy {
+//[old]~^ ERROR conflicting implementations
+//[re]~^^ ERROR E0119
     fn go_mut(&mut self, arg: isize) { }
 }
 

src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.rs

@@ -1,3 +1,7 @@
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
+
 use std::fmt::Debug;
 use std::default::Default;
 
@@ -19,7 +23,9 @@ struct MyType {
     dummy: usize
 }
 
-impl MyTrait<MyType> for MyType { //~ ERROR E0119
+impl MyTrait<MyType> for MyType {
+//[old]~^ ERROR E0119
+//[re]~^^ ERROR E0119
     fn get(&self) -> usize { (*self).clone() }
 }
 

src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.rs

@@ -1,6 +1,10 @@
 // Test that a blank impl for all T:PartialEq conflicts with an impl for some
 // specific T when T:PartialEq.
 
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
+
 trait OtherTrait {
     fn noop(&self);
 }
@@ -17,7 +21,9 @@ struct MyType {
     dummy: usize
 }
 
-impl MyTrait for MyType { //~ ERROR E0119
+impl MyTrait for MyType {
+//[old]~^ ERROR E0119
+//[re]~^^ ERROR E0119
     fn get(&self) -> usize { self.dummy }
 }
 

src/test/ui/coherence/coherence-blanket-conflicts-with-specific.rs

@@ -1,3 +1,7 @@
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
+
 use std::fmt::Debug;
 use std::default::Default;
 
@@ -16,7 +20,9 @@ struct MyType {
     dummy: usize
 }
 
-impl MyTrait for MyType { //~ ERROR E0119
+impl MyTrait for MyType {
+//[old]~^ ERROR E0119
+//[re]~^^ ERROR E0119
     fn get(&self) -> usize { self.dummy }
 }
 

src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs

@@ -1,3 +1,6 @@
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
 #![feature(optin_builtin_traits)]
 #![feature(overlapping_marker_traits)]
 
@@ -8,11 +11,13 @@ struct TestType<T>(::std::marker::PhantomData<T>);
 unsafe impl<T: MyTrait+'static> Send for TestType<T> {}
 
 impl<T: MyTrait> !Send for TestType<T> {}
-//~^ ERROR conflicting implementations of trait `std::marker::Send`
+//[old]~^ ERROR conflicting implementations of trait `std::marker::Send`
+//[re]~^^ ERROR E0119
 
 unsafe impl<T:'static> Send for TestType<T> {}
 
 impl !Send for TestType<i32> {}
-//~^ ERROR conflicting implementations of trait `std::marker::Send`
+//[old]~^ ERROR conflicting implementations of trait `std::marker::Send`
+//[re]~^^ ERROR E0119
 
 fn main() {}

src/test/ui/coherence/coherence-cow.a.stderr

@@ -1,7 +1,7 @@
 error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
-  --> $DIR/coherence-cow.rs:16:1
+  --> $DIR/coherence-cow.rs:28:1
    |
-LL | impl<T> Remote for Pair<T,Cover<T>> { } //[a]~ ERROR E0210
+LL | impl<T> Remote for Pair<T,Cover<T>> { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
    |
    = note: only traits defined in the current crate can be implemented for a type parameter

src/test/ui/coherence/coherence-cow.b.stderr

@@ -1,7 +1,7 @@
 error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
-  --> $DIR/coherence-cow.rs:19:1
+  --> $DIR/coherence-cow.rs:33:1
    |
-LL | impl<T> Remote for Pair<Cover<T>,T> { } //[b]~ ERROR E0210
+LL | impl<T> Remote for Pair<Cover<T>,T> { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
    |
    = note: only traits defined in the current crate can be implemented for a type parameter

src/test/ui/coherence/coherence-cow.c.stderr

@@ -1,5 +1,5 @@
 error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
-  --> $DIR/coherence-cow.rs:22:1
+  --> $DIR/coherence-cow.rs:38:1
    |
 LL | impl<T,U> Remote for Pair<Cover<T>,U> { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type

src/test/ui/coherence/coherence-cow.rs

@@ -1,4 +1,6 @@
-// revisions: a b c
+// revisions: a b c re_a re_b re_c
+
+#![cfg_attr(any(re_a, re_b, re_c), feature(re_rebalance_coherence))]
 
 // aux-build:coherence_lib.rs
 
@@ -12,14 +14,19 @@ use lib::{Remote,Pair};
 
 pub struct Cover<T>(T);
 
-#[cfg(a)]
-impl<T> Remote for Pair<T,Cover<T>> { } //[a]~ ERROR E0210
+#[cfg(any(a, re_a))]
+impl<T> Remote for Pair<T,Cover<T>> { }
+//[a]~^ ERROR E0210
+//[re_a]~^^ ERROR E0117
 
-#[cfg(b)]
-impl<T> Remote for Pair<Cover<T>,T> { } //[b]~ ERROR E0210
+#[cfg(any(b, re_b))]
+impl<T> Remote for Pair<Cover<T>,T> { }
+//[b]~^ ERROR E0210
+//[re_b]~^^ ERROR E0117
 
-#[cfg(c)]
+#[cfg(any(c, re_c))]
 impl<T,U> Remote for Pair<Cover<T>,U> { }
 //[c]~^ ERROR type parameter `T` must be used as the type parameter for some local type
+//[re_c]~^^ ERROR E0117
 
 fn main() { }

src/test/ui/coherence/coherence-cross-crate-conflict.rs

@@ -2,12 +2,18 @@
 // generalizes the one upstream
 
 // aux-build:trait_impl_conflict.rs
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
+
 extern crate trait_impl_conflict;
 use trait_impl_conflict::Foo;
 
 impl<A> Foo for A {
-    //~^ ERROR type parameter `A` must be used as the type parameter for some local type
-    //~| ERROR conflicting implementations of trait `trait_impl_conflict::Foo` for type `isize`
+    //[old]~^ ERROR type parameter `A` must be used as the type parameter for some local type
+    //[old]~| ERROR conflicting implementations of trait `trait_impl_conflict::Foo` for type `isize`
+    //[re]~^^^ ERROR E0119
+    //[re]~| ERROR E0210
 }
 
 fn main() {

src/test/ui/coherence/coherence-default-trait-impl.rs

@@ -1,15 +1,20 @@
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
 #![feature(optin_builtin_traits)]
 
 auto trait MySafeTrait {}
 
 struct Foo;
 
 unsafe impl MySafeTrait for Foo {}
-//~^ ERROR implementing the trait `MySafeTrait` is not unsafe
+//[old]~^ ERROR implementing the trait `MySafeTrait` is not unsafe
+//[re]~^^ ERROR E0199
 
 unsafe auto trait MyUnsafeTrait {}
 
 impl MyUnsafeTrait for Foo {}
-//~^ ERROR the trait `MyUnsafeTrait` requires an `unsafe impl` declaration
+//[old]~^ ERROR the trait `MyUnsafeTrait` requires an `unsafe impl` declaration
+//[re]~^^ ERROR E0200
 
 fn main() {}

src/test/ui/coherence/coherence-error-suppression.rs

@@ -1,12 +1,18 @@
 // check that error types in coherence do not cause error cascades.
 
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
+
 trait Foo {}
 
 impl Foo for i8 {}
 impl Foo for i16 {}
 impl Foo for i32 {}
 impl Foo for i64 {}
-impl Foo for DoesNotExist {} //~ ERROR cannot find type `DoesNotExist` in this scope
+impl Foo for DoesNotExist {}
+//[old]~^ ERROR cannot find type `DoesNotExist` in this scope
+//[re]~^^ ERROR E0412
 impl Foo for u8 {}
 impl Foo for u16 {}
 impl Foo for u32 {}

src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.rs

@@ -1,9 +1,15 @@
 // Test that we give suitable error messages when the user attempts to
 // impl a trait `Trait` for its own object type.
 
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
+
 // If the trait is not object-safe, we give a more tailored message
 // because we're such schnuckels:
 trait NotObjectSafe { fn eq(&self, other: Self); }
-impl NotObjectSafe for NotObjectSafe { } //~ ERROR E0038
+impl NotObjectSafe for NotObjectSafe { }
+//[old]~^ ERROR E0038
+//[re]~^^ ERROR E0038
 
 fn main() { }

src/test/ui/coherence/coherence-impl-trait-for-trait.rs

@@ -1,14 +1,24 @@
 // Test that we give suitable error messages when the user attempts to
 // impl a trait `Trait` for its own object type.
 
+// revisions: old re
+
+#![cfg_attr(re, feature(re_rebalance_coherence))]
+
 trait Foo { fn dummy(&self) { } }
 trait Bar: Foo { }
 trait Baz: Bar { }
 
 // Supertraits of Baz are not legal:
-impl Foo for Baz { }   //~ ERROR E0371
-impl Bar for Baz { }   //~ ERROR E0371
-impl Baz for Baz { }   //~ ERROR E0371
+impl Foo for Baz { }
+//[old]~^ ERROR E0371
+//[re]~^^ ERROR E0371
+impl Bar for Baz { }
+//[old]~^ ERROR E0371
+//[re]~^^ ERROR E0371
+impl Baz for Baz { }
+//[old]~^ ERROR E0371
+//[re]~^^ ERROR E0371
 
 // But other random traits are:
 trait Other { }