Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

64 files changed, 32 insertions, 32 deletions

diff --git a/src/test/ui/variance-intersection-of-ref-and-opt-ref.rs b/tests/ui/variance-intersection-of-ref-and-opt-ref.rs
index 74707a98d..74707a98d 100644
--- a/src/test/ui/variance-intersection-of-ref-and-opt-ref.rs
+++ b/tests/ui/variance-intersection-of-ref-and-opt-ref.rs
diff --git a/src/test/ui/variance-iterators-in-libcore.rs b/tests/ui/variance-iterators-in-libcore.rs
index a542e44d5..a542e44d5 100644
--- a/src/test/ui/variance-iterators-in-libcore.rs
+++ b/tests/ui/variance-iterators-in-libcore.rs
diff --git a/src/test/ui/variance/variance-associated-consts.rs b/tests/ui/variance/variance-associated-consts.rs
index da55bc962..da55bc962 100644
--- a/src/test/ui/variance/variance-associated-consts.rs
+++ b/tests/ui/variance/variance-associated-consts.rs
diff --git a/src/test/ui/variance/variance-associated-consts.stderr b/tests/ui/variance/variance-associated-consts.stderr
index 219f5bca9..4df2d8da3 100644
--- a/src/test/ui/variance/variance-associated-consts.stderr
+++ b/tests/ui/variance/variance-associated-consts.stderr
@@ -1,4 +1,4 @@
-error[E0208]: [o]
+error: [o]
   --> $DIR/variance-associated-consts.rs:13:1
    |
 LL | struct Foo<T: Trait> {
diff --git a/src/test/ui/variance/variance-associated-types.rs b/tests/ui/variance/variance-associated-types.rs
index 1165fb53c..1165fb53c 100644
--- a/src/test/ui/variance/variance-associated-types.rs
+++ b/tests/ui/variance/variance-associated-types.rs
diff --git a/src/test/ui/variance/variance-associated-types.stderr b/tests/ui/variance/variance-associated-types.stderr
index 94f770eda..51f17c7c2 100644
--- a/src/test/ui/variance/variance-associated-types.stderr
+++ b/tests/ui/variance/variance-associated-types.stderr
@@ -1,10 +1,10 @@
-error[E0208]: [-, +]
+error: [-, +]
   --> $DIR/variance-associated-types.rs:13:1
    |
 LL | struct Foo<'a, T : Trait<'a>> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o, o]
