New upstream version 1.41.1+dfsg1

[rustc.git] / src / test / ui / coherence / coherence-projection-conflict-orphan.rs

diff --git a/src/test/ui/coherence/coherence-projection-conflict-orphan.rs b/src/test/ui/coherence/coherence-projection-conflict-orphan.rs
index 4f7fc71536ba81b95da0009f69b2b394965bf961..637dd250638bb08bacf62343bdc83d997529de42 100644 (file)
--- a/src/test/ui/coherence/coherence-projection-conflict-orphan.rs
+++ b/src/test/ui/coherence/coherence-projection-conflict-orphan.rs
@@ -1,6 +1,3 @@
-// revisions: old re
-
-#![cfg_attr(re, feature(re_rebalance_coherence))]
 #![feature(rustc_attrs)]
 
 // Here we expect a coherence conflict because, even though `i32` does
@@ -17,7 +14,6 @@ pub trait Bar {
 impl Foo<i32> for i32 { }
 
 impl<A:Iterator> Foo<A::Item> for A { }
-//[old]~^ ERROR E0119
-//[re]~^^ ERROR E0119
+//~^ ERROR E0119
 
 fn main() {}