Merging upstream version 1.68.2+dfsg1.

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

81 files changed, 24 insertions, 34 deletions

diff --git a/src/test/ui/union/auxiliary/union.rs b/tests/ui/union/auxiliary/union.rs
index e785e35ae..e785e35ae 100644
--- a/src/test/ui/union/auxiliary/union.rs
+++ b/tests/ui/union/auxiliary/union.rs
diff --git a/src/test/ui/union/field_checks.rs b/tests/ui/union/field_checks.rs
index d5d1e44ac..d5d1e44ac 100644
--- a/src/test/ui/union/field_checks.rs
+++ b/tests/ui/union/field_checks.rs
diff --git a/src/test/ui/union/field_checks.stderr b/tests/ui/union/field_checks.stderr
index 1f97e97ac..1f97e97ac 100644
--- a/src/test/ui/union/field_checks.stderr
+++ b/tests/ui/union/field_checks.stderr
diff --git a/src/test/ui/union/issue-41073.rs b/tests/ui/union/issue-41073.rs
index 4dfdc606b..4dfdc606b 100644
--- a/src/test/ui/union/issue-41073.rs
+++ b/tests/ui/union/issue-41073.rs
diff --git a/src/test/ui/union/issue-41073.stderr b/tests/ui/union/issue-41073.stderr
index b3887fa0f..b3887fa0f 100644
--- a/src/test/ui/union/issue-41073.stderr
+++ b/tests/ui/union/issue-41073.stderr
diff --git a/src/test/ui/union/issue-81199.rs b/tests/ui/union/issue-81199.rs
index 628e7c6ed..628e7c6ed 100644
--- a/src/test/ui/union/issue-81199.rs
+++ b/tests/ui/union/issue-81199.rs
diff --git a/src/test/ui/union/issue-81199.stderr b/tests/ui/union/issue-81199.stderr
index 5bb986753..5bb986753 100644
--- a/src/test/ui/union/issue-81199.stderr
+++ b/tests/ui/union/issue-81199.stderr
diff --git a/src/test/ui/union/issue-99375.rs b/tests/ui/union/issue-99375.rs
index 175018a7d..175018a7d 100644
--- a/src/test/ui/union/issue-99375.rs
+++ b/tests/ui/union/issue-99375.rs
diff --git a/src/test/ui/union/union-align.rs b/tests/ui/union/union-align.rs
index 6a44f27db..6a44f27db 100644
--- a/src/test/ui/union/union-align.rs
+++ b/tests/ui/union/union-align.rs
diff --git a/src/test/ui/union/union-backcomp.rs b/tests/ui/union/union-backcomp.rs
index b19eab9f5..b19eab9f5 100644
--- a/src/test/ui/union/union-backcomp.rs
+++ b/tests/ui/union/union-backcomp.rs
diff --git a/src/test/ui/union/union-basic.rs b/tests/ui/union/union-basic.rs
index dcc552ac7..dcc552ac7 100644
--- a/src/test/ui/union/union-basic.rs
+++ b/tests/ui/union/union-basic.rs
diff --git a/src/test/ui/union/union-borrow-move-parent-sibling.mirunsafeck.stderr b/tests/ui/union/union-borrow-move-parent-sibling.mirunsafeck.stderr
index ca02de4c6..7f931b49a 100644
--- a/src/test/ui/union/union-borrow-move-parent-sibling.mirunsafeck.stderr
+++ b/tests/ui/union/union-borrow-move-parent-sibling.mirunsafeck.stderr
@@ -14,10 +14,12 @@ error[E0507]: cannot move out of dereference of `ManuallyDrop<((MockVec<u8>, Moc
   --> $DIR/union-borrow-move-parent-sibling.rs:62:13
    |
 LL |     let a = u.x.0;
-   |             ^^^^^
-   |             |
-   |             move occurs because value has type `(MockVec<u8>, MockVec<u8>)`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&u.x.0`
+   |             ^^^^^ move occurs because value has type `(MockVec<u8>, MockVec<u8>)`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let a = &u.x.0;
+   |             +
 
 error[E0382]: use of moved value: `u`
   --> $DIR/union-borrow-move-parent-sibling.rs:64:13
