bless ui tests

Noratrieb · Noratrieb · commit d3ee0eaa3f26 · 2022-08-22T14:06:55.000+02:00
diff --git a/src/test/ui/associated-consts/defaults-cyclic-fail.stderr b/src/test/ui/associated-consts/defaults-cyclic-fail.stderr
@@ -2,13 +2,13 @@ error[E0391]: cycle detected when const-evaluating + checking `Tr::A`
   --> $DIR/defaults-cyclic-fail.rs:5:5
    |
 LL |     const A: u8 = Self::B;
-   |     ^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^^^^^^^^^
    |
 note: ...which requires const-evaluating + checking `Tr::B`...
   --> $DIR/defaults-cyclic-fail.rs:8:5
    |
 LL |     const B: u8 = Self::A;
-   |     ^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^^^^^^^^^
    = note: ...which again requires const-evaluating + checking `Tr::A`, completing the cycle
 note: cycle used when const-evaluating + checking `main::promoted[1]`
   --> $DIR/defaults-cyclic-fail.rs:16:16
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr b/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-impl.stderr
@@ -13,7 +13,7 @@ note: ...which requires const-evaluating + checking `IMPL_REF_BAR`...
   --> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:7:1
    |
 LL | const IMPL_REF_BAR: u32 = GlobalImplRef::BAR;
-   | ^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires const-evaluating + checking `<impl at $DIR/issue-24949-assoc-const-static-recursion-impl.rs:11:1: 11:19>::BAR`...
   --> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:12:5
    |
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr b/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait-default.stderr
@@ -13,7 +13,7 @@ note: ...which requires const-evaluating + checking `DEFAULT_REF_BAR`...
   --> $DIR/issue-24949-assoc-const-static-recursion-trait-default.rs:11:1
    |
 LL | const DEFAULT_REF_BAR: u32 = <GlobalDefaultRef>::BAR;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires const-evaluating + checking `FooDefault::BAR`...
   --> $DIR/issue-24949-assoc-const-static-recursion-trait-default.rs:8:5
    |
diff --git a/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr b/src/test/ui/associated-consts/issue-24949-assoc-const-static-recursion-trait.stderr
@@ -13,7 +13,7 @@ note: ...which requires const-evaluating + checking `TRAIT_REF_BAR`...
   --> $DIR/issue-24949-assoc-const-static-recursion-trait.rs:7:1
    |
 LL | const TRAIT_REF_BAR: u32 = <GlobalTraitRef>::BAR;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires const-evaluating + checking `<impl at $DIR/issue-24949-assoc-const-static-recursion-trait.rs:11:1: 11:28>::BAR`...
   --> $DIR/issue-24949-assoc-const-static-recursion-trait.rs:12:5
    |
diff --git a/src/test/ui/consts/issue-36163.stderr b/src/test/ui/consts/issue-36163.stderr
@@ -8,7 +8,7 @@ note: ...which requires const-evaluating + checking `A`...
   --> $DIR/issue-36163.rs:1:1
    |
 LL | const A: isize = Foo::B as isize;
-   | ^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: ...which again requires const-evaluating + checking `Foo::B::{constant#0}`, completing the cycle
 note: cycle used when simplifying constant for the type system `Foo::B::{constant#0}`
   --> $DIR/issue-36163.rs:4:9
diff --git a/src/test/ui/issues/issue-17252.stderr b/src/test/ui/issues/issue-17252.stderr
@@ -2,7 +2,7 @@ error[E0391]: cycle detected when const-evaluating + checking `FOO`
   --> $DIR/issue-17252.rs:1:1
    |
 LL | const FOO: usize = FOO;
-   | ^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: ...which immediately requires const-evaluating + checking `FOO` again
 note: cycle used when const-evaluating + checking `main::{constant#0}`
diff --git a/src/test/ui/issues/issue-23302-3.stderr b/src/test/ui/issues/issue-23302-3.stderr
@@ -2,13 +2,13 @@ error[E0391]: cycle detected when const-evaluating + checking `A`
   --> $DIR/issue-23302-3.rs:1:1
    |
 LL | const A: i32 = B;
