Bless tests

rust-lang · Nov 27, 2020 · 6ab8fe2 · 6ab8fe2
1 parent dd267fe
commit 6ab8fe2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git 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() {}
diff --git a/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.stderr b/src/test/ui/cycle-trait/cycle-trait-supertrait-direct.stderr
@@ -1,4 +1,4 @@
-error[E0391]: cycle detected when computing the supertraits of `Chromosome`
+error[E0391]: cycle detected when computing the super predicates of `Chromosome`
   --> $DIR/cycle-trait-supertrait-direct.rs:3:1
    |
 LL | trait Chromosome: Chromosome {
@@ -9,7 +9,7 @@ note: ...which requires computing the supertraits of `Chromosome`...
    |
 LL | trait Chromosome: Chromosome {
    |                   ^^^^^^^^^^
-   = note: ...which again requires computing the supertraits of `Chromosome`, completing the cycle
+   = note: ...which again requires computing the super predicates of `Chromosome`, completing the cycle
 note: cycle used when collecting item types in top-level module
   --> $DIR/cycle-trait-supertrait-direct.rs:3:1
    |

diff --git a/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr b/src/test/ui/cycle-trait/cycle-trait-supertrait-indirect.stderr
@@ -1,4 +1,4 @@
-error[E0391]: cycle detected when computing the supertraits of `B`
+error[E0391]: cycle detected when computing the super predicates of `B`
   --> $DIR/cycle-trait-supertrait-indirect.rs:7:1
    |
 LL | trait B: C {
@@ -9,7 +9,7 @@ note: ...which requires computing the supertraits of `B`...
    |
 LL | trait B: C {
    |          ^
-note: ...which requires computing the supertraits of `C`...
+note: ...which requires computing the super predicates of `C`...
   --> $DIR/cycle-trait-supertrait-indirect.rs:11:1
    |
 LL | trait C: B { }
@@ -19,7 +19,7 @@ note: ...which requires computing the supertraits of `C`...
    |
 LL | trait C: B { }
    |          ^
-   = note: ...which again requires computing the supertraits of `B`, completing the cycle
+   = note: ...which again requires computing the super predicates of `B`, completing the cycle
 note: cycle used when computing the supertraits of `A`
   --> $DIR/cycle-trait-supertrait-indirect.rs:4:10
    |

diff --git a/src/test/ui/issues/issue-12511.stderr b/src/test/ui/issues/issue-12511.stderr
@@ -1,4 +1,4 @@
-error[E0391]: cycle detected when computing the supertraits of `T1`
+error[E0391]: cycle detected when computing the super predicates of `T1`
   --> $DIR/issue-12511.rs:1:1
    |
 LL | trait T1 : T2 {
@@ -9,7 +9,7 @@ note: ...which requires computing the supertraits of `T1`...
    |
 LL | trait T1 : T2 {
    |            ^^
-note: ...which requires computing the supertraits of `T2`...
+note: ...which requires computing the super predicates of `T2`...
   --> $DIR/issue-12511.rs:5:1
    |
 LL | trait T2 : T1 {
@@ -19,7 +19,7 @@ note: ...which requires computing the supertraits of `T2`...
    |
 LL | trait T2 : T1 {
    |            ^^
-   = note: ...which again requires computing the supertraits of `T1`, completing the cycle
+   = note: ...which again requires computing the super predicates of `T1`, completing the cycle
 note: cycle used when collecting item types in top-level module
   --> $DIR/issue-12511.rs:1:1
    |