@@ -46,10 +48,12 @@ error[E0507]: cannot move out of dereference of `ManuallyDrop<((MockVec<u8>, Moc
   --> $DIR/union-borrow-move-parent-sibling.rs:76:13
    |
 LL |     let a = (u.x.0).0;
-   |             ^^^^^^^^^
-   |             |
-   |             move occurs because value has type `MockVec<u8>`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&(u.x.0).0`
+   |             ^^^^^^^^^ move occurs because value has type `MockVec<u8>`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let a = &(u.x.0).0;
+   |             +
 
 error[E0382]: use of moved value: `u`
   --> $DIR/union-borrow-move-parent-sibling.rs:78:13
diff --git a/src/test/ui/union/union-borrow-move-parent-sibling.rs b/tests/ui/union/union-borrow-move-parent-sibling.rs
index 83781c5e5..83781c5e5 100644
--- a/src/test/ui/union/union-borrow-move-parent-sibling.rs
+++ b/tests/ui/union/union-borrow-move-parent-sibling.rs
diff --git a/src/test/ui/union/union-borrow-move-parent-sibling.thirunsafeck.stderr b/tests/ui/union/union-borrow-move-parent-sibling.thirunsafeck.stderr
index ca02de4c6..7f931b49a 100644
--- a/src/test/ui/union/union-borrow-move-parent-sibling.thirunsafeck.stderr
+++ b/tests/ui/union/union-borrow-move-parent-sibling.thirunsafeck.stderr
@@ -14,10 +14,12 @@ error[E0507]: cannot move out of dereference of `ManuallyDrop<((MockVec<u8>, Moc
   --> $DIR/union-borrow-move-parent-sibling.rs:62:13
    |
 LL |     let a = u.x.0;
-   |             ^^^^^
-   |             |
-   |             move occurs because value has type `(MockVec<u8>, MockVec<u8>)`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&u.x.0`
+   |             ^^^^^ move occurs because value has type `(MockVec<u8>, MockVec<u8>)`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let a = &u.x.0;
+   |             +
 
 error[E0382]: use of moved value: `u`
   --> $DIR/union-borrow-move-parent-sibling.rs:64:13