+error: [o, o]
   --> $DIR/variance-associated-types.rs:18:1
    |
 LL | struct Bar<'a, T : Trait<'a>> {
diff --git a/src/test/ui/variance/variance-associated-types2.rs b/tests/ui/variance/variance-associated-types2.rs
index e487eefea..e487eefea 100644
--- a/src/test/ui/variance/variance-associated-types2.rs
+++ b/tests/ui/variance/variance-associated-types2.rs
diff --git a/src/test/ui/variance/variance-associated-types2.stderr b/tests/ui/variance/variance-associated-types2.stderr
index 35871c123..35871c123 100644
--- a/src/test/ui/variance/variance-associated-types2.stderr
+++ b/tests/ui/variance/variance-associated-types2.stderr
diff --git a/src/test/ui/variance/variance-btree-invariant-types.rs b/tests/ui/variance/variance-btree-invariant-types.rs
index 09c93d001..09c93d001 100644
--- a/src/test/ui/variance/variance-btree-invariant-types.rs
+++ b/tests/ui/variance/variance-btree-invariant-types.rs
diff --git a/src/test/ui/variance/variance-btree-invariant-types.stderr b/tests/ui/variance/variance-btree-invariant-types.stderr
index 6f7910021..6f7910021 100644
--- a/src/test/ui/variance/variance-btree-invariant-types.stderr
+++ b/tests/ui/variance/variance-btree-invariant-types.stderr
diff --git a/src/test/ui/variance/variance-cell-is-invariant.rs b/tests/ui/variance/variance-cell-is-invariant.rs
index 62ce4f91f..62ce4f91f 100644
--- a/src/test/ui/variance/variance-cell-is-invariant.rs
+++ b/tests/ui/variance/variance-cell-is-invariant.rs
diff --git a/src/test/ui/variance/variance-cell-is-invariant.stderr b/tests/ui/variance/variance-cell-is-invariant.stderr
index ab5435d16..ab5435d16 100644
--- a/src/test/ui/variance/variance-cell-is-invariant.stderr
+++ b/tests/ui/variance/variance-cell-is-invariant.stderr
diff --git a/src/test/ui/variance/variance-contravariant-arg-object.rs b/tests/ui/variance/variance-contravariant-arg-object.rs
index 701fcaf69..701fcaf69 100644
--- a/src/test/ui/variance/variance-contravariant-arg-object.rs
+++ b/tests/ui/variance/variance-contravariant-arg-object.rs
diff --git a/src/test/ui/variance/variance-contravariant-arg-object.stderr b/tests/ui/variance/variance-contravariant-arg-object.stderr
index ab28315e1..ab28315e1 100644
--- a/src/test/ui/variance/variance-contravariant-arg-object.stderr
+++ b/tests/ui/variance/variance-contravariant-arg-object.stderr
diff --git a/src/test/ui/variance/variance-contravariant-arg-trait-match.rs b/tests/ui/variance/variance-contravariant-arg-trait-match.rs
index e0b280105..e0b280105 100644
--- a/src/test/ui/variance/variance-contravariant-arg-trait-match.rs
+++ b/tests/ui/variance/variance-contravariant-arg-trait-match.rs
diff --git a/src/test/ui/variance/variance-contravariant-arg-trait-match.stderr b/tests/ui/variance/variance-contravariant-arg-trait-match.stderr
index df9d93907..df9d93907 100644
--- a/src/test/ui/variance/variance-contravariant-arg-trait-match.stderr
+++ b/tests/ui/variance/variance-contravariant-arg-trait-match.stderr
diff --git a/src/test/ui/variance/variance-contravariant-self-trait-match.rs b/tests/ui/variance/variance-contravariant-self-trait-match.rs
index 8a10554f3..8a10554f3 100644
--- a/src/test/ui/variance/variance-contravariant-self-trait-match.rs
+++ b/tests/ui/variance/variance-contravariant-self-trait-match.rs
diff --git a/src/test/ui/variance/variance-contravariant-self-trait-match.stderr b/tests/ui/variance/variance-contravariant-self-trait-match.stderr
index bfea1b1b3..bfea1b1b3 100644
--- a/src/test/ui/variance/variance-contravariant-self-trait-match.stderr
+++ b/tests/ui/variance/variance-contravariant-self-trait-match.stderr
diff --git a/src/test/ui/variance/variance-covariant-arg-object.rs b/tests/ui/variance/variance-covariant-arg-object.rs
index 89cf3117a..89cf3117a 100644
--- a/src/test/ui/variance/variance-covariant-arg-object.rs
+++ b/tests/ui/variance/variance-covariant-arg-object.rs
diff --git a/src/test/ui/variance/variance-covariant-arg-object.stderr b/tests/ui/variance/variance-covariant-arg-object.stderr
index 51f8cb3ec..51f8cb3ec 100644
--- a/src/test/ui/variance/variance-covariant-arg-object.stderr
+++ b/tests/ui/variance/variance-covariant-arg-object.stderr
diff --git a/src/test/ui/variance/variance-covariant-arg-trait-match.rs b/tests/ui/variance/variance-covariant-arg-trait-match.rs
index 68dd449d5..68dd449d5 100644
--- a/src/test/ui/variance/variance-covariant-arg-trait-match.rs
+++ b/tests/ui/variance/variance-covariant-arg-trait-match.rs
diff --git a/src/test/ui/variance/variance-covariant-arg-trait-match.stderr b/tests/ui/variance/variance-covariant-arg-trait-match.stderr
index 4c7b6cf7c..4c7b6cf7c 100644
--- a/src/test/ui/variance/variance-covariant-arg-trait-match.stderr
+++ b/tests/ui/variance/variance-covariant-arg-trait-match.stderr
diff --git a/src/test/ui/variance/variance-covariant-self-trait-match.rs b/tests/ui/variance/variance-covariant-self-trait-match.rs
index 93c25e980..93c25e980 100644
--- a/src/test/ui/variance/variance-covariant-self-trait-match.rs
+++ b/tests/ui/variance/variance-covariant-self-trait-match.rs
diff --git a/src/test/ui/variance/variance-covariant-self-trait-match.stderr b/tests/ui/variance/variance-covariant-self-trait-match.stderr
index 9b7ba3b66..9b7ba3b66 100644
--- a/src/test/ui/variance/variance-covariant-self-trait-match.stderr
+++ b/tests/ui/variance/variance-covariant-self-trait-match.stderr
diff --git a/src/test/ui/variance/variance-invariant-arg-object.rs b/tests/ui/variance/variance-invariant-arg-object.rs
index 7381b4130..7381b4130 100644
--- a/src/test/ui/variance/variance-invariant-arg-object.rs
+++ b/tests/ui/variance/variance-invariant-arg-object.rs
diff --git a/src/test/ui/variance/variance-invariant-arg-object.stderr b/tests/ui/variance/variance-invariant-arg-object.stderr
index 9793a36be..9793a36be 100644
--- a/src/test/ui/variance/variance-invariant-arg-object.stderr
+++ b/tests/ui/variance/variance-invariant-arg-object.stderr
diff --git a/src/test/ui/variance/variance-invariant-arg-trait-match.rs b/tests/ui/variance/variance-invariant-arg-trait-match.rs
index fbcc24387..fbcc24387 100644
--- a/src/test/ui/variance/variance-invariant-arg-trait-match.rs
+++ b/tests/ui/variance/variance-invariant-arg-trait-match.rs
diff --git a/src/test/ui/variance/variance-invariant-arg-trait-match.stderr b/tests/ui/variance/variance-invariant-arg-trait-match.stderr
index 60ffdd029..60ffdd029 100644
--- a/src/test/ui/variance/variance-invariant-arg-trait-match.stderr
+++ b/tests/ui/variance/variance-invariant-arg-trait-match.stderr
diff --git a/src/test/ui/variance/variance-invariant-self-trait-match.rs b/tests/ui/variance/variance-invariant-self-trait-match.rs
index 95c4c2403..95c4c2403 100644
--- a/src/test/ui/variance/variance-invariant-self-trait-match.rs
+++ b/tests/ui/variance/variance-invariant-self-trait-match.rs
diff --git a/src/test/ui/variance/variance-invariant-self-trait-match.stderr b/tests/ui/variance/variance-invariant-self-trait-match.stderr
index 5b64bd091..5b64bd091 100644
--- a/src/test/ui/variance/variance-invariant-self-trait-match.stderr
+++ b/tests/ui/variance/variance-invariant-self-trait-match.stderr
diff --git a/src/test/ui/variance/variance-issue-20533.rs b/tests/ui/variance/variance-issue-20533.rs
index a2459f873..a2459f873 100644
--- a/src/test/ui/variance/variance-issue-20533.rs
+++ b/tests/ui/variance/variance-issue-20533.rs
diff --git a/src/test/ui/variance/variance-issue-20533.stderr b/tests/ui/variance/variance-issue-20533.stderr
index 008e2a002..008e2a002 100644
--- a/src/test/ui/variance/variance-issue-20533.stderr
+++ b/tests/ui/variance/variance-issue-20533.stderr
diff --git a/src/test/ui/variance/variance-object-types.rs b/tests/ui/variance/variance-object-types.rs
index 6ded24cd1..6ded24cd1 100644
--- a/src/test/ui/variance/variance-object-types.rs
+++ b/tests/ui/variance/variance-object-types.rs
diff --git a/src/test/ui/variance/variance-object-types.stderr b/tests/ui/variance/variance-object-types.stderr
index ceee53aff..55a760425 100644
--- a/src/test/ui/variance/variance-object-types.stderr
+++ b/tests/ui/variance/variance-object-types.stderr
@@ -1,4 +1,4 @@
-error[E0208]: [o]
+error: [o]
   --> $DIR/variance-object-types.rs:7:1
    |
 LL | struct Foo<'a> {
diff --git a/src/test/ui/variance/variance-regions-direct.rs b/tests/ui/variance/variance-regions-direct.rs
index 3f34e7655..3f34e7655 100644
--- a/src/test/ui/variance/variance-regions-direct.rs
+++ b/tests/ui/variance/variance-regions-direct.rs
diff --git a/src/test/ui/variance/variance-regions-direct.stderr b/tests/ui/variance/variance-regions-direct.stderr
index 25fb22732..eda02e9b0 100644
--- a/src/test/ui/variance/variance-regions-direct.stderr
+++ b/tests/ui/variance/variance-regions-direct.stderr
@@ -1,40 +1,40 @@
-error[E0208]: [-, -, -]
+error: [-, -, -]
   --> $DIR/variance-regions-direct.rs:9:1
    |
 LL | struct Test2<'a, 'b, 'c> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, +, +]
+error: [+, +, +]
   --> $DIR/variance-regions-direct.rs:18:1
    |
 LL | struct Test3<'a, 'b, 'c> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [-, o]
+error: [-, o]
   --> $DIR/variance-regions-direct.rs:27:1
    |
 LL | struct Test4<'a, 'b:'a> {
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, o]
+error: [+, o]
   --> $DIR/variance-regions-direct.rs:35:1
    |
 LL | struct Test5<'a, 'b:'a> {
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [-, o]
+error: [-, o]
   --> $DIR/variance-regions-direct.rs:45:1
    |
 LL | struct Test6<'a, 'b:'a> {
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [*]
+error: [*]
   --> $DIR/variance-regions-direct.rs:52:1
    |
 LL | struct Test7<'a> {
    | ^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, -, o]
