about summary refs log tree commit diff
path: root/src/test/incremental
diff options
context:
space:
mode:
authorSantiago Pastorino <spastorino@gmail.com>2020-12-02 12:19:38 -0300
committerSantiago Pastorino <spastorino@gmail.com>2020-12-02 12:19:38 -0300
commit37354ebc9794b0eb14b08c02177e3094c8fe91cd (patch)
treebc9a0e3278d1415afae16c30b375f4bae4f38e22 /src/test/incremental
parentb7ebc6b0c1ba3c27ebb17c0b496ece778ef11e18 (diff)
downloadrust-37354ebc9794b0eb14b08c02177e3094c8fe91cd.tar.gz
rust-37354ebc9794b0eb14b08c02177e3094c8fe91cd.zip
Revert "Auto merge of #79209 - spastorino:trait-inheritance-self, r=nikomatsakis"
This reverts commit 349b3b324dade7ca638091db93ba08bbc443c63d, reversing
changes made to b776d1c3e3db8befabb123ebb1e46c3531eaed46.
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 b502e7207d5..03bb5eea765 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 super predicates of `T2`
+pub trait T2: T1 { }
+//[cfail2]~^ ERROR cycle detected when computing the supertraits of `T2`
 
-pub trait T1: T2 {}
+pub trait T1: T2 { }
 
-fn main() {}
+fn main() { }