@@ -46,10 +48,12 @@ error[E0507]: cannot move out of dereference of `ManuallyDrop<((MockVec<u8>, Moc
   --> $DIR/union-borrow-move-parent-sibling.rs:76:13
    |
 LL |     let a = (u.x.0).0;
-   |             ^^^^^^^^^
-   |             |
-   |             move occurs because value has type `MockVec<u8>`, which does not implement the `Copy` trait
-   |             help: consider borrowing here: `&(u.x.0).0`
+   |             ^^^^^^^^^ move occurs because value has type `MockVec<u8>`, which does not implement the `Copy` trait
+   |
+help: consider borrowing here
+   |
+LL |     let a = &(u.x.0).0;
+   |             +
 
 error[E0382]: use of moved value: `u`
   --> $DIR/union-borrow-move-parent-sibling.rs:78:13
diff --git a/src/test/ui/union/union-const-codegen.rs b/tests/ui/union/union-const-codegen.rs
index 32a546cf3..32a546cf3 100644
--- a/src/test/ui/union/union-const-codegen.rs
+++ b/tests/ui/union/union-const-codegen.rs
diff --git a/src/test/ui/union/union-const-eval-field.rs b/tests/ui/union/union-const-eval-field.rs
index ca48785cd..ca48785cd 100644
--- a/src/test/ui/union/union-const-eval-field.rs
+++ b/tests/ui/union/union-const-eval-field.rs
diff --git a/src/test/ui/union/union-const-eval.rs b/tests/ui/union/union-const-eval.rs
index 32ee4a739..32ee4a739 100644
--- a/src/test/ui/union/union-const-eval.rs
+++ b/tests/ui/union/union-const-eval.rs
diff --git a/src/test/ui/union/union-const-pat.rs b/tests/ui/union/union-const-pat.rs
index e7cb248a2..e7cb248a2 100644
--- a/src/test/ui/union/union-const-pat.rs
+++ b/tests/ui/union/union-const-pat.rs
diff --git a/src/test/ui/union/union-const-pat.stderr b/tests/ui/union/union-const-pat.stderr
index dc87f4de5..dc87f4de5 100644
--- a/src/test/ui/union/union-const-pat.stderr
+++ b/tests/ui/union/union-const-pat.stderr
diff --git a/src/test/ui/union/union-copy.rs b/tests/ui/union/union-copy.rs
index 5c3f8d908..5c3f8d908 100644
--- a/src/test/ui/union/union-copy.rs
+++ b/tests/ui/union/union-copy.rs
diff --git a/src/test/ui/union/union-copy.stderr b/tests/ui/union/union-copy.stderr
index 53ee4dd2e..53ee4dd2e 100644
--- a/src/test/ui/union/union-copy.stderr
+++ b/tests/ui/union/union-copy.stderr
diff --git a/src/test/ui/union/union-deref.mirunsafeck.stderr b/tests/ui/union/union-deref.mirunsafeck.stderr
index be5e60ab8..be5e60ab8 100644
--- a/src/test/ui/union/union-deref.mirunsafeck.stderr
+++ b/tests/ui/union/union-deref.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-deref.rs b/tests/ui/union/union-deref.rs
index 5aa28d93f..5aa28d93f 100644
--- a/src/test/ui/union/union-deref.rs
+++ b/tests/ui/union/union-deref.rs
diff --git a/src/test/ui/union/union-deref.thirunsafeck.stderr b/tests/ui/union/union-deref.thirunsafeck.stderr
index be5e60ab8..be5e60ab8 100644
--- a/src/test/ui/union/union-deref.thirunsafeck.stderr
+++ b/tests/ui/union/union-deref.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-derive-clone.mirunsafeck.stderr b/tests/ui/union/union-derive-clone.mirunsafeck.stderr
index 148fb5046..b80e8b988 100644
--- a/src/test/ui/union/union-derive-clone.mirunsafeck.stderr
+++ b/tests/ui/union/union-derive-clone.mirunsafeck.stderr
@@ -6,9 +6,6 @@ LL | #[derive(Clone)]
    |
 note: required by a bound in `AssertParamIsCopy`
   --> $SRC_DIR/core/src/clone.rs:LL:COL
-   |
-LL | pub struct AssertParamIsCopy<T: Copy + ?Sized> {
-   |                                 ^^^^ required by this bound in `AssertParamIsCopy`
    = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `U1` with `#[derive(Copy)]`
    |
@@ -35,9 +32,6 @@ note: trait bound `CloneNoCopy: Copy` was not satisfied
    |
 LL | #[derive(Clone, Copy)]
    |          ^^^^^ unsatisfied trait bound introduced in this `derive` macro
-   = note: the following trait bounds were not satisfied:
-           `CloneNoCopy: Copy`
-           which is required by `U5<CloneNoCopy>: Clone`
 help: consider annotating `CloneNoCopy` with `#[derive(Clone, Copy)]`
    |
 LL | #[derive(Clone, Copy)]
diff --git a/src/test/ui/union/union-derive-clone.rs b/tests/ui/union/union-derive-clone.rs
index 7aa62146e..7aa62146e 100644
--- a/src/test/ui/union/union-derive-clone.rs
+++ b/tests/ui/union/union-derive-clone.rs
diff --git a/src/test/ui/union/union-derive-clone.thirunsafeck.stderr b/tests/ui/union/union-derive-clone.thirunsafeck.stderr
index 148fb5046..b80e8b988 100644
--- a/src/test/ui/union/union-derive-clone.thirunsafeck.stderr
+++ b/tests/ui/union/union-derive-clone.thirunsafeck.stderr
@@ -6,9 +6,6 @@ LL | #[derive(Clone)]
    |
 note: required by a bound in `AssertParamIsCopy`
   --> $SRC_DIR/core/src/clone.rs:LL:COL