+error: [+, -, o]
   --> $DIR/variance-regions-direct.rs:59:1
    |
 LL | enum Test8<'a, 'b, 'c:'b> {
diff --git a/src/test/ui/variance/variance-regions-indirect.rs b/tests/ui/variance/variance-regions-indirect.rs
index f84f25ada..f84f25ada 100644
--- a/src/test/ui/variance/variance-regions-indirect.rs
+++ b/tests/ui/variance/variance-regions-indirect.rs
diff --git a/src/test/ui/variance/variance-regions-indirect.stderr b/tests/ui/variance/variance-regions-indirect.stderr
index fc52492d7..fa2f4d507 100644
--- a/src/test/ui/variance/variance-regions-indirect.stderr
+++ b/tests/ui/variance/variance-regions-indirect.stderr
@@ -1,28 +1,28 @@
-error[E0208]: [+, -, o, *]
+error: [+, -, o, *]
   --> $DIR/variance-regions-indirect.rs:8:1
    |
 LL | enum Base<'a, 'b, 'c:'b, 'd> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [*, o, -, +]
+error: [*, o, -, +]
   --> $DIR/variance-regions-indirect.rs:15:1
    |
 LL | struct Derived1<'w, 'x:'y, 'y, 'z> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o, o, *]
+error: [o, o, *]
   --> $DIR/variance-regions-indirect.rs:20:1
    |
 LL | struct Derived2<'a, 'b:'a, 'c> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o, -, *]