-   | ^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^
    |
 note: ...which requires const-evaluating + checking `B`...
   --> $DIR/issue-23302-3.rs:3:1
    |
 LL | const B: i32 = A;
-   | ^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^
    = note: ...which again requires const-evaluating + checking `A`, completing the cycle
 note: cycle used when simplifying constant for the type system `A`
   --> $DIR/issue-23302-3.rs:1:1

Original file line number	Diff line number	Diff line change
@@ -2,13 +2,13 @@ error[E0391]: cycle detected when const-evaluating + checking `Tr::A`
`2`	`2`	`--> $DIR/defaults-cyclic-fail.rs:5:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| const A: u8 = Self::B;`
`5`		`- \| ^^^^^^^^^^^`
	`5`	`+ \| ^^^^^^^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	note: ...which requires const-evaluating + checking `Tr::B`...
`8`	`8`	`--> $DIR/defaults-cyclic-fail.rs:8:5`
`9`	`9`	`\|`
`10`	`10`	`LL \| const B: u8 = Self::A;`
`11`		`- \| ^^^^^^^^^^^`
	`11`	`+ \| ^^^^^^^^^^^^^^^^^^^^^`
`12`	`12`	= note: ...which again requires const-evaluating + checking `Tr::A`, completing the cycle
`13`	`13`	note: cycle used when const-evaluating + checking `main::promoted[1]`
`14`	`14`	`--> $DIR/defaults-cyclic-fail.rs:16:16`
Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ note: ...which requires const-evaluating + checking `IMPL_REF_BAR`...
`13`	`13`	`--> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:7:1`
`14`	`14`	`\|`
`15`	`15`	`LL \| const IMPL_REF_BAR: u32 = GlobalImplRef::BAR;`
`16`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^`
	`16`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`17`	`17`	note: ...which requires const-evaluating + checking `<impl at $DIR/issue-24949-assoc-const-static-recursion-impl.rs:11:1: 11:19>::BAR`...
`18`	`18`	`--> $DIR/issue-24949-assoc-const-static-recursion-impl.rs:12:5`
`19`	`19`	`\|`
Original file line number	Diff line number	Diff line change
@@ -8,7 +8,7 @@ note: ...which requires const-evaluating + checking `A`...
`8`	`8`	`--> $DIR/issue-36163.rs:1:1`
`9`	`9`	`\|`
`10`	`10`	`LL \| const A: isize = Foo::B as isize;`
`11`		`- \| ^^^^^^^^^^^^^^`
	`11`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`12`	`12`	= note: ...which again requires const-evaluating + checking `Foo::B::{constant#0}`, completing the cycle
`13`	`13`	note: cycle used when simplifying constant for the type system `Foo::B::{constant#0}`
`14`	`14`	`--> $DIR/issue-36163.rs:4:9`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0391]: cycle detected when const-evaluating + checking `FOO`
`2`	`2`	`--> $DIR/issue-17252.rs:1:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| const FOO: usize = FOO;`
`5`		`- \| ^^^^^^^^^^^^^^^^`
	`5`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	= note: ...which immediately requires const-evaluating + checking `FOO` again
`8`	`8`	note: cycle used when const-evaluating + checking `main::{constant#0}`
Original file line number	Diff line number	Diff line change
@@ -2,13 +2,13 @@ error[E0391]: cycle detected when const-evaluating + checking `A`
`2`	`2`	`--> $DIR/issue-23302-3.rs:1:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| const A: i32 = B;`
`5`		`- \| ^^^^^^^^^^^^`
	`5`	`+ \| ^^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	note: ...which requires const-evaluating + checking `B`...
`8`	`8`	`--> $DIR/issue-23302-3.rs:3:1`
`9`	`9`	`\|`
`10`	`10`	`LL \| const B: i32 = A;`
`11`		`- \| ^^^^^^^^^^^^`
	`11`	`+ \| ^^^^^^^^^^^^^^^^`
`12`	`12`	= note: ...which again requires const-evaluating + checking `A`, completing the cycle
`13`	`13`	note: cycle used when simplifying constant for the type system `A`
`14`	`14`	`--> $DIR/issue-23302-3.rs:1:1`