-   |
-LL | pub struct AssertParamIsCopy<T: Copy + ?Sized> {
-   |                                 ^^^^ required by this bound in `AssertParamIsCopy`
    = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `U1` with `#[derive(Copy)]`
    |
@@ -35,9 +32,6 @@ note: trait bound `CloneNoCopy: Copy` was not satisfied
    |
 LL | #[derive(Clone, Copy)]
    |          ^^^^^ unsatisfied trait bound introduced in this `derive` macro
-   = note: the following trait bounds were not satisfied:
-           `CloneNoCopy: Copy`
-           which is required by `U5<CloneNoCopy>: Clone`
 help: consider annotating `CloneNoCopy` with `#[derive(Clone, Copy)]`
    |
 LL | #[derive(Clone, Copy)]
diff --git a/src/test/ui/union/union-derive-eq.mirunsafeck.stderr b/tests/ui/union/union-derive-eq.mirunsafeck.stderr
index 99505f316..9e55390b5 100644
--- a/src/test/ui/union/union-derive-eq.mirunsafeck.stderr
+++ b/tests/ui/union/union-derive-eq.mirunsafeck.stderr
@@ -9,9 +9,6 @@ LL |     a: PartialEqNotEq,
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `PartialEqNotEq` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/union/union-derive-eq.rs b/tests/ui/union/union-derive-eq.rs
index b7e7f343f..b7e7f343f 100644
--- a/src/test/ui/union/union-derive-eq.rs
+++ b/tests/ui/union/union-derive-eq.rs
diff --git a/src/test/ui/union/union-derive-eq.thirunsafeck.stderr b/tests/ui/union/union-derive-eq.thirunsafeck.stderr
index 99505f316..9e55390b5 100644
--- a/src/test/ui/union/union-derive-eq.thirunsafeck.stderr
+++ b/tests/ui/union/union-derive-eq.thirunsafeck.stderr
@@ -9,9 +9,6 @@ LL |     a: PartialEqNotEq,
    |
 note: required by a bound in `AssertParamIsEq`
   --> $SRC_DIR/core/src/cmp.rs:LL:COL
-   |
-LL | pub struct AssertParamIsEq<T: Eq + ?Sized> {
-   |                               ^^ required by this bound in `AssertParamIsEq`
    = note: this error originates in the derive macro `Eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `PartialEqNotEq` with `#[derive(Eq)]`
    |
diff --git a/src/test/ui/union/union-derive-rpass.rs b/tests/ui/union/union-derive-rpass.rs
index 8276bc635..8276bc635 100644
--- a/src/test/ui/union/union-derive-rpass.rs
+++ b/tests/ui/union/union-derive-rpass.rs
diff --git a/src/test/ui/union/union-derive.rs b/tests/ui/union/union-derive.rs
index 652a6b24c..652a6b24c 100644
--- a/src/test/ui/union/union-derive.rs
+++ b/tests/ui/union/union-derive.rs
diff --git a/src/test/ui/union/union-derive.stderr b/tests/ui/union/union-derive.stderr
index 6ef72c901..6ef72c901 100644
--- a/src/test/ui/union/union-derive.stderr
+++ b/tests/ui/union/union-derive.stderr
diff --git a/src/test/ui/union/union-drop-assign.rs b/tests/ui/union/union-drop-assign.rs
index 215666bdd..215666bdd 100644
--- a/src/test/ui/union/union-drop-assign.rs
+++ b/tests/ui/union/union-drop-assign.rs
diff --git a/src/test/ui/union/union-drop.rs b/tests/ui/union/union-drop.rs
index c3d7d41ca..c3d7d41ca 100644
--- a/src/test/ui/union/union-drop.rs
+++ b/tests/ui/union/union-drop.rs
diff --git a/src/test/ui/union/union-empty.rs b/tests/ui/union/union-empty.rs
index 79b7e68ee..79b7e68ee 100644
--- a/src/test/ui/union/union-empty.rs
+++ b/tests/ui/union/union-empty.rs
diff --git a/src/test/ui/union/union-empty.stderr b/tests/ui/union/union-empty.stderr
index a80b27e6e..a80b27e6e 100644
--- a/src/test/ui/union/union-empty.stderr
+++ b/tests/ui/union/union-empty.stderr
diff --git a/src/test/ui/union/union-fields-1.mirunsafeck.stderr b/tests/ui/union/union-fields-1.mirunsafeck.stderr
index 0c9981c69..0c9981c69 100644
--- a/src/test/ui/union/union-fields-1.mirunsafeck.stderr
+++ b/tests/ui/union/union-fields-1.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-fields-1.rs b/tests/ui/union/union-fields-1.rs
index cf2ef4c03..cf2ef4c03 100644
--- a/src/test/ui/union/union-fields-1.rs
+++ b/tests/ui/union/union-fields-1.rs
diff --git a/src/test/ui/union/union-fields-1.thirunsafeck.stderr b/tests/ui/union/union-fields-1.thirunsafeck.stderr
index 0c9981c69..0c9981c69 100644
--- a/src/test/ui/union/union-fields-1.thirunsafeck.stderr
+++ b/tests/ui/union/union-fields-1.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-fields-2.mirunsafeck.stderr b/tests/ui/union/union-fields-2.mirunsafeck.stderr
index 90ad16402..90ad16402 100644
--- a/src/test/ui/union/union-fields-2.mirunsafeck.stderr
+++ b/tests/ui/union/union-fields-2.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-fields-2.rs b/tests/ui/union/union-fields-2.rs
index e738b1847..e738b1847 100644
--- a/src/test/ui/union/union-fields-2.rs
+++ b/tests/ui/union/union-fields-2.rs
diff --git a/src/test/ui/union/union-fields-2.thirunsafeck.stderr b/tests/ui/union/union-fields-2.thirunsafeck.stderr
index 90ad16402..90ad16402 100644
--- a/src/test/ui/union/union-fields-2.thirunsafeck.stderr
+++ b/tests/ui/union/union-fields-2.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-generic-rpass.rs b/tests/ui/union/union-generic-rpass.rs
index 25f1f5050..25f1f5050 100644
--- a/src/test/ui/union/union-generic-rpass.rs
+++ b/tests/ui/union/union-generic-rpass.rs
diff --git a/src/test/ui/union/union-generic.mirunsafeck.stderr b/tests/ui/union/union-generic.mirunsafeck.stderr
index 037022a91..037022a91 100644
--- a/src/test/ui/union/union-generic.mirunsafeck.stderr
+++ b/tests/ui/union/union-generic.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-generic.rs b/tests/ui/union/union-generic.rs
index 3d68ecb87..3d68ecb87 100644
--- a/src/test/ui/union/union-generic.rs
+++ b/tests/ui/union/union-generic.rs
diff --git a/src/test/ui/union/union-generic.thirunsafeck.stderr b/tests/ui/union/union-generic.thirunsafeck.stderr
index 037022a91..037022a91 100644
--- a/src/test/ui/union/union-generic.thirunsafeck.stderr
+++ b/tests/ui/union/union-generic.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-inherent-method.rs b/tests/ui/union/union-inherent-method.rs
index b0fd22da7..b0fd22da7 100644
--- a/src/test/ui/union/union-inherent-method.rs
+++ b/tests/ui/union/union-inherent-method.rs
diff --git a/src/test/ui/union/union-lint-dead-code.mirunsafeck.stderr b/tests/ui/union/union-lint-dead-code.mirunsafeck.stderr
index 6e21584c3..6e21584c3 100644
--- a/src/test/ui/union/union-lint-dead-code.mirunsafeck.stderr
+++ b/tests/ui/union/union-lint-dead-code.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-lint-dead-code.rs b/tests/ui/union/union-lint-dead-code.rs
index 65aaf0a1d..65aaf0a1d 100644
--- a/src/test/ui/union/union-lint-dead-code.rs
+++ b/tests/ui/union/union-lint-dead-code.rs
diff --git a/src/test/ui/union/union-lint-dead-code.thirunsafeck.stderr b/tests/ui/union/union-lint-dead-code.thirunsafeck.stderr
index 6e21584c3..6e21584c3 100644
--- a/src/test/ui/union/union-lint-dead-code.thirunsafeck.stderr
+++ b/tests/ui/union/union-lint-dead-code.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-macro.rs b/tests/ui/union/union-macro.rs
index 7fd9d8221..7fd9d8221 100644
--- a/src/test/ui/union/union-macro.rs
+++ b/tests/ui/union/union-macro.rs
diff --git a/src/test/ui/union/union-manuallydrop-rpass.rs b/tests/ui/union/union-manuallydrop-rpass.rs
index 826bdf07c..826bdf07c 100644
--- a/src/test/ui/union/union-manuallydrop-rpass.rs
+++ b/tests/ui/union/union-manuallydrop-rpass.rs
diff --git a/src/test/ui/union/union-move.mirunsafeck.stderr b/tests/ui/union/union-move.mirunsafeck.stderr
index 6381ae874..6381ae874 100644
--- a/src/test/ui/union/union-move.mirunsafeck.stderr
+++ b/tests/ui/union/union-move.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-move.rs b/tests/ui/union/union-move.rs
index b8b1ac804..b8b1ac804 100644
--- a/src/test/ui/union/union-move.rs
+++ b/tests/ui/union/union-move.rs
diff --git a/src/test/ui/union/union-move.thirunsafeck.stderr b/tests/ui/union/union-move.thirunsafeck.stderr
index 6381ae874..6381ae874 100644
--- a/src/test/ui/union/union-move.thirunsafeck.stderr
+++ b/tests/ui/union/union-move.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-nodrop.rs b/tests/ui/union/union-nodrop.rs
index 6e6b105a7..6e6b105a7 100644
--- a/src/test/ui/union/union-nodrop.rs
+++ b/tests/ui/union/union-nodrop.rs
diff --git a/src/test/ui/union/union-nonrepresentable.rs b/tests/ui/union/union-nonrepresentable.rs
index 4bdf7c687..4bdf7c687 100644
--- a/src/test/ui/union/union-nonrepresentable.rs
+++ b/tests/ui/union/union-nonrepresentable.rs
diff --git a/src/test/ui/union/union-nonrepresentable.stderr b/tests/ui/union/union-nonrepresentable.stderr
index c266d2e9e..c266d2e9e 100644
--- a/src/test/ui/union/union-nonrepresentable.stderr
+++ b/tests/ui/union/union-nonrepresentable.stderr
diff --git a/src/test/ui/union/union-nonzero.rs b/tests/ui/union/union-nonzero.rs
index 3f4f7ea1c..3f4f7ea1c 100644
--- a/src/test/ui/union/union-nonzero.rs
+++ b/tests/ui/union/union-nonzero.rs
diff --git a/src/test/ui/union/union-overwrite.rs b/tests/ui/union/union-overwrite.rs
index 0eea14d9d..0eea14d9d 100644
--- a/src/test/ui/union/union-overwrite.rs
+++ b/tests/ui/union/union-overwrite.rs
diff --git a/src/test/ui/union/union-packed.rs b/tests/ui/union/union-packed.rs
index 9c6398bf5..9c6398bf5 100644
--- a/src/test/ui/union/union-packed.rs
+++ b/tests/ui/union/union-packed.rs
diff --git a/src/test/ui/union/union-pat-refutability.rs b/tests/ui/union/union-pat-refutability.rs
index d628a200a..d628a200a 100644
--- a/src/test/ui/union/union-pat-refutability.rs
+++ b/tests/ui/union/union-pat-refutability.rs
diff --git a/src/test/ui/union/union-repr-c.rs b/tests/ui/union/union-repr-c.rs
index 1367835e6..1367835e6 100644
--- a/src/test/ui/union/union-repr-c.rs
+++ b/tests/ui/union/union-repr-c.rs
diff --git a/src/test/ui/union/union-repr-c.stderr b/tests/ui/union/union-repr-c.stderr
index 49124eee5..49124eee5 100644
--- a/src/test/ui/union/union-repr-c.stderr
+++ b/tests/ui/union/union-repr-c.stderr
diff --git a/src/test/ui/union/union-sized-field.rs b/tests/ui/union/union-sized-field.rs
index cb852eff0..cb852eff0 100644
--- a/src/test/ui/union/union-sized-field.rs
+++ b/tests/ui/union/union-sized-field.rs
diff --git a/src/test/ui/union/union-sized-field.stderr b/tests/ui/union/union-sized-field.stderr
index 771e8f261..771e8f261 100644
--- a/src/test/ui/union/union-sized-field.stderr
+++ b/tests/ui/union/union-sized-field.stderr
diff --git a/src/test/ui/union/union-suggest-field.mirunsafeck.stderr b/tests/ui/union/union-suggest-field.mirunsafeck.stderr
index 58b1f5cb0..58b1f5cb0 100644
--- a/src/test/ui/union/union-suggest-field.mirunsafeck.stderr
+++ b/tests/ui/union/union-suggest-field.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-suggest-field.rs b/tests/ui/union/union-suggest-field.rs
index 601a22a06..601a22a06 100644
--- a/src/test/ui/union/union-suggest-field.rs
+++ b/tests/ui/union/union-suggest-field.rs
diff --git a/src/test/ui/union/union-suggest-field.thirunsafeck.stderr b/tests/ui/union/union-suggest-field.thirunsafeck.stderr
index 58b1f5cb0..58b1f5cb0 100644
--- a/src/test/ui/union/union-suggest-field.thirunsafeck.stderr
+++ b/tests/ui/union/union-suggest-field.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-trait-impl.rs b/tests/ui/union/union-trait-impl.rs
index 6134e91f3..6134e91f3 100644
--- a/src/test/ui/union/union-trait-impl.rs
+++ b/tests/ui/union/union-trait-impl.rs
diff --git a/src/test/ui/union/union-transmute.rs b/tests/ui/union/union-transmute.rs
index 1a3b32d55..1a3b32d55 100644
--- a/src/test/ui/union/union-transmute.rs
+++ b/tests/ui/union/union-transmute.rs
diff --git a/src/test/ui/union/union-unsafe.mir.stderr b/tests/ui/union/union-unsafe.mir.stderr
index 544213dbc..544213dbc 100644
--- a/src/test/ui/union/union-unsafe.mir.stderr
+++ b/tests/ui/union/union-unsafe.mir.stderr
diff --git a/src/test/ui/union/union-unsafe.rs b/tests/ui/union/union-unsafe.rs
index 5e1837a90..5e1837a90 100644
--- a/src/test/ui/union/union-unsafe.rs
+++ b/tests/ui/union/union-unsafe.rs
diff --git a/src/test/ui/union/union-unsafe.thir.stderr b/tests/ui/union/union-unsafe.thir.stderr
index f959fe5bd..f959fe5bd 100644
--- a/src/test/ui/union/union-unsafe.thir.stderr
+++ b/tests/ui/union/union-unsafe.thir.stderr
diff --git a/src/test/ui/union/union-unsized.mirunsafeck.stderr b/tests/ui/union/union-unsized.mirunsafeck.stderr
index 59ab835fb..59ab835fb 100644
--- a/src/test/ui/union/union-unsized.mirunsafeck.stderr
+++ b/tests/ui/union/union-unsized.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-unsized.rs b/tests/ui/union/union-unsized.rs
index 8e897d7d3..8e897d7d3 100644
--- a/src/test/ui/union/union-unsized.rs
+++ b/tests/ui/union/union-unsized.rs
diff --git a/src/test/ui/union/union-unsized.thirunsafeck.stderr b/tests/ui/union/union-unsized.thirunsafeck.stderr
index 59ab835fb..59ab835fb 100644
--- a/src/test/ui/union/union-unsized.thirunsafeck.stderr
+++ b/tests/ui/union/union-unsized.thirunsafeck.stderr
diff --git a/src/test/ui/union/union-with-drop-fields.mirunsafeck.stderr b/tests/ui/union/union-with-drop-fields.mirunsafeck.stderr
index 93fe996d2..93fe996d2 100644
--- a/src/test/ui/union/union-with-drop-fields.mirunsafeck.stderr
+++ b/tests/ui/union/union-with-drop-fields.mirunsafeck.stderr
diff --git a/src/test/ui/union/union-with-drop-fields.rs b/tests/ui/union/union-with-drop-fields.rs
index a7a8b69e7..a7a8b69e7 100644
--- a/src/test/ui/union/union-with-drop-fields.rs
+++ b/tests/ui/union/union-with-drop-fields.rs
diff --git a/src/test/ui/union/union-with-drop-fields.thirunsafeck.stderr b/tests/ui/union/union-with-drop-fields.thirunsafeck.stderr
index 93fe996d2..93fe996d2 100644
--- a/src/test/ui/union/union-with-drop-fields.thirunsafeck.stderr
+++ b/tests/ui/union/union-with-drop-fields.thirunsafeck.stderr