+error: [o, -, *]
   --> $DIR/variance-regions-indirect.rs:25:1
    |
 LL | struct Derived3<'a:'b, 'b, 'c> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, -, o]
+error: [+, -, o]
   --> $DIR/variance-regions-indirect.rs:30:1
    |
 LL | struct Derived4<'a, 'b, 'c:'b> {
diff --git a/src/test/ui/variance/variance-regions-unused-direct.rs b/tests/ui/variance/variance-regions-unused-direct.rs
index 2afe012bd..2afe012bd 100644
--- a/src/test/ui/variance/variance-regions-unused-direct.rs
+++ b/tests/ui/variance/variance-regions-unused-direct.rs
diff --git a/src/test/ui/variance/variance-regions-unused-direct.stderr b/tests/ui/variance/variance-regions-unused-direct.stderr
index 1a600f5b0..1a600f5b0 100644
--- a/src/test/ui/variance/variance-regions-unused-direct.stderr
+++ b/tests/ui/variance/variance-regions-unused-direct.stderr
diff --git a/src/test/ui/variance/variance-regions-unused-indirect.rs b/tests/ui/variance/variance-regions-unused-indirect.rs
index 6c2c24ddb..6c2c24ddb 100644
--- a/src/test/ui/variance/variance-regions-unused-indirect.rs
+++ b/tests/ui/variance/variance-regions-unused-indirect.rs
diff --git a/src/test/ui/variance/variance-regions-unused-indirect.stderr b/tests/ui/variance/variance-regions-unused-indirect.stderr
index 14fdd8492..14fdd8492 100644
--- a/src/test/ui/variance/variance-regions-unused-indirect.stderr
+++ b/tests/ui/variance/variance-regions-unused-indirect.stderr
diff --git a/src/test/ui/variance/variance-trait-bounds.rs b/tests/ui/variance/variance-trait-bounds.rs
index ad5334602..ad5334602 100644
--- a/src/test/ui/variance/variance-trait-bounds.rs
+++ b/tests/ui/variance/variance-trait-bounds.rs
diff --git a/src/test/ui/variance/variance-trait-bounds.stderr b/tests/ui/variance/variance-trait-bounds.stderr
index e3ef339f4..5a73e541c 100644
--- a/src/test/ui/variance/variance-trait-bounds.stderr
+++ b/tests/ui/variance/variance-trait-bounds.stderr
@@ -1,22 +1,22 @@
-error[E0208]: [+, +]
+error: [+, +]
   --> $DIR/variance-trait-bounds.rs:16:1
    |
 LL | struct TestStruct<U,T:Setter<U>> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [*, +]
+error: [*, +]
   --> $DIR/variance-trait-bounds.rs:21:1
    |
 LL | enum TestEnum<U,T:Setter<U>> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [*, +]
+error: [*, +]
   --> $DIR/variance-trait-bounds.rs:26:1
    |
 LL | struct TestContraStruct<U,T:Setter<U>> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [*, +]
+error: [*, +]
   --> $DIR/variance-trait-bounds.rs:31:1
    |
 LL | struct TestBox<U,T:Getter<U>+Setter<U>> {
diff --git a/src/test/ui/variance/variance-trait-matching.rs b/tests/ui/variance/variance-trait-matching.rs
index b4efee7d6..b4efee7d6 100644
--- a/src/test/ui/variance/variance-trait-matching.rs
+++ b/tests/ui/variance/variance-trait-matching.rs
diff --git a/src/test/ui/variance/variance-trait-matching.stderr b/tests/ui/variance/variance-trait-matching.stderr
index 3308cc6d2..3308cc6d2 100644
--- a/src/test/ui/variance/variance-trait-matching.stderr
+++ b/tests/ui/variance/variance-trait-matching.stderr
diff --git a/src/test/ui/variance/variance-trait-object-bound.rs b/tests/ui/variance/variance-trait-object-bound.rs
index ec3c973bc..ec3c973bc 100644
--- a/src/test/ui/variance/variance-trait-object-bound.rs
+++ b/tests/ui/variance/variance-trait-object-bound.rs
diff --git a/src/test/ui/variance/variance-trait-object-bound.stderr b/tests/ui/variance/variance-trait-object-bound.stderr
index c86cf1f82..7c46b553f 100644
--- a/src/test/ui/variance/variance-trait-object-bound.stderr
+++ b/tests/ui/variance/variance-trait-object-bound.stderr
@@ -1,4 +1,4 @@
-error[E0208]: [-]
+error: [-]
   --> $DIR/variance-trait-object-bound.rs:14:1
    |
 LL | struct TOption<'a> {
diff --git a/src/test/ui/variance/variance-types-bounds.rs b/tests/ui/variance/variance-types-bounds.rs
index d1814dd97..d1814dd97 100644
--- a/src/test/ui/variance/variance-types-bounds.rs
+++ b/tests/ui/variance/variance-types-bounds.rs
diff --git a/src/test/ui/variance/variance-types-bounds.stderr b/tests/ui/variance/variance-types-bounds.stderr
index dbe8af75d..bb8164434 100644
--- a/src/test/ui/variance/variance-types-bounds.stderr
+++ b/tests/ui/variance/variance-types-bounds.stderr
@@ -1,28 +1,28 @@
-error[E0208]: [+, +]
+error: [+, +]
   --> $DIR/variance-types-bounds.rs:7:1
    |
 LL | struct TestImm<A, B> {
    | ^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, o]
+error: [+, o]
   --> $DIR/variance-types-bounds.rs:13:1
    |
 LL | struct TestMut<A, B:'static> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, o]
+error: [+, o]
   --> $DIR/variance-types-bounds.rs:19:1
    |
 LL | struct TestIndirect<A:'static, B:'static> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o, o]
+error: [o, o]
   --> $DIR/variance-types-bounds.rs:24:1
    |
 LL | struct TestIndirect2<A:'static, B:'static> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o, o]
