about summary refs log tree commit diff
path: root/src/test/incremental
diff options
context:
space:
mode:
authorSantiago Pastorino <spastorino@gmail.com>2020-12-03 20:10:55 -0300
committerSantiago Pastorino <spastorino@gmail.com>2021-02-05 18:56:56 -0300
commit7aa602b84c93c0f2072e0e1638a1cddcd9637ca4 (patch)
tree04e211d7d27d6076aa8f3ac016d8855c3d107902 /src/test/incremental
parent23adf9fd843da7a3394c824b056f93151aaa40ad (diff)
downloadrust-7aa602b84c93c0f2072e0e1638a1cddcd9637ca4.tar.gz
rust-7aa602b84c93c0f2072e0e1638a1cddcd9637ca4.zip
Revert "Auto merge of #79637 - spastorino:revert-trait-inheritance-self, r=Mark-Simulacrum"
This reverts commit b4def89d76896eec73b4af33642ba7e5eb53c567, reversing
changes made to 7dc1e852d43cb8c9e77dc1e53014f0eb85d2ebfb.
Diffstat (limited to 'src/test/incremental')
-rw-r--r--src/test/incremental/cyclic-trait-hierarchy.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/incremental/cyclic-trait-hierarchy.rs b/src/test/incremental/cyclic-trait-hierarchy.rs
index 03bb5eea765..b502e7207d5 100644
--- a/src/test/incremental/cyclic-trait-hierarchy.rs
+++ b/src/test/incremental/cyclic-trait-hierarchy.rs
@@ -3,11 +3,11 @@
 // revisions: rpass1 cfail2
 
 #[cfg(rpass1)]
-pub trait T2 { }
+pub trait T2 {}
 #[cfg(cfail2)]
-pub trait T2: T1 { }
-//[cfail2]~^ ERROR cycle detected when computing the supertraits of `T2`
+pub trait T2: T1 {}
+//[cfail2]~^ ERROR cycle detected when computing the super predicates of `T2`
 
-pub trait T1: T2 { }
+pub trait T1: T2 {}
 
-fn main() { }
+fn main() {}