New upstream version 1.41.1+dfsg1

[rustc.git] / src / test / ui / coherence / coherence-overlap-downstream-inherent.rs

diff --git a/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs b/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs
index ad54d247f918d0386a21937cb14eecd04ea29470..5dea33e330b62fcb453058e98313b2f50cf5a5cb 100644 (file)
--- a/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs
+++ b/src/test/ui/coherence/coherence-overlap-downstream-inherent.rs
@@ -1,23 +1,17 @@
 // Tests that we consider `T: Sugar + Fruit` to be ambiguous, even
 // though no impls are found.
 
-// revisions: old re
-
-#![cfg_attr(re, feature(re_rebalance_coherence))]
-
 struct Sweet<X>(X);
 pub trait Sugar {}
 pub trait Fruit {}
 impl<T:Sugar> Sweet<T> { fn dummy(&self) { } }
-//[old]~^ ERROR E0592
-//[re]~^^ ERROR E0592
+//~^ ERROR E0592
 impl<T:Fruit> Sweet<T> { fn dummy(&self) { } }
 
 trait Bar<X> {}
 struct A<T, X>(T, X);
 impl<X, T> A<T, X> where T: Bar<X> { fn f(&self) {} }
-//[old]~^ ERROR E0592
-//[re]~^^ ERROR E0592
+//~^ ERROR E0592
 impl<X> A<i32, X> { fn f(&self) {} }
 
 fn main() {}