+error: [o, o]
   --> $DIR/variance-types-bounds.rs:38:1
    |
 LL | struct TestObject<A, R> {
diff --git a/src/test/ui/variance/variance-types.rs b/tests/ui/variance/variance-types.rs
index b9b6d9c9b..b9b6d9c9b 100644
--- a/src/test/ui/variance/variance-types.rs
+++ b/tests/ui/variance/variance-types.rs
diff --git a/src/test/ui/variance/variance-types.stderr b/tests/ui/variance/variance-types.stderr
index 8358b18b7..9f7f1d9b0 100644
--- a/src/test/ui/variance/variance-types.stderr
+++ b/tests/ui/variance/variance-types.stderr
@@ -1,34 +1,34 @@
-error[E0208]: [-, o, o]
+error: [-, o, o]
   --> $DIR/variance-types.rs:10:1
    |
 LL | struct InvariantMut<'a,A:'a,B:'a> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o]
+error: [o]
   --> $DIR/variance-types.rs:15:1
    |
 LL | struct InvariantCell<A> {
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [o]
+error: [o]
   --> $DIR/variance-types.rs:20:1
    |
 LL | struct InvariantIndirect<A> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+]
+error: [+]
   --> $DIR/variance-types.rs:25:1
    |
 LL | struct Covariant<A> {
    | ^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [-]
+error: [-]
   --> $DIR/variance-types.rs:30:1
    |
 LL | struct Contravariant<A> {
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0208]: [+, -, o]
+error: [+, -, o]
   --> $DIR/variance-types.rs:35:1
    |
 LL | enum Enum<A,B,C> {
diff --git a/src/test/ui/variance/variance-unused-region-param.rs b/tests/ui/variance/variance-unused-region-param.rs
index f0e4e03c9..f0e4e03c9 100644
--- a/src/test/ui/variance/variance-unused-region-param.rs
+++ b/tests/ui/variance/variance-unused-region-param.rs
diff --git a/src/test/ui/variance/variance-unused-region-param.stderr b/tests/ui/variance/variance-unused-region-param.stderr
index 7c7ec40ba..7c7ec40ba 100644
--- a/src/test/ui/variance/variance-unused-region-param.stderr
+++ b/tests/ui/variance/variance-unused-region-param.stderr
diff --git a/src/test/ui/variance/variance-unused-type-param.rs b/tests/ui/variance/variance-unused-type-param.rs
index d11140643..d11140643 100644
--- a/src/test/ui/variance/variance-unused-type-param.rs
+++ b/tests/ui/variance/variance-unused-type-param.rs
diff --git a/src/test/ui/variance/variance-unused-type-param.stderr b/tests/ui/variance/variance-unused-type-param.stderr
index e612da118..e612da118 100644
--- a/src/test/ui/variance/variance-unused-type-param.stderr
+++ b/tests/ui/variance/variance-unused-type-param.stderr
diff --git a/src/test/ui/variance/variance-use-contravariant-struct-1.rs b/tests/ui/variance/variance-use-contravariant-struct-1.rs
index 40781fbf0..40781fbf0 100644
--- a/src/test/ui/variance/variance-use-contravariant-struct-1.rs
+++ b/tests/ui/variance/variance-use-contravariant-struct-1.rs
diff --git a/src/test/ui/variance/variance-use-contravariant-struct-1.stderr b/tests/ui/variance/variance-use-contravariant-struct-1.stderr
index 50de7c90f..50de7c90f 100644
--- a/src/test/ui/variance/variance-use-contravariant-struct-1.stderr
+++ b/tests/ui/variance/variance-use-contravariant-struct-1.stderr
diff --git a/src/test/ui/variance/variance-use-contravariant-struct-2.rs b/tests/ui/variance/variance-use-contravariant-struct-2.rs
index d4b2d0834..d4b2d0834 100644
--- a/src/test/ui/variance/variance-use-contravariant-struct-2.rs
+++ b/tests/ui/variance/variance-use-contravariant-struct-2.rs
diff --git a/src/test/ui/variance/variance-use-covariant-struct-1.rs b/tests/ui/variance/variance-use-covariant-struct-1.rs
index f0fd7b26e..f0fd7b26e 100644
--- a/src/test/ui/variance/variance-use-covariant-struct-1.rs
+++ b/tests/ui/variance/variance-use-covariant-struct-1.rs
diff --git a/src/test/ui/variance/variance-use-covariant-struct-1.stderr b/tests/ui/variance/variance-use-covariant-struct-1.stderr
index bab858c5a..bab858c5a 100644
--- a/src/test/ui/variance/variance-use-covariant-struct-1.stderr
+++ b/tests/ui/variance/variance-use-covariant-struct-1.stderr
diff --git a/src/test/ui/variance/variance-use-covariant-struct-2.rs b/tests/ui/variance/variance-use-covariant-struct-2.rs
index ecd2204c9..ecd2204c9 100644
--- a/src/test/ui/variance/variance-use-covariant-struct-2.rs
+++ b/tests/ui/variance/variance-use-covariant-struct-2.rs
diff --git a/src/test/ui/variance/variance-use-invariant-struct-1.rs b/tests/ui/variance/variance-use-invariant-struct-1.rs
index 72f50f345..72f50f345 100644
--- a/src/test/ui/variance/variance-use-invariant-struct-1.rs
+++ b/tests/ui/variance/variance-use-invariant-struct-1.rs
diff --git a/src/test/ui/variance/variance-use-invariant-struct-1.stderr b/tests/ui/variance/variance-use-invariant-struct-1.stderr
index b9ca6e7d5..b9ca6e7d5 100644
--- a/src/test/ui/variance/variance-use-invariant-struct-1.stderr
+++ b/tests/ui/variance/variance-use-invariant-struct-1.stderr