242 files changed, 4 insertions, 16 deletions

diff --git a/src/test/ui/str/str-array-assignment.rs b/tests/ui/str/str-array-assignment.rs
index 323eefb38..323eefb38 100644
--- a/src/test/ui/str/str-array-assignment.rs
+++ b/tests/ui/str/str-array-assignment.rs
diff --git a/src/test/ui/str/str-array-assignment.stderr b/tests/ui/str/str-array-assignment.stderr
index c23400a1d..c23400a1d 100644
--- a/src/test/ui/str/str-array-assignment.stderr
+++ b/tests/ui/str/str-array-assignment.stderr
diff --git a/src/test/ui/str/str-as-char.fixed b/tests/ui/str/str-as-char.fixed
index 42bbef839..42bbef839 100644
--- a/src/test/ui/str/str-as-char.fixed
+++ b/tests/ui/str/str-as-char.fixed
diff --git a/src/test/ui/str/str-as-char.rs b/tests/ui/str/str-as-char.rs
index 09b9dfc59..09b9dfc59 100644
--- a/src/test/ui/str/str-as-char.rs
+++ b/tests/ui/str/str-as-char.rs
diff --git a/src/test/ui/str/str-as-char.stderr b/tests/ui/str/str-as-char.stderr
index c3cb488e3..c3cb488e3 100644
--- a/src/test/ui/str/str-as-char.stderr
+++ b/tests/ui/str/str-as-char.stderr
diff --git a/src/test/ui/str/str-concat-on-double-ref.rs b/tests/ui/str/str-concat-on-double-ref.rs
index e68210d53..e68210d53 100644
--- a/src/test/ui/str/str-concat-on-double-ref.rs
+++ b/tests/ui/str/str-concat-on-double-ref.rs
diff --git a/src/test/ui/str/str-concat-on-double-ref.stderr b/tests/ui/str/str-concat-on-double-ref.stderr
index bd354679f..bd354679f 100644
--- a/src/test/ui/str/str-concat-on-double-ref.stderr
+++ b/tests/ui/str/str-concat-on-double-ref.stderr
diff --git a/src/test/ui/str/str-escape.rs b/tests/ui/str/str-escape.rs
index 0264632fd..0264632fd 100644
--- a/src/test/ui/str/str-escape.rs
+++ b/tests/ui/str/str-escape.rs
diff --git a/src/test/ui/str/str-escape.stderr b/tests/ui/str/str-escape.stderr
index b2501f1a2..b2501f1a2 100644
--- a/src/test/ui/str/str-escape.stderr
+++ b/tests/ui/str/str-escape.stderr
diff --git a/src/test/ui/str/str-idx.rs b/tests/ui/str/str-idx.rs
index 1b32ed553..1b32ed553 100644
--- a/src/test/ui/str/str-idx.rs
+++ b/tests/ui/str/str-idx.rs
diff --git a/src/test/ui/str/str-idx.stderr b/tests/ui/str/str-idx.stderr
index 019305def..cb1a6fcac 100644
--- a/src/test/ui/str/str-idx.stderr
+++ b/tests/ui/str/str-idx.stderr
@@ -24,9 +24,6 @@ LL |     let _ = s.get(4);
    = help: the trait `SliceIndex<[T]>` is implemented for `usize`
 note: required by a bound in `core::str::<impl str>::get`
   --> $SRC_DIR/core/src/str/mod.rs:LL:COL
-   |
-LL |     pub const fn get<I: ~const SliceIndex<str>>(&self, i: I) -> Option<&I::Output> {
-   |                         ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `core::str::<impl str>::get`
 
 error[E0277]: the type `str` cannot be indexed by `{integer}`
   --> $DIR/str-idx.rs:5:29
@@ -42,9 +39,6 @@ LL |     let _ = s.get_unchecked(4);
    = help: the trait `SliceIndex<[T]>` is implemented for `usize`
 note: required by a bound in `core::str::<impl str>::get_unchecked`
   --> $SRC_DIR/core/src/str/mod.rs:LL:COL
-   |
-LL |     pub const unsafe fn get_unchecked<I: ~const SliceIndex<str>>(&self, i: I) -> &I::Output {
-   |                                          ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `core::str::<impl str>::get_unchecked`
 
 error[E0277]: the type `str` cannot be indexed by `char`
   --> $DIR/str-idx.rs:6:19
diff --git a/src/test/ui/str/str-lit-type-mismatch.rs b/tests/ui/str/str-lit-type-mismatch.rs
index 12637c7b9..12637c7b9 100644
--- a/src/test/ui/str/str-lit-type-mismatch.rs
+++ b/tests/ui/str/str-lit-type-mismatch.rs
diff --git a/src/test/ui/str/str-lit-type-mismatch.stderr b/tests/ui/str/str-lit-type-mismatch.stderr
index 6b56cd6f3..6b56cd6f3 100644
--- a/src/test/ui/str/str-lit-type-mismatch.stderr
+++ b/tests/ui/str/str-lit-type-mismatch.stderr
diff --git a/src/test/ui/str/str-mut-idx.rs b/tests/ui/str/str-mut-idx.rs
index 575a9eae8..575a9eae8 100644
--- a/src/test/ui/str/str-mut-idx.rs
+++ b/tests/ui/str/str-mut-idx.rs
diff --git a/src/test/ui/str/str-mut-idx.stderr b/tests/ui/str/str-mut-idx.stderr
index b165c4825..ca4b86ba3 100644
--- a/src/test/ui/str/str-mut-idx.stderr
+++ b/tests/ui/str/str-mut-idx.stderr
@@ -48,9 +48,6 @@ LL |     s.get_mut(1);
    = help: the trait `SliceIndex<[T]>` is implemented for `usize`
 note: required by a bound in `core::str::<impl str>::get_mut`
   --> $SRC_DIR/core/src/str/mod.rs:LL:COL
-   |
-LL |     pub const fn get_mut<I: ~const SliceIndex<str>>(&mut self, i: I) -> Option<&mut I::Output> {
-   |                             ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `core::str::<impl str>::get_mut`
 
 error[E0277]: the type `str` cannot be indexed by `{integer}`
   --> $DIR/str-mut-idx.rs:11:25
@@ -66,9 +63,6 @@ LL |     s.get_unchecked_mut(1);
    = help: the trait `SliceIndex<[T]>` is implemented for `usize`
 note: required by a bound in `core::str::<impl str>::get_unchecked_mut`
   --> $SRC_DIR/core/src/str/mod.rs:LL:COL
-   |
-LL |     pub const unsafe fn get_unchecked_mut<I: ~const SliceIndex<str>>(
-   |                                              ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `core::str::<impl str>::get_unchecked_mut`
 
 error[E0277]: the type `str` cannot be indexed by `char`
   --> $DIR/str-mut-idx.rs:13:7
diff --git a/src/test/ui/str/str-overrun.rs b/tests/ui/str/str-overrun.rs
index a3ec89413..a3ec89413 100644
--- a/src/test/ui/str/str-overrun.rs
+++ b/tests/ui/str/str-overrun.rs
diff --git a/src/test/ui/string-box-error.rs b/tests/ui/string-box-error.rs
index 11a5bd07c..11a5bd07c 100644
--- a/src/test/ui/string-box-error.rs
+++ b/tests/ui/string-box-error.rs
diff --git a/src/test/ui/struct-ctor-mangling.rs b/tests/ui/struct-ctor-mangling.rs
index ba6abbf03..ba6abbf03 100644
--- a/src/test/ui/struct-ctor-mangling.rs
+++ b/tests/ui/struct-ctor-mangling.rs
diff --git a/src/test/ui/structs-enums/align-enum.rs b/tests/ui/structs-enums/align-enum.rs
index fa872caa3..fa872caa3 100644
--- a/src/test/ui/structs-enums/align-enum.rs
+++ b/tests/ui/structs-enums/align-enum.rs
diff --git a/src/test/ui/structs-enums/align-struct.rs b/tests/ui/structs-enums/align-struct.rs
index f5418e754..f5418e754 100644
--- a/src/test/ui/structs-enums/align-struct.rs
+++ b/tests/ui/structs-enums/align-struct.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class.rs b/tests/ui/structs-enums/auxiliary/cci_class.rs
index de2945d74..de2945d74 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_2.rs b/tests/ui/structs-enums/auxiliary/cci_class_2.rs
index c3de3150e..c3de3150e 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_2.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_2.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_3.rs b/tests/ui/structs-enums/auxiliary/cci_class_3.rs
index fb7fad0b5..fb7fad0b5 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_3.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_3.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_4.rs b/tests/ui/structs-enums/auxiliary/cci_class_4.rs
index 85aa3bc8c..85aa3bc8c 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_4.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_4.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_6.rs b/tests/ui/structs-enums/auxiliary/cci_class_6.rs
index 35f93d0c6..35f93d0c6 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_6.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_6.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_cast.rs b/tests/ui/structs-enums/auxiliary/cci_class_cast.rs
index dfc3c56dd..dfc3c56dd 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_cast.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_cast.rs
diff --git a/src/test/ui/structs-enums/auxiliary/cci_class_trait.rs b/tests/ui/structs-enums/auxiliary/cci_class_trait.rs
index 2d02b591c..2d02b591c 100644
--- a/src/test/ui/structs-enums/auxiliary/cci_class_trait.rs
+++ b/tests/ui/structs-enums/auxiliary/cci_class_trait.rs
diff --git a/src/test/ui/structs-enums/auxiliary/empty-struct.rs b/tests/ui/structs-enums/auxiliary/empty-struct.rs
index 93275e714..93275e714 100644
--- a/src/test/ui/structs-enums/auxiliary/empty-struct.rs
+++ b/tests/ui/structs-enums/auxiliary/empty-struct.rs
diff --git a/src/test/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs b/tests/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
index 55e6b34ac..55e6b34ac 100644
--- a/src/test/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
+++ b/tests/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
diff --git a/src/test/ui/structs-enums/auxiliary/namespaced_enums.rs b/tests/ui/structs-enums/auxiliary/namespaced_enums.rs
index d3548c76c..d3548c76c 100644
--- a/src/test/ui/structs-enums/auxiliary/namespaced_enums.rs
+++ b/tests/ui/structs-enums/auxiliary/namespaced_enums.rs
diff --git a/src/test/ui/structs-enums/auxiliary/newtype_struct_xc.rs b/tests/ui/structs-enums/auxiliary/newtype_struct_xc.rs
index 9d1e0742e..9d1e0742e 100644
--- a/src/test/ui/structs-enums/auxiliary/newtype_struct_xc.rs
+++ b/tests/ui/structs-enums/auxiliary/newtype_struct_xc.rs
diff --git a/src/test/ui/structs-enums/auxiliary/struct_destructuring_cross_crate.rs b/tests/ui/structs-enums/auxiliary/struct_destructuring_cross_crate.rs
index 3665ae7e8..3665ae7e8 100644
--- a/src/test/ui/structs-enums/auxiliary/struct_destructuring_cross_crate.rs
+++ b/tests/ui/structs-enums/auxiliary/struct_destructuring_cross_crate.rs
diff --git a/src/test/ui/structs-enums/auxiliary/struct_variant_xc_aux.rs b/tests/ui/structs-enums/auxiliary/struct_variant_xc_aux.rs
index e919df611..e919df611 100644
--- a/src/test/ui/structs-enums/auxiliary/struct_variant_xc_aux.rs
+++ b/tests/ui/structs-enums/auxiliary/struct_variant_xc_aux.rs
diff --git a/src/test/ui/structs-enums/auxiliary/xcrate_struct_aliases.rs b/tests/ui/structs-enums/auxiliary/xcrate_struct_aliases.rs
index bc8879aa3..bc8879aa3 100644
--- a/src/test/ui/structs-enums/auxiliary/xcrate_struct_aliases.rs
+++ b/tests/ui/structs-enums/auxiliary/xcrate_struct_aliases.rs
diff --git a/src/test/ui/structs-enums/borrow-tuple-fields.rs b/tests/ui/structs-enums/borrow-tuple-fields.rs
index b1d8f9164..b1d8f9164 100644
--- a/src/test/ui/structs-enums/borrow-tuple-fields.rs
+++ b/tests/ui/structs-enums/borrow-tuple-fields.rs
diff --git a/src/test/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs b/tests/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs
index f870096fd..f870096fd 100644
--- a/src/test/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs
+++ b/tests/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs
diff --git a/src/test/ui/structs-enums/class-cast-to-trait-multiple-types.rs b/tests/ui/structs-enums/class-cast-to-trait-multiple-types.rs
index ca35a615d..ca35a615d 100644
--- a/src/test/ui/structs-enums/class-cast-to-trait-multiple-types.rs
+++ b/tests/ui/structs-enums/class-cast-to-trait-multiple-types.rs
diff --git a/src/test/ui/structs-enums/class-cast-to-trait.rs b/tests/ui/structs-enums/class-cast-to-trait.rs
index 1019bb300..1019bb300 100644
--- a/src/test/ui/structs-enums/class-cast-to-trait.rs
+++ b/tests/ui/structs-enums/class-cast-to-trait.rs
diff --git a/src/test/ui/structs-enums/class-dtor.rs b/tests/ui/structs-enums/class-dtor.rs
index 583a5e240..583a5e240 100644
--- a/src/test/ui/structs-enums/class-dtor.rs
+++ b/tests/ui/structs-enums/class-dtor.rs
diff --git a/src/test/ui/structs-enums/class-exports.rs b/tests/ui/structs-enums/class-exports.rs
index ee20887cb..ee20887cb 100644
--- a/src/test/ui/structs-enums/class-exports.rs
+++ b/tests/ui/structs-enums/class-exports.rs
diff --git a/src/test/ui/structs-enums/class-impl-very-parameterized-trait.rs b/tests/ui/structs-enums/class-impl-very-parameterized-trait.rs
index 5e7830296..5e7830296 100644
--- a/src/test/ui/structs-enums/class-impl-very-parameterized-trait.rs
+++ b/tests/ui/structs-enums/class-impl-very-parameterized-trait.rs
diff --git a/src/test/ui/structs-enums/class-implement-trait-cross-crate.rs b/tests/ui/structs-enums/class-implement-trait-cross-crate.rs
index 31b795175..31b795175 100644
--- a/src/test/ui/structs-enums/class-implement-trait-cross-crate.rs
+++ b/tests/ui/structs-enums/class-implement-trait-cross-crate.rs
diff --git a/src/test/ui/structs-enums/class-implement-traits.rs b/tests/ui/structs-enums/class-implement-traits.rs
index 732aa146c..732aa146c 100644
--- a/src/test/ui/structs-enums/class-implement-traits.rs
+++ b/tests/ui/structs-enums/class-implement-traits.rs
diff --git a/src/test/ui/structs-enums/class-method-cross-crate.rs b/tests/ui/structs-enums/class-method-cross-crate.rs
index 519f0685f..519f0685f 100644
--- a/src/test/ui/structs-enums/class-method-cross-crate.rs
+++ b/tests/ui/structs-enums/class-method-cross-crate.rs
diff --git a/src/test/ui/structs-enums/class-methods-cross-crate.rs b/tests/ui/structs-enums/class-methods-cross-crate.rs
index c342af313..c342af313 100644
--- a/src/test/ui/structs-enums/class-methods-cross-crate.rs
+++ b/tests/ui/structs-enums/class-methods-cross-crate.rs
diff --git a/src/test/ui/structs-enums/class-methods.rs b/tests/ui/structs-enums/class-methods.rs
index 83f4a5fd3..83f4a5fd3 100644
--- a/src/test/ui/structs-enums/class-methods.rs
+++ b/tests/ui/structs-enums/class-methods.rs
diff --git a/src/test/ui/structs-enums/class-poly-methods-cross-crate.rs b/tests/ui/structs-enums/class-poly-methods-cross-crate.rs
index 0307ba78d..0307ba78d 100644
--- a/src/test/ui/structs-enums/class-poly-methods-cross-crate.rs
+++ b/tests/ui/structs-enums/class-poly-methods-cross-crate.rs
diff --git a/src/test/ui/structs-enums/class-poly-methods.rs b/tests/ui/structs-enums/class-poly-methods.rs
index da2870b58..da2870b58 100644
--- a/src/test/ui/structs-enums/class-poly-methods.rs
+++ b/tests/ui/structs-enums/class-poly-methods.rs
diff --git a/src/test/ui/structs-enums/class-separate-impl.rs b/tests/ui/structs-enums/class-separate-impl.rs
index 3d6da1cc2..3d6da1cc2 100644
--- a/src/test/ui/structs-enums/class-separate-impl.rs
+++ b/tests/ui/structs-enums/class-separate-impl.rs
diff --git a/src/test/ui/structs-enums/class-str-field.rs b/tests/ui/structs-enums/class-str-field.rs
index a3dc66aab..a3dc66aab 100644
--- a/src/test/ui/structs-enums/class-str-field.rs
+++ b/tests/ui/structs-enums/class-str-field.rs
diff --git a/src/test/ui/structs-enums/class-typarams.rs b/tests/ui/structs-enums/class-typarams.rs
index 4b2d4b12e..4b2d4b12e 100644
--- a/src/test/ui/structs-enums/class-typarams.rs
+++ b/tests/ui/structs-enums/class-typarams.rs
diff --git a/src/test/ui/structs-enums/classes-cross-crate.rs b/tests/ui/structs-enums/classes-cross-crate.rs
index ca362c7a7..ca362c7a7 100644
--- a/src/test/ui/structs-enums/classes-cross-crate.rs
+++ b/tests/ui/structs-enums/classes-cross-crate.rs
diff --git a/src/test/ui/structs-enums/classes-self-referential.rs b/tests/ui/structs-enums/classes-self-referential.rs
index 27d6ebf2c..27d6ebf2c 100644
--- a/src/test/ui/structs-enums/classes-self-referential.rs
+++ b/tests/ui/structs-enums/classes-self-referential.rs
diff --git a/src/test/ui/structs-enums/classes-simple-cross-crate.rs b/tests/ui/structs-enums/classes-simple-cross-crate.rs
index 6ff0970c0..6ff0970c0 100644
--- a/src/test/ui/structs-enums/classes-simple-cross-crate.rs
+++ b/tests/ui/structs-enums/classes-simple-cross-crate.rs
diff --git a/src/test/ui/structs-enums/classes-simple-method.rs b/tests/ui/structs-enums/classes-simple-method.rs
index f3d98337d..f3d98337d 100644
--- a/src/test/ui/structs-enums/classes-simple-method.rs
+++ b/tests/ui/structs-enums/classes-simple-method.rs
diff --git a/src/test/ui/structs-enums/classes-simple.rs b/tests/ui/structs-enums/classes-simple.rs
index 568fbb29f..568fbb29f 100644
--- a/src/test/ui/structs-enums/classes-simple.rs
+++ b/tests/ui/structs-enums/classes-simple.rs
diff --git a/src/test/ui/structs-enums/classes.rs b/tests/ui/structs-enums/classes.rs
index 51d84b909..51d84b909 100644
--- a/src/test/ui/structs-enums/classes.rs
+++ b/tests/ui/structs-enums/classes.rs
diff --git a/src/test/ui/structs-enums/codegen-tag-static-padding.rs b/tests/ui/structs-enums/codegen-tag-static-padding.rs
index 8aa087c01..8aa087c01 100644
--- a/src/test/ui/structs-enums/codegen-tag-static-padding.rs
+++ b/tests/ui/structs-enums/codegen-tag-static-padding.rs
diff --git a/src/test/ui/structs-enums/compare-generic-enums.rs b/tests/ui/structs-enums/compare-generic-enums.rs
index 84f953b1f..84f953b1f 100644
--- a/src/test/ui/structs-enums/compare-generic-enums.rs
+++ b/tests/ui/structs-enums/compare-generic-enums.rs
diff --git a/src/test/ui/structs-enums/cross-crate-newtype-struct-pat.rs b/tests/ui/structs-enums/cross-crate-newtype-struct-pat.rs
index eabffc161..eabffc161 100644
--- a/src/test/ui/structs-enums/cross-crate-newtype-struct-pat.rs
+++ b/tests/ui/structs-enums/cross-crate-newtype-struct-pat.rs
diff --git a/src/test/ui/structs-enums/discrim-explicit-23030.rs b/tests/ui/structs-enums/discrim-explicit-23030.rs
index e17025e9e..e17025e9e 100644
--- a/src/test/ui/structs-enums/discrim-explicit-23030.rs
+++ b/tests/ui/structs-enums/discrim-explicit-23030.rs
diff --git a/src/test/ui/structs-enums/empty-struct-braces.rs b/tests/ui/structs-enums/empty-struct-braces.rs
index 0663687c9..0663687c9 100644
--- a/src/test/ui/structs-enums/empty-struct-braces.rs
+++ b/tests/ui/structs-enums/empty-struct-braces.rs
diff --git a/src/test/ui/structs-enums/empty-tag.rs b/tests/ui/structs-enums/empty-tag.rs
index 271ab72c7..271ab72c7 100644
--- a/src/test/ui/structs-enums/empty-tag.rs
+++ b/tests/ui/structs-enums/empty-tag.rs
diff --git a/src/test/ui/structs-enums/enum-alignment.rs b/tests/ui/structs-enums/enum-alignment.rs
index 108dfe2e6..108dfe2e6 100644
--- a/src/test/ui/structs-enums/enum-alignment.rs
+++ b/tests/ui/structs-enums/enum-alignment.rs
diff --git a/src/test/ui/structs-enums/enum-clike-ffi-as-int.rs b/tests/ui/structs-enums/enum-clike-ffi-as-int.rs
index e2b2b43de..e2b2b43de 100644
--- a/src/test/ui/structs-enums/enum-clike-ffi-as-int.rs
+++ b/tests/ui/structs-enums/enum-clike-ffi-as-int.rs
diff --git a/src/test/ui/structs-enums/enum-discr.rs b/tests/ui/structs-enums/enum-discr.rs
index bdd6df82d..bdd6df82d 100644
--- a/src/test/ui/structs-enums/enum-discr.rs
+++ b/tests/ui/structs-enums/enum-discr.rs
diff --git a/src/test/ui/structs-enums/enum-discrim-autosizing.rs b/tests/ui/structs-enums/enum-discrim-autosizing.rs
index f68fdda60..f68fdda60 100644
--- a/src/test/ui/structs-enums/enum-discrim-autosizing.rs
+++ b/tests/ui/structs-enums/enum-discrim-autosizing.rs
diff --git a/src/test/ui/structs-enums/enum-discrim-manual-sizing.rs b/tests/ui/structs-enums/enum-discrim-manual-sizing.rs
index c8b362c99..c8b362c99 100644
--- a/src/test/ui/structs-enums/enum-discrim-manual-sizing.rs
+++ b/tests/ui/structs-enums/enum-discrim-manual-sizing.rs
diff --git a/src/test/ui/structs-enums/enum-discrim-range-overflow.rs b/tests/ui/structs-enums/enum-discrim-range-overflow.rs
index 9c4c61e68..9c4c61e68 100644
--- a/src/test/ui/structs-enums/enum-discrim-range-overflow.rs
+++ b/tests/ui/structs-enums/enum-discrim-range-overflow.rs
diff --git a/src/test/ui/structs-enums/enum-discrim-width-stuff.rs b/tests/ui/structs-enums/enum-discrim-width-stuff.rs
index f278ae2d0..f278ae2d0 100644
--- a/src/test/ui/structs-enums/enum-discrim-width-stuff.rs
+++ b/tests/ui/structs-enums/enum-discrim-width-stuff.rs
diff --git a/src/test/ui/structs-enums/enum-disr-val-pretty.rs b/tests/ui/structs-enums/enum-disr-val-pretty.rs
index ef1333e0e..ef1333e0e 100644
--- a/src/test/ui/structs-enums/enum-disr-val-pretty.rs
+++ b/tests/ui/structs-enums/enum-disr-val-pretty.rs
diff --git a/src/test/ui/structs-enums/enum-export-inheritance.rs b/tests/ui/structs-enums/enum-export-inheritance.rs
index 6a36a004a..6a36a004a 100644
--- a/src/test/ui/structs-enums/enum-export-inheritance.rs
+++ b/tests/ui/structs-enums/enum-export-inheritance.rs
diff --git a/src/test/ui/structs-enums/enum-layout-optimization.rs b/tests/ui/structs-enums/enum-layout-optimization.rs
index 05d297906..05d297906 100644
--- a/src/test/ui/structs-enums/enum-layout-optimization.rs
+++ b/tests/ui/structs-enums/enum-layout-optimization.rs
diff --git a/src/test/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs b/tests/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs
index 7d15d607d..7d15d607d 100644
--- a/src/test/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs
+++ b/tests/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs
diff --git a/src/test/ui/structs-enums/enum-non-c-like-repr-c.rs b/tests/ui/structs-enums/enum-non-c-like-repr-c.rs
index fc9efdeca..fc9efdeca 100644
--- a/src/test/ui/structs-enums/enum-non-c-like-repr-c.rs
+++ b/tests/ui/structs-enums/enum-non-c-like-repr-c.rs
diff --git a/src/test/ui/structs-enums/enum-non-c-like-repr-int.rs b/tests/ui/structs-enums/enum-non-c-like-repr-int.rs
index f9e96c1a0..f9e96c1a0 100644
--- a/src/test/ui/structs-enums/enum-non-c-like-repr-int.rs
+++ b/tests/ui/structs-enums/enum-non-c-like-repr-int.rs
diff --git a/src/test/ui/structs-enums/enum-null-pointer-opt.rs b/tests/ui/structs-enums/enum-null-pointer-opt.rs
index 85fa1eac2..85fa1eac2 100644
--- a/src/test/ui/structs-enums/enum-null-pointer-opt.rs
+++ b/tests/ui/structs-enums/enum-null-pointer-opt.rs
diff --git a/src/test/ui/structs-enums/enum-nullable-const-null-with-fields.rs b/tests/ui/structs-enums/enum-nullable-const-null-with-fields.rs
index ae267e798..ae267e798 100644
--- a/src/test/ui/structs-enums/enum-nullable-const-null-with-fields.rs
+++ b/tests/ui/structs-enums/enum-nullable-const-null-with-fields.rs
diff --git a/src/test/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs b/tests/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
index a05cf8b93..a05cf8b93 100644
--- a/src/test/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
+++ b/tests/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
diff --git a/src/test/ui/structs-enums/enum-univariant-repr.rs b/tests/ui/structs-enums/enum-univariant-repr.rs
index 1e0f67887..1e0f67887 100644
--- a/src/test/ui/structs-enums/enum-univariant-repr.rs
+++ b/tests/ui/structs-enums/enum-univariant-repr.rs
diff --git a/src/test/ui/structs-enums/enum-variants.rs b/tests/ui/structs-enums/enum-variants.rs
index 9ac5aae72..9ac5aae72 100644
--- a/src/test/ui/structs-enums/enum-variants.rs
+++ b/tests/ui/structs-enums/enum-variants.rs
diff --git a/src/test/ui/structs-enums/enum-vec-initializer.rs b/tests/ui/structs-enums/enum-vec-initializer.rs
index 42ee8ba97..42ee8ba97 100644
--- a/src/test/ui/structs-enums/enum-vec-initializer.rs
+++ b/tests/ui/structs-enums/enum-vec-initializer.rs
diff --git a/src/test/ui/structs-enums/export-abstract-tag.rs b/tests/ui/structs-enums/export-abstract-tag.rs
index 76ac73321..76ac73321 100644
--- a/src/test/ui/structs-enums/export-abstract-tag.rs
+++ b/tests/ui/structs-enums/export-abstract-tag.rs
diff --git a/src/test/ui/structs-enums/export-tag-variant.rs b/tests/ui/structs-enums/export-tag-variant.rs
index 52e0aba09..52e0aba09 100644
--- a/src/test/ui/structs-enums/export-tag-variant.rs
+++ b/tests/ui/structs-enums/export-tag-variant.rs
diff --git a/src/test/ui/structs-enums/expr-if-struct.rs b/tests/ui/structs-enums/expr-if-struct.rs
index e62d47c6f..e62d47c6f 100644
--- a/src/test/ui/structs-enums/expr-if-struct.rs
+++ b/tests/ui/structs-enums/expr-if-struct.rs
diff --git a/src/test/ui/structs-enums/expr-match-struct.rs b/tests/ui/structs-enums/expr-match-struct.rs
index f0e8d8972..f0e8d8972 100644
--- a/src/test/ui/structs-enums/expr-match-struct.rs
+++ b/tests/ui/structs-enums/expr-match-struct.rs
diff --git a/src/test/ui/structs-enums/field-destruction-order.rs b/tests/ui/structs-enums/field-destruction-order.rs
index a75a742d9..a75a742d9 100644
--- a/src/test/ui/structs-enums/field-destruction-order.rs
+++ b/tests/ui/structs-enums/field-destruction-order.rs
diff --git a/src/test/ui/structs-enums/foreign-struct.rs b/tests/ui/structs-enums/foreign-struct.rs
index 00a23b354..00a23b354 100644
--- a/src/test/ui/structs-enums/foreign-struct.rs
+++ b/tests/ui/structs-enums/foreign-struct.rs
diff --git a/src/test/ui/structs-enums/functional-struct-upd.rs b/tests/ui/structs-enums/functional-struct-upd.rs
index 68ff73a08..68ff73a08 100644
--- a/src/test/ui/structs-enums/functional-struct-upd.rs
+++ b/tests/ui/structs-enums/functional-struct-upd.rs
diff --git a/src/test/ui/structs-enums/issue-1701.rs b/tests/ui/structs-enums/issue-1701.rs
index bae32a777..bae32a777 100644
--- a/src/test/ui/structs-enums/issue-1701.rs
+++ b/tests/ui/structs-enums/issue-1701.rs
diff --git a/src/test/ui/structs-enums/issue-2718-a.rs b/tests/ui/structs-enums/issue-2718-a.rs
index 6c4915845..6c4915845 100644
--- a/src/test/ui/structs-enums/issue-2718-a.rs
+++ b/tests/ui/structs-enums/issue-2718-a.rs
diff --git a/src/test/ui/structs-enums/issue-2718-a.stderr b/tests/ui/structs-enums/issue-2718-a.stderr
index 7ea620f38..7ea620f38 100644
--- a/src/test/ui/structs-enums/issue-2718-a.stderr
+++ b/tests/ui/structs-enums/issue-2718-a.stderr
diff --git a/src/test/ui/structs-enums/issue-38002.rs b/tests/ui/structs-enums/issue-38002.rs
index fdb31fc44..fdb31fc44 100644
--- a/src/test/ui/structs-enums/issue-38002.rs
+++ b/tests/ui/structs-enums/issue-38002.rs
diff --git a/src/test/ui/structs-enums/issue-50731.rs b/tests/ui/structs-enums/issue-50731.rs
index 209c1e127..209c1e127 100644
--- a/src/test/ui/structs-enums/issue-50731.rs
+++ b/tests/ui/structs-enums/issue-50731.rs
diff --git a/src/test/ui/structs-enums/ivec-tag.rs b/tests/ui/structs-enums/ivec-tag.rs
index c39368a2b..c39368a2b 100644
--- a/src/test/ui/structs-enums/ivec-tag.rs
+++ b/tests/ui/structs-enums/ivec-tag.rs
diff --git a/src/test/ui/structs-enums/module-qualified-struct-destructure.rs b/tests/ui/structs-enums/module-qualified-struct-destructure.rs
index 57be37cdf..57be37cdf 100644
--- a/src/test/ui/structs-enums/module-qualified-struct-destructure.rs
+++ b/tests/ui/structs-enums/module-qualified-struct-destructure.rs
diff --git a/src/test/ui/structs-enums/multiple-reprs.rs b/tests/ui/structs-enums/multiple-reprs.rs
index 4be503a0e..4be503a0e 100644
--- a/src/test/ui/structs-enums/multiple-reprs.rs
+++ b/tests/ui/structs-enums/multiple-reprs.rs
diff --git a/src/test/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs b/tests/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
index 30cf64582..30cf64582 100644
--- a/src/test/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
+++ b/tests/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
diff --git a/src/test/ui/structs-enums/namespaced-enum-emulate-flat.rs b/tests/ui/structs-enums/namespaced-enum-emulate-flat.rs
index f6c395059..f6c395059 100644
--- a/src/test/ui/structs-enums/namespaced-enum-emulate-flat.rs
+++ b/tests/ui/structs-enums/namespaced-enum-emulate-flat.rs
diff --git a/src/test/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs b/tests/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
index d2ccadea0..d2ccadea0 100644
--- a/src/test/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
+++ b/tests/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
diff --git a/src/test/ui/structs-enums/namespaced-enum-glob-import.rs b/tests/ui/structs-enums/namespaced-enum-glob-import.rs
index f36ac69dc..f36ac69dc 100644
--- a/src/test/ui/structs-enums/namespaced-enum-glob-import.rs
+++ b/tests/ui/structs-enums/namespaced-enum-glob-import.rs
diff --git a/src/test/ui/structs-enums/namespaced-enums-xcrate.rs b/tests/ui/structs-enums/namespaced-enums-xcrate.rs
index 5e10c3ec1..5e10c3ec1 100644
--- a/src/test/ui/structs-enums/namespaced-enums-xcrate.rs
+++ b/tests/ui/structs-enums/namespaced-enums-xcrate.rs
diff --git a/src/test/ui/structs-enums/namespaced-enums.rs b/tests/ui/structs-enums/namespaced-enums.rs
index 6a2602501..6a2602501 100644
--- a/src/test/ui/structs-enums/namespaced-enums.rs
+++ b/tests/ui/structs-enums/namespaced-enums.rs
diff --git a/src/test/ui/structs-enums/nested-enum-same-names.rs b/tests/ui/structs-enums/nested-enum-same-names.rs
index 111b9ba94..111b9ba94 100644
--- a/src/test/ui/structs-enums/nested-enum-same-names.rs
+++ b/tests/ui/structs-enums/nested-enum-same-names.rs
diff --git a/src/test/ui/structs-enums/newtype-struct-drop-run.rs b/tests/ui/structs-enums/newtype-struct-drop-run.rs
index 0754f3187..0754f3187 100644
--- a/src/test/ui/structs-enums/newtype-struct-drop-run.rs
+++ b/tests/ui/structs-enums/newtype-struct-drop-run.rs
diff --git a/src/test/ui/structs-enums/newtype-struct-with-dtor.rs b/tests/ui/structs-enums/newtype-struct-with-dtor.rs
index f73b492df..f73b492df 100644
--- a/src/test/ui/structs-enums/newtype-struct-with-dtor.rs
+++ b/tests/ui/structs-enums/newtype-struct-with-dtor.rs
diff --git a/src/test/ui/structs-enums/newtype-struct-xc-2.rs b/tests/ui/structs-enums/newtype-struct-xc-2.rs
index 40837321b..40837321b 100644
--- a/src/test/ui/structs-enums/newtype-struct-xc-2.rs
+++ b/tests/ui/structs-enums/newtype-struct-xc-2.rs
diff --git a/src/test/ui/structs-enums/newtype-struct-xc.rs b/tests/ui/structs-enums/newtype-struct-xc.rs
index 0c6466d97..0c6466d97 100644
--- a/src/test/ui/structs-enums/newtype-struct-xc.rs
+++ b/tests/ui/structs-enums/newtype-struct-xc.rs
diff --git a/src/test/ui/structs-enums/nonzero-enum.rs b/tests/ui/structs-enums/nonzero-enum.rs
index 15b571be5..15b571be5 100644
--- a/src/test/ui/structs-enums/nonzero-enum.rs
+++ b/tests/ui/structs-enums/nonzero-enum.rs
diff --git a/src/test/ui/structs-enums/numeric-fields.rs b/tests/ui/structs-enums/numeric-fields.rs
index 6ff3afc38..6ff3afc38 100644
--- a/src/test/ui/structs-enums/numeric-fields.rs
+++ b/tests/ui/structs-enums/numeric-fields.rs
diff --git a/src/test/ui/structs-enums/rec-align-u32.rs b/tests/ui/structs-enums/rec-align-u32.rs
index ee704198d..ee704198d 100644
--- a/src/test/ui/structs-enums/rec-align-u32.rs
+++ b/tests/ui/structs-enums/rec-align-u32.rs
diff --git a/src/test/ui/structs-enums/rec-align-u64.rs b/tests/ui/structs-enums/rec-align-u64.rs
index 40ede9705..40ede9705 100644
--- a/src/test/ui/structs-enums/rec-align-u64.rs
+++ b/tests/ui/structs-enums/rec-align-u64.rs
diff --git a/src/test/ui/structs-enums/rec-auto.rs b/tests/ui/structs-enums/rec-auto.rs
index c2ef13ede..c2ef13ede 100644
--- a/src/test/ui/structs-enums/rec-auto.rs
+++ b/tests/ui/structs-enums/rec-auto.rs
diff --git a/src/test/ui/structs-enums/rec-extend.rs b/tests/ui/structs-enums/rec-extend.rs
index 4c91cd185..4c91cd185 100644
--- a/src/test/ui/structs-enums/rec-extend.rs
+++ b/tests/ui/structs-enums/rec-extend.rs
diff --git a/src/test/ui/structs-enums/rec-tup.rs b/tests/ui/structs-enums/rec-tup.rs
index b85d28fdf..b85d28fdf 100644
--- a/src/test/ui/structs-enums/rec-tup.rs
+++ b/tests/ui/structs-enums/rec-tup.rs
diff --git a/src/test/ui/structs-enums/rec.rs b/tests/ui/structs-enums/rec.rs
index 82c84ebd6..82c84ebd6 100644
--- a/src/test/ui/structs-enums/rec.rs
+++ b/tests/ui/structs-enums/rec.rs
diff --git a/src/test/ui/structs-enums/record-pat.rs b/tests/ui/structs-enums/record-pat.rs
index 1acaf2a32..1acaf2a32 100644
--- a/src/test/ui/structs-enums/record-pat.rs
+++ b/tests/ui/structs-enums/record-pat.rs
diff --git a/src/test/ui/structs-enums/resource-in-struct.rs b/tests/ui/structs-enums/resource-in-struct.rs
index 9613ca62a..9613ca62a 100644
--- a/src/test/ui/structs-enums/resource-in-struct.rs
+++ b/tests/ui/structs-enums/resource-in-struct.rs
diff --git a/src/test/ui/structs-enums/simple-generic-tag.rs b/tests/ui/structs-enums/simple-generic-tag.rs
index dbd2834d4..dbd2834d4 100644
--- a/src/test/ui/structs-enums/simple-generic-tag.rs
+++ b/tests/ui/structs-enums/simple-generic-tag.rs
diff --git a/src/test/ui/structs-enums/simple-match-generic-tag.rs b/tests/ui/structs-enums/simple-match-generic-tag.rs
index 762fd49ad..762fd49ad 100644
--- a/src/test/ui/structs-enums/simple-match-generic-tag.rs
+++ b/tests/ui/structs-enums/simple-match-generic-tag.rs
diff --git a/src/test/ui/structs-enums/small-enum-range-edge.rs b/tests/ui/structs-enums/small-enum-range-edge.rs
index 306129479..306129479 100644
--- a/src/test/ui/structs-enums/small-enum-range-edge.rs
+++ b/tests/ui/structs-enums/small-enum-range-edge.rs
diff --git a/src/test/ui/structs-enums/small-enums-with-fields.rs b/tests/ui/structs-enums/small-enums-with-fields.rs
index 565ec1bd4..565ec1bd4 100644
--- a/src/test/ui/structs-enums/small-enums-with-fields.rs
+++ b/tests/ui/structs-enums/small-enums-with-fields.rs
diff --git a/src/test/ui/structs-enums/struct-aliases-xcrate.rs b/tests/ui/structs-enums/struct-aliases-xcrate.rs
index ffe7b22f8..ffe7b22f8 100644
--- a/src/test/ui/structs-enums/struct-aliases-xcrate.rs
+++ b/tests/ui/structs-enums/struct-aliases-xcrate.rs
diff --git a/src/test/ui/structs-enums/struct-aliases.rs b/tests/ui/structs-enums/struct-aliases.rs
index b7aeed7bc..b7aeed7bc 100644
--- a/src/test/ui/structs-enums/struct-aliases.rs
+++ b/tests/ui/structs-enums/struct-aliases.rs
diff --git a/src/test/ui/structs-enums/struct-destructuring-cross-crate.rs b/tests/ui/structs-enums/struct-destructuring-cross-crate.rs
index 19e0a0bbd..19e0a0bbd 100644
--- a/src/test/ui/structs-enums/struct-destructuring-cross-crate.rs
+++ b/tests/ui/structs-enums/struct-destructuring-cross-crate.rs
diff --git a/src/test/ui/structs-enums/struct-enum-ignoring-field-with-underscore.rs b/tests/ui/structs-enums/struct-enum-ignoring-field-with-underscore.rs
index c30b8a1e1..c30b8a1e1 100644
--- a/src/test/ui/structs-enums/struct-enum-ignoring-field-with-underscore.rs
+++ b/tests/ui/structs-enums/struct-enum-ignoring-field-with-underscore.rs
diff --git a/src/test/ui/structs-enums/struct-enum-ignoring-field-with-underscore.stderr b/tests/ui/structs-enums/struct-enum-ignoring-field-with-underscore.stderr
index 16f751444..16f751444 100644
--- a/src/test/ui/structs-enums/struct-enum-ignoring-field-with-underscore.stderr
+++ b/tests/ui/structs-enums/struct-enum-ignoring-field-with-underscore.stderr
diff --git a/src/test/ui/structs-enums/struct-field-shorthand.rs b/tests/ui/structs-enums/struct-field-shorthand.rs
index ed650c683..ed650c683 100644
--- a/src/test/ui/structs-enums/struct-field-shorthand.rs
+++ b/tests/ui/structs-enums/struct-field-shorthand.rs
diff --git a/src/test/ui/structs-enums/struct-like-variant-construct.rs b/tests/ui/structs-enums/struct-like-variant-construct.rs
index 60fc7ce39..60fc7ce39 100644
--- a/src/test/ui/structs-enums/struct-like-variant-construct.rs
+++ b/tests/ui/structs-enums/struct-like-variant-construct.rs
diff --git a/src/test/ui/structs-enums/struct-like-variant-match.rs b/tests/ui/structs-enums/struct-like-variant-match.rs
index ade1a6970..ade1a6970 100644
--- a/src/test/ui/structs-enums/struct-like-variant-match.rs
+++ b/tests/ui/structs-enums/struct-like-variant-match.rs
diff --git a/src/test/ui/structs-enums/struct-lit-functional-no-fields.rs b/tests/ui/structs-enums/struct-lit-functional-no-fields.rs
index f19604e95..f19604e95 100644
--- a/src/test/ui/structs-enums/struct-lit-functional-no-fields.rs
+++ b/tests/ui/structs-enums/struct-lit-functional-no-fields.rs
diff --git a/src/test/ui/structs-enums/struct-literal-dtor.rs b/tests/ui/structs-enums/struct-literal-dtor.rs
index 6d1b1dfb9..6d1b1dfb9 100644
--- a/src/test/ui/structs-enums/struct-literal-dtor.rs
+++ b/tests/ui/structs-enums/struct-literal-dtor.rs
diff --git a/src/test/ui/structs-enums/struct-new-as-field-name.rs b/tests/ui/structs-enums/struct-new-as-field-name.rs
index 641fc3c58..641fc3c58 100644
--- a/src/test/ui/structs-enums/struct-new-as-field-name.rs
+++ b/tests/ui/structs-enums/struct-new-as-field-name.rs
diff --git a/src/test/ui/structs-enums/struct-order-of-eval-1.rs b/tests/ui/structs-enums/struct-order-of-eval-1.rs
index f3fe99538..f3fe99538 100644
--- a/src/test/ui/structs-enums/struct-order-of-eval-1.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-1.rs
diff --git a/src/test/ui/structs-enums/struct-order-of-eval-2.rs b/tests/ui/structs-enums/struct-order-of-eval-2.rs
index a4e0edc97..a4e0edc97 100644
--- a/src/test/ui/structs-enums/struct-order-of-eval-2.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-2.rs
diff --git a/src/test/ui/structs-enums/struct-order-of-eval-3.rs b/tests/ui/structs-enums/struct-order-of-eval-3.rs
index 60887f8d0..60887f8d0 100644
--- a/src/test/ui/structs-enums/struct-order-of-eval-3.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-3.rs
diff --git a/src/test/ui/structs-enums/struct-order-of-eval-4.rs b/tests/ui/structs-enums/struct-order-of-eval-4.rs
index 547df6318..547df6318 100644
--- a/src/test/ui/structs-enums/struct-order-of-eval-4.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-4.rs
diff --git a/src/test/ui/structs-enums/struct-partial-move-1.rs b/tests/ui/structs-enums/struct-partial-move-1.rs
index c15701593..c15701593 100644
--- a/src/test/ui/structs-enums/struct-partial-move-1.rs
+++ b/tests/ui/structs-enums/struct-partial-move-1.rs
diff --git a/src/test/ui/structs-enums/struct-partial-move-2.rs b/tests/ui/structs-enums/struct-partial-move-2.rs
index 4315e5c29..4315e5c29 100644
--- a/src/test/ui/structs-enums/struct-partial-move-2.rs
+++ b/tests/ui/structs-enums/struct-partial-move-2.rs
diff --git a/src/test/ui/structs-enums/struct-path-associated-type.rs b/tests/ui/structs-enums/struct-path-associated-type.rs
index 2235dfe4b..2235dfe4b 100644
--- a/src/test/ui/structs-enums/struct-path-associated-type.rs
+++ b/tests/ui/structs-enums/struct-path-associated-type.rs
diff --git a/src/test/ui/structs-enums/struct-path-self.rs b/tests/ui/structs-enums/struct-path-self.rs
index e7a59858f..e7a59858f 100644
--- a/src/test/ui/structs-enums/struct-path-self.rs
+++ b/tests/ui/structs-enums/struct-path-self.rs
diff --git a/src/test/ui/structs-enums/struct-pattern-matching.rs b/tests/ui/structs-enums/struct-pattern-matching.rs
index 89361bf24..89361bf24 100644
--- a/src/test/ui/structs-enums/struct-pattern-matching.rs
+++ b/tests/ui/structs-enums/struct-pattern-matching.rs
diff --git a/src/test/ui/structs-enums/struct-rec/issue-74224.rs b/tests/ui/structs-enums/struct-rec/issue-74224.rs
index f3b72c5df..f3b72c5df 100644
--- a/src/test/ui/structs-enums/struct-rec/issue-74224.rs
+++ b/tests/ui/structs-enums/struct-rec/issue-74224.rs
diff --git a/src/test/ui/structs-enums/struct-rec/issue-74224.stderr b/tests/ui/structs-enums/struct-rec/issue-74224.stderr
index f1d50bc8a..f1d50bc8a 100644
--- a/src/test/ui/structs-enums/struct-rec/issue-74224.stderr
+++ b/tests/ui/structs-enums/struct-rec/issue-74224.stderr
diff --git a/src/test/ui/structs-enums/struct-rec/issue-84611.rs b/tests/ui/structs-enums/struct-rec/issue-84611.rs
index 4c356af3e..4c356af3e 100644
--- a/src/test/ui/structs-enums/struct-rec/issue-84611.rs
+++ b/tests/ui/structs-enums/struct-rec/issue-84611.rs
diff --git a/src/test/ui/structs-enums/struct-rec/issue-84611.stderr b/tests/ui/structs-enums/struct-rec/issue-84611.stderr
index 536f54e3e..536f54e3e 100644
--- a/src/test/ui/structs-enums/struct-rec/issue-84611.stderr
+++ b/tests/ui/structs-enums/struct-rec/issue-84611.stderr
diff --git a/src/test/ui/structs-enums/struct-rec/mutual-struct-recursion.rs b/tests/ui/structs-enums/struct-rec/mutual-struct-recursion.rs
index 3bfce8b4f..3bfce8b4f 100644
--- a/src/test/ui/structs-enums/struct-rec/mutual-struct-recursion.rs
+++ b/tests/ui/structs-enums/struct-rec/mutual-struct-recursion.rs
diff --git a/src/test/ui/structs-enums/struct-rec/mutual-struct-recursion.stderr b/tests/ui/structs-enums/struct-rec/mutual-struct-recursion.stderr
index 881bc2819..881bc2819 100644
--- a/src/test/ui/structs-enums/struct-rec/mutual-struct-recursion.stderr
+++ b/tests/ui/structs-enums/struct-rec/mutual-struct-recursion.stderr
diff --git a/src/test/ui/structs-enums/struct-variant-field-visibility.rs b/tests/ui/structs-enums/struct-variant-field-visibility.rs
index 7896c829a..7896c829a 100644
--- a/src/test/ui/structs-enums/struct-variant-field-visibility.rs
+++ b/tests/ui/structs-enums/struct-variant-field-visibility.rs
diff --git a/src/test/ui/structs-enums/struct_variant_xc.rs b/tests/ui/structs-enums/struct_variant_xc.rs
index 9c8d1a69a..9c8d1a69a 100644
--- a/src/test/ui/structs-enums/struct_variant_xc.rs
+++ b/tests/ui/structs-enums/struct_variant_xc.rs
diff --git a/src/test/ui/structs-enums/struct_variant_xc_match.rs b/tests/ui/structs-enums/struct_variant_xc_match.rs
index 5358d13fa..5358d13fa 100644
--- a/src/test/ui/structs-enums/struct_variant_xc_match.rs
+++ b/tests/ui/structs-enums/struct_variant_xc_match.rs
diff --git a/src/test/ui/structs-enums/tag-align-dyn-u64.rs b/tests/ui/structs-enums/tag-align-dyn-u64.rs
index 3f7a5e3e5..3f7a5e3e5 100644
--- a/src/test/ui/structs-enums/tag-align-dyn-u64.rs
+++ b/tests/ui/structs-enums/tag-align-dyn-u64.rs
diff --git a/src/test/ui/structs-enums/tag-align-dyn-variants.rs b/tests/ui/structs-enums/tag-align-dyn-variants.rs
index 4d075b04c..4d075b04c 100644
--- a/src/test/ui/structs-enums/tag-align-dyn-variants.rs
+++ b/tests/ui/structs-enums/tag-align-dyn-variants.rs
diff --git a/src/test/ui/structs-enums/tag-align-shape.rs b/tests/ui/structs-enums/tag-align-shape.rs
index ce5995823..ce5995823 100644
--- a/src/test/ui/structs-enums/tag-align-shape.rs
+++ b/tests/ui/structs-enums/tag-align-shape.rs
diff --git a/src/test/ui/structs-enums/tag-align-u64.rs b/tests/ui/structs-enums/tag-align-u64.rs
index 684b27cd0..684b27cd0 100644
--- a/src/test/ui/structs-enums/tag-align-u64.rs
+++ b/tests/ui/structs-enums/tag-align-u64.rs
diff --git a/src/test/ui/structs-enums/tag-disr-val-shape.rs b/tests/ui/structs-enums/tag-disr-val-shape.rs
index 51052626c..51052626c 100644
--- a/src/test/ui/structs-enums/tag-disr-val-shape.rs
+++ b/tests/ui/structs-enums/tag-disr-val-shape.rs
diff --git a/src/test/ui/structs-enums/tag-exports.rs b/tests/ui/structs-enums/tag-exports.rs
index 1bcb7d35d..1bcb7d35d 100644
--- a/src/test/ui/structs-enums/tag-exports.rs
+++ b/tests/ui/structs-enums/tag-exports.rs
diff --git a/src/test/ui/structs-enums/tag-in-block.rs b/tests/ui/structs-enums/tag-in-block.rs
index 03d4dd9b0..03d4dd9b0 100644
--- a/src/test/ui/structs-enums/tag-in-block.rs
+++ b/tests/ui/structs-enums/tag-in-block.rs
diff --git a/src/test/ui/structs-enums/tag-variant-disr-type-mismatch.rs b/tests/ui/structs-enums/tag-variant-disr-type-mismatch.rs
index 3f59db383..3f59db383 100644
--- a/src/test/ui/structs-enums/tag-variant-disr-type-mismatch.rs
+++ b/tests/ui/structs-enums/tag-variant-disr-type-mismatch.rs
diff --git a/src/test/ui/structs-enums/tag-variant-disr-val.rs b/tests/ui/structs-enums/tag-variant-disr-val.rs
index 297d85c58..297d85c58 100644
--- a/src/test/ui/structs-enums/tag-variant-disr-val.rs
+++ b/tests/ui/structs-enums/tag-variant-disr-val.rs
diff --git a/src/test/ui/structs-enums/tag.rs b/tests/ui/structs-enums/tag.rs
index 5fcd64b7c..5fcd64b7c 100644
--- a/src/test/ui/structs-enums/tag.rs
+++ b/tests/ui/structs-enums/tag.rs
diff --git a/src/test/ui/structs-enums/tuple-struct-construct.rs b/tests/ui/structs-enums/tuple-struct-construct.rs
index fbf97e6b2..fbf97e6b2 100644
--- a/src/test/ui/structs-enums/tuple-struct-construct.rs
+++ b/tests/ui/structs-enums/tuple-struct-construct.rs
diff --git a/src/test/ui/structs-enums/tuple-struct-constructor-pointer.rs b/tests/ui/structs-enums/tuple-struct-constructor-pointer.rs
index 23f065163..23f065163 100644
--- a/src/test/ui/structs-enums/tuple-struct-constructor-pointer.rs
+++ b/tests/ui/structs-enums/tuple-struct-constructor-pointer.rs
diff --git a/src/test/ui/structs-enums/tuple-struct-destructuring.rs b/tests/ui/structs-enums/tuple-struct-destructuring.rs
index dff87ead0..dff87ead0 100644
--- a/src/test/ui/structs-enums/tuple-struct-destructuring.rs
+++ b/tests/ui/structs-enums/tuple-struct-destructuring.rs
diff --git a/src/test/ui/structs-enums/tuple-struct-matching.rs b/tests/ui/structs-enums/tuple-struct-matching.rs
index 432be1d1f..432be1d1f 100644
--- a/src/test/ui/structs-enums/tuple-struct-matching.rs
+++ b/tests/ui/structs-enums/tuple-struct-matching.rs
diff --git a/src/test/ui/structs-enums/tuple-struct-trivial.rs b/tests/ui/structs-enums/tuple-struct-trivial.rs
index c8651fd29..c8651fd29 100644
--- a/src/test/ui/structs-enums/tuple-struct-trivial.rs
+++ b/tests/ui/structs-enums/tuple-struct-trivial.rs
diff --git a/src/test/ui/structs-enums/type-sizes.rs b/tests/ui/structs-enums/type-sizes.rs
index 63e2f3150..63e2f3150 100644
--- a/src/test/ui/structs-enums/type-sizes.rs
+++ b/tests/ui/structs-enums/type-sizes.rs
diff --git a/src/test/ui/structs-enums/uninstantiable-struct.rs b/tests/ui/structs-enums/uninstantiable-struct.rs
index b24effe5a..b24effe5a 100644
--- a/src/test/ui/structs-enums/uninstantiable-struct.rs
+++ b/tests/ui/structs-enums/uninstantiable-struct.rs
diff --git a/src/test/ui/structs-enums/unit-like-struct-drop-run.rs b/tests/ui/structs-enums/unit-like-struct-drop-run.rs
index 1e9c269a4..1e9c269a4 100644
--- a/src/test/ui/structs-enums/unit-like-struct-drop-run.rs
+++ b/tests/ui/structs-enums/unit-like-struct-drop-run.rs
diff --git a/src/test/ui/structs-enums/unit-like-struct.rs b/tests/ui/structs-enums/unit-like-struct.rs
index 636ec9926..636ec9926 100644
--- a/src/test/ui/structs-enums/unit-like-struct.rs
+++ b/tests/ui/structs-enums/unit-like-struct.rs
diff --git a/src/test/ui/structs-enums/variant-structs-trivial.rs b/tests/ui/structs-enums/variant-structs-trivial.rs
index 31fa610a6..31fa610a6 100644
--- a/src/test/ui/structs-enums/variant-structs-trivial.rs
+++ b/tests/ui/structs-enums/variant-structs-trivial.rs
diff --git a/src/test/ui/structs/auxiliary/struct_field_privacy.rs b/tests/ui/structs/auxiliary/struct_field_privacy.rs
index 9765af1a7..9765af1a7 100644
--- a/src/test/ui/structs/auxiliary/struct_field_privacy.rs
+++ b/tests/ui/structs/auxiliary/struct_field_privacy.rs
diff --git a/src/test/ui/structs/auxiliary/struct_variant_privacy.rs b/tests/ui/structs/auxiliary/struct_variant_privacy.rs
index 425ec0e96..425ec0e96 100644
--- a/src/test/ui/structs/auxiliary/struct_variant_privacy.rs
+++ b/tests/ui/structs/auxiliary/struct_variant_privacy.rs
diff --git a/src/test/ui/structs/incomplete-fn-in-struct-definition.rs b/tests/ui/structs/incomplete-fn-in-struct-definition.rs
index cd8a79ba6..cd8a79ba6 100644
--- a/src/test/ui/structs/incomplete-fn-in-struct-definition.rs
+++ b/tests/ui/structs/incomplete-fn-in-struct-definition.rs
diff --git a/src/test/ui/structs/incomplete-fn-in-struct-definition.stderr b/tests/ui/structs/incomplete-fn-in-struct-definition.stderr
index 0d12ba9c9..0d12ba9c9 100644
--- a/src/test/ui/structs/incomplete-fn-in-struct-definition.stderr
+++ b/tests/ui/structs/incomplete-fn-in-struct-definition.stderr
diff --git a/src/test/ui/structs/issue-80853.rs b/tests/ui/structs/issue-80853.rs
index 242d0af95..242d0af95 100644
--- a/src/test/ui/structs/issue-80853.rs
+++ b/tests/ui/structs/issue-80853.rs
diff --git a/src/test/ui/structs/issue-80853.stderr b/tests/ui/structs/issue-80853.stderr
index 1c7d52b6d..1c7d52b6d 100644
--- a/src/test/ui/structs/issue-80853.stderr
+++ b/tests/ui/structs/issue-80853.stderr
diff --git a/src/test/ui/structs/large-records.rs b/tests/ui/structs/large-records.rs
index 7f850a94e..7f850a94e 100644
--- a/src/test/ui/structs/large-records.rs
+++ b/tests/ui/structs/large-records.rs
diff --git a/src/test/ui/structs/multi-line-fru-suggestion.rs b/tests/ui/structs/multi-line-fru-suggestion.rs
index 7b2b13914..7b2b13914 100644
--- a/src/test/ui/structs/multi-line-fru-suggestion.rs
+++ b/tests/ui/structs/multi-line-fru-suggestion.rs
diff --git a/src/test/ui/structs/multi-line-fru-suggestion.stderr b/tests/ui/structs/multi-line-fru-suggestion.stderr
index 8bbd3ace7..8bbd3ace7 100644
--- a/src/test/ui/structs/multi-line-fru-suggestion.stderr
+++ b/tests/ui/structs/multi-line-fru-suggestion.stderr
diff --git a/src/test/ui/structs/rhs-type.rs b/tests/ui/structs/rhs-type.rs
index c48e7c08e..c48e7c08e 100644
--- a/src/test/ui/structs/rhs-type.rs
+++ b/tests/ui/structs/rhs-type.rs
diff --git a/src/test/ui/structs/struct-base-wrong-type.rs b/tests/ui/structs/struct-base-wrong-type.rs
index b64c6b499..b64c6b499 100644
--- a/src/test/ui/structs/struct-base-wrong-type.rs
+++ b/tests/ui/structs/struct-base-wrong-type.rs
diff --git a/src/test/ui/structs/struct-base-wrong-type.stderr b/tests/ui/structs/struct-base-wrong-type.stderr
index b039ce2cc..b039ce2cc 100644
--- a/src/test/ui/structs/struct-base-wrong-type.stderr
+++ b/tests/ui/structs/struct-base-wrong-type.stderr
diff --git a/src/test/ui/structs/struct-duplicate-comma.fixed b/tests/ui/structs/struct-duplicate-comma.fixed
index c804cf57a..c804cf57a 100644
--- a/src/test/ui/structs/struct-duplicate-comma.fixed
+++ b/tests/ui/structs/struct-duplicate-comma.fixed
diff --git a/src/test/ui/structs/struct-duplicate-comma.rs b/tests/ui/structs/struct-duplicate-comma.rs
index db2e7cb3d..db2e7cb3d 100644
--- a/src/test/ui/structs/struct-duplicate-comma.rs
+++ b/tests/ui/structs/struct-duplicate-comma.rs
diff --git a/src/test/ui/structs/struct-duplicate-comma.stderr b/tests/ui/structs/struct-duplicate-comma.stderr
index 834b3c5c1..834b3c5c1 100644
--- a/src/test/ui/structs/struct-duplicate-comma.stderr
+++ b/tests/ui/structs/struct-duplicate-comma.stderr
diff --git a/src/test/ui/structs/struct-field-cfg.rs b/tests/ui/structs/struct-field-cfg.rs
index 42cab8ab9..42cab8ab9 100644
--- a/src/test/ui/structs/struct-field-cfg.rs
+++ b/tests/ui/structs/struct-field-cfg.rs
diff --git a/src/test/ui/structs/struct-field-cfg.stderr b/tests/ui/structs/struct-field-cfg.stderr
index 5ec47c093..5ec47c093 100644
--- a/src/test/ui/structs/struct-field-cfg.stderr
+++ b/tests/ui/structs/struct-field-cfg.stderr
diff --git a/src/test/ui/structs/struct-field-init-syntax.rs b/tests/ui/structs/struct-field-init-syntax.rs
index 161f7e93a..161f7e93a 100644
--- a/src/test/ui/structs/struct-field-init-syntax.rs
+++ b/tests/ui/structs/struct-field-init-syntax.rs
diff --git a/src/test/ui/structs/struct-field-init-syntax.stderr b/tests/ui/structs/struct-field-init-syntax.stderr
index 0b72c5cf7..0b72c5cf7 100644
--- a/src/test/ui/structs/struct-field-init-syntax.stderr
+++ b/tests/ui/structs/struct-field-init-syntax.stderr
diff --git a/src/test/ui/structs/struct-field-privacy.rs b/tests/ui/structs/struct-field-privacy.rs
index 898ca475c..898ca475c 100644
--- a/src/test/ui/structs/struct-field-privacy.rs
+++ b/tests/ui/structs/struct-field-privacy.rs
diff --git a/src/test/ui/structs/struct-field-privacy.stderr b/tests/ui/structs/struct-field-privacy.stderr
index ee83e0d6c..ee83e0d6c 100644
--- a/src/test/ui/structs/struct-field-privacy.stderr
+++ b/tests/ui/structs/struct-field-privacy.stderr
diff --git a/src/test/ui/structs/struct-fields-decl-dupe.rs b/tests/ui/structs/struct-fields-decl-dupe.rs
index 6ddf3d976..6ddf3d976 100644
--- a/src/test/ui/structs/struct-fields-decl-dupe.rs
+++ b/tests/ui/structs/struct-fields-decl-dupe.rs
diff --git a/src/test/ui/structs/struct-fields-decl-dupe.stderr b/tests/ui/structs/struct-fields-decl-dupe.stderr
index d7ce9bb89..d7ce9bb89 100644
--- a/src/test/ui/structs/struct-fields-decl-dupe.stderr
+++ b/tests/ui/structs/struct-fields-decl-dupe.stderr
diff --git a/src/test/ui/structs/struct-fields-dupe.rs b/tests/ui/structs/struct-fields-dupe.rs
index 2fa25a335..2fa25a335 100644
--- a/src/test/ui/structs/struct-fields-dupe.rs
+++ b/tests/ui/structs/struct-fields-dupe.rs
diff --git a/src/test/ui/structs/struct-fields-dupe.stderr b/tests/ui/structs/struct-fields-dupe.stderr
index aaf2533dc..aaf2533dc 100644
--- a/src/test/ui/structs/struct-fields-dupe.stderr
+++ b/tests/ui/structs/struct-fields-dupe.stderr
diff --git a/src/test/ui/structs/struct-fields-hints-no-dupe.rs b/tests/ui/structs/struct-fields-hints-no-dupe.rs
index 987cf726f..987cf726f 100644
--- a/src/test/ui/structs/struct-fields-hints-no-dupe.rs
+++ b/tests/ui/structs/struct-fields-hints-no-dupe.rs
diff --git a/src/test/ui/structs/struct-fields-hints-no-dupe.stderr b/tests/ui/structs/struct-fields-hints-no-dupe.stderr
index 1a88f2693..1a88f2693 100644
--- a/src/test/ui/structs/struct-fields-hints-no-dupe.stderr
+++ b/tests/ui/structs/struct-fields-hints-no-dupe.stderr
diff --git a/src/test/ui/structs/struct-fields-hints.rs b/tests/ui/structs/struct-fields-hints.rs
index 08df0930e..08df0930e 100644
--- a/src/test/ui/structs/struct-fields-hints.rs
+++ b/tests/ui/structs/struct-fields-hints.rs
diff --git a/src/test/ui/structs/struct-fields-hints.stderr b/tests/ui/structs/struct-fields-hints.stderr
index 3b8a2b5c7..3b8a2b5c7 100644
--- a/src/test/ui/structs/struct-fields-hints.stderr
+++ b/tests/ui/structs/struct-fields-hints.stderr
diff --git a/src/test/ui/structs/struct-fields-missing.rs b/tests/ui/structs/struct-fields-missing.rs
index 0c7919d02..0c7919d02 100644
--- a/src/test/ui/structs/struct-fields-missing.rs
+++ b/tests/ui/structs/struct-fields-missing.rs
diff --git a/src/test/ui/structs/struct-fields-missing.stderr b/tests/ui/structs/struct-fields-missing.stderr
index b3e42a948..b3e42a948 100644
--- a/src/test/ui/structs/struct-fields-missing.stderr
+++ b/tests/ui/structs/struct-fields-missing.stderr
diff --git a/src/test/ui/structs/struct-fields-shorthand-unresolved.rs b/tests/ui/structs/struct-fields-shorthand-unresolved.rs
index caad14916..caad14916 100644
--- a/src/test/ui/structs/struct-fields-shorthand-unresolved.rs
+++ b/tests/ui/structs/struct-fields-shorthand-unresolved.rs
diff --git a/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr b/tests/ui/structs/struct-fields-shorthand-unresolved.stderr
index 09fc4f7ee..09fc4f7ee 100644
--- a/src/test/ui/structs/struct-fields-shorthand-unresolved.stderr
+++ b/tests/ui/structs/struct-fields-shorthand-unresolved.stderr
diff --git a/src/test/ui/structs/struct-fields-shorthand.rs b/tests/ui/structs/struct-fields-shorthand.rs
index 1bdcc8315..1bdcc8315 100644
--- a/src/test/ui/structs/struct-fields-shorthand.rs
+++ b/tests/ui/structs/struct-fields-shorthand.rs
diff --git a/src/test/ui/structs/struct-fields-shorthand.stderr b/tests/ui/structs/struct-fields-shorthand.stderr
index a285a3921..a285a3921 100644
--- a/src/test/ui/structs/struct-fields-shorthand.stderr
+++ b/tests/ui/structs/struct-fields-shorthand.stderr
diff --git a/src/test/ui/structs/struct-fields-too-many.rs b/tests/ui/structs/struct-fields-too-many.rs
index 8be8dcbf1..8be8dcbf1 100644
--- a/src/test/ui/structs/struct-fields-too-many.rs
+++ b/tests/ui/structs/struct-fields-too-many.rs
diff --git a/src/test/ui/structs/struct-fields-too-many.stderr b/tests/ui/structs/struct-fields-too-many.stderr
index a1b7a7a31..a1b7a7a31 100644
--- a/src/test/ui/structs/struct-fields-too-many.stderr
+++ b/tests/ui/structs/struct-fields-too-many.stderr
diff --git a/src/test/ui/structs/struct-fields-typo.rs b/tests/ui/structs/struct-fields-typo.rs
index 0e9b2ae51..0e9b2ae51 100644
--- a/src/test/ui/structs/struct-fields-typo.rs
+++ b/tests/ui/structs/struct-fields-typo.rs
diff --git a/src/test/ui/structs/struct-fields-typo.stderr b/tests/ui/structs/struct-fields-typo.stderr
index 6949a0a4a..6949a0a4a 100644
--- a/src/test/ui/structs/struct-fields-typo.stderr
+++ b/tests/ui/structs/struct-fields-typo.stderr
diff --git a/src/test/ui/structs/struct-fn-in-definition.rs b/tests/ui/structs/struct-fn-in-definition.rs
index 7f48f55fe..7f48f55fe 100644
--- a/src/test/ui/structs/struct-fn-in-definition.rs
+++ b/tests/ui/structs/struct-fn-in-definition.rs
diff --git a/src/test/ui/structs/struct-fn-in-definition.stderr b/tests/ui/structs/struct-fn-in-definition.stderr
index 439c86ec2..439c86ec2 100644
--- a/src/test/ui/structs/struct-fn-in-definition.stderr
+++ b/tests/ui/structs/struct-fn-in-definition.stderr
diff --git a/src/test/ui/structs/struct-missing-comma.fixed b/tests/ui/structs/struct-missing-comma.fixed
index a28179ba2..a28179ba2 100644
--- a/src/test/ui/structs/struct-missing-comma.fixed
+++ b/tests/ui/structs/struct-missing-comma.fixed
diff --git a/src/test/ui/structs/struct-missing-comma.rs b/tests/ui/structs/struct-missing-comma.rs
index b6d6c9b8f..b6d6c9b8f 100644
--- a/src/test/ui/structs/struct-missing-comma.rs
+++ b/tests/ui/structs/struct-missing-comma.rs
diff --git a/src/test/ui/structs/struct-missing-comma.stderr b/tests/ui/structs/struct-missing-comma.stderr
index eceec65e7..eceec65e7 100644
--- a/src/test/ui/structs/struct-missing-comma.stderr
+++ b/tests/ui/structs/struct-missing-comma.stderr
diff --git a/src/test/ui/structs/struct-pat-derived-error.rs b/tests/ui/structs/struct-pat-derived-error.rs
index f49a8ff8b..f49a8ff8b 100644
--- a/src/test/ui/structs/struct-pat-derived-error.rs
+++ b/tests/ui/structs/struct-pat-derived-error.rs
diff --git a/src/test/ui/structs/struct-pat-derived-error.stderr b/tests/ui/structs/struct-pat-derived-error.stderr
index a91e47657..a91e47657 100644
--- a/src/test/ui/structs/struct-pat-derived-error.stderr
+++ b/tests/ui/structs/struct-pat-derived-error.stderr
diff --git a/src/test/ui/structs/struct-path-alias-bounds.rs b/tests/ui/structs/struct-path-alias-bounds.rs
index 1e2c4b836..1e2c4b836 100644
--- a/src/test/ui/structs/struct-path-alias-bounds.rs
+++ b/tests/ui/structs/struct-path-alias-bounds.rs
diff --git a/src/test/ui/structs/struct-path-alias-bounds.stderr b/tests/ui/structs/struct-path-alias-bounds.stderr
index 266291f62..266291f62 100644
--- a/src/test/ui/structs/struct-path-alias-bounds.stderr
+++ b/tests/ui/structs/struct-path-alias-bounds.stderr
diff --git a/src/test/ui/structs/struct-path-associated-type.rs b/tests/ui/structs/struct-path-associated-type.rs
index 2dd7174a9..2dd7174a9 100644
--- a/src/test/ui/structs/struct-path-associated-type.rs
+++ b/tests/ui/structs/struct-path-associated-type.rs
diff --git a/src/test/ui/structs/struct-path-associated-type.stderr b/tests/ui/structs/struct-path-associated-type.stderr
index abb445214..ca5f0b7e2 100644
--- a/src/test/ui/structs/struct-path-associated-type.stderr
+++ b/tests/ui/structs/struct-path-associated-type.stderr
@@ -48,19 +48,19 @@ error[E0223]: ambiguous associated type
   --> $DIR/struct-path-associated-type.rs:32:13
    |
 LL |     let s = S::A {};
-   |             ^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
+   |             ^^^^ help: use the fully-qualified path: `<S as Tr>::A`
 
 error[E0223]: ambiguous associated type
   --> $DIR/struct-path-associated-type.rs:33:13
    |
 LL |     let z = S::A::<u8> {};
-   |             ^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
+   |             ^^^^ help: use the fully-qualified path: `<S as Tr>::A`
 
 error[E0223]: ambiguous associated type
   --> $DIR/struct-path-associated-type.rs:35:9
    |
 LL |         S::A {} => {}
-   |         ^^^^ help: use fully-qualified syntax: `<S as Trait>::A`
+   |         ^^^^ help: use the fully-qualified path: `<S as Tr>::A`
 
 error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/structs/struct-path-self-type-mismatch.rs b/tests/ui/structs/struct-path-self-type-mismatch.rs
index c0c557eca..c0c557eca 100644
--- a/src/test/ui/structs/struct-path-self-type-mismatch.rs
+++ b/tests/ui/structs/struct-path-self-type-mismatch.rs
diff --git a/src/test/ui/structs/struct-path-self-type-mismatch.stderr b/tests/ui/structs/struct-path-self-type-mismatch.stderr
index b55a2cbf7..b55a2cbf7 100644
--- a/src/test/ui/structs/struct-path-self-type-mismatch.stderr
+++ b/tests/ui/structs/struct-path-self-type-mismatch.stderr
diff --git a/src/test/ui/structs/struct-path-self.rs b/tests/ui/structs/struct-path-self.rs
index 6e529c7ed..6e529c7ed 100644
--- a/src/test/ui/structs/struct-path-self.rs
+++ b/tests/ui/structs/struct-path-self.rs
diff --git a/src/test/ui/structs/struct-path-self.stderr b/tests/ui/structs/struct-path-self.stderr
index c2a8623f9..c2a8623f9 100644
--- a/src/test/ui/structs/struct-path-self.stderr
+++ b/tests/ui/structs/struct-path-self.stderr
diff --git a/src/test/ui/structs/struct-record-suggestion.fixed b/tests/ui/structs/struct-record-suggestion.fixed
index d93a62185..d93a62185 100644
--- a/src/test/ui/structs/struct-record-suggestion.fixed
+++ b/tests/ui/structs/struct-record-suggestion.fixed
diff --git a/src/test/ui/structs/struct-record-suggestion.rs b/tests/ui/structs/struct-record-suggestion.rs
index f0fd1c94e..f0fd1c94e 100644
--- a/src/test/ui/structs/struct-record-suggestion.rs
+++ b/tests/ui/structs/struct-record-suggestion.rs
diff --git a/src/test/ui/structs/struct-record-suggestion.stderr b/tests/ui/structs/struct-record-suggestion.stderr
index f4fd655e6..9b751d1b6 100644
--- a/src/test/ui/structs/struct-record-suggestion.stderr
+++ b/tests/ui/structs/struct-record-suggestion.stderr
@@ -18,7 +18,7 @@ error[E0308]: mismatched types
   --> $DIR/struct-record-suggestion.rs:23:20
    |
 LL |     let q = B { b: 1..Default::default() };
-   |                    ^^^^^^^^^^^^^^^^^^^^^ expected `u32`, found struct `std::ops::Range`
+   |                    ^^^^^^^^^^^^^^^^^^^^^ expected `u32`, found struct `Range`
    |
    = note: expected type `u32`
             found struct `std::ops::Range<{integer}>`
diff --git a/src/test/ui/structs/struct-tuple-field-names.rs b/tests/ui/structs/struct-tuple-field-names.rs
index 7bd54af1d..7bd54af1d 100644
--- a/src/test/ui/structs/struct-tuple-field-names.rs
+++ b/tests/ui/structs/struct-tuple-field-names.rs
diff --git a/src/test/ui/structs/struct-tuple-field-names.stderr b/tests/ui/structs/struct-tuple-field-names.stderr
index 5494c29a6..5494c29a6 100644
--- a/src/test/ui/structs/struct-tuple-field-names.stderr
+++ b/tests/ui/structs/struct-tuple-field-names.stderr
diff --git a/src/test/ui/structs/struct-variant-privacy-xc.rs b/tests/ui/structs/struct-variant-privacy-xc.rs
index 763ab9527..763ab9527 100644
--- a/src/test/ui/structs/struct-variant-privacy-xc.rs
+++ b/tests/ui/structs/struct-variant-privacy-xc.rs
diff --git a/src/test/ui/structs/struct-variant-privacy-xc.stderr b/tests/ui/structs/struct-variant-privacy-xc.stderr
index 1c1caaef8..1c1caaef8 100644
--- a/src/test/ui/structs/struct-variant-privacy-xc.stderr
+++ b/tests/ui/structs/struct-variant-privacy-xc.stderr
diff --git a/src/test/ui/structs/struct-variant-privacy.rs b/tests/ui/structs/struct-variant-privacy.rs
index fcdf9a22b..fcdf9a22b 100644
--- a/src/test/ui/structs/struct-variant-privacy.rs
+++ b/tests/ui/structs/struct-variant-privacy.rs
diff --git a/src/test/ui/structs/struct-variant-privacy.stderr b/tests/ui/structs/struct-variant-privacy.stderr
index eafd26c71..eafd26c71 100644
--- a/src/test/ui/structs/struct-variant-privacy.stderr
+++ b/tests/ui/structs/struct-variant-privacy.stderr
diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.rs b/tests/ui/structs/structure-constructor-type-mismatch.rs
index a03ef590c..a03ef590c 100644
--- a/src/test/ui/structs/structure-constructor-type-mismatch.rs
+++ b/tests/ui/structs/structure-constructor-type-mismatch.rs
diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.stderr b/tests/ui/structs/structure-constructor-type-mismatch.stderr
index 3d64fc601..3d64fc601 100644
--- a/src/test/ui/structs/structure-constructor-type-mismatch.stderr
+++ b/tests/ui/structs/structure-constructor-type-mismatch.stderr
diff --git a/src/test/ui/structs/suggest-private-fields.rs b/tests/ui/structs/suggest-private-fields.rs
index 8267a82fe..8267a82fe 100644
--- a/src/test/ui/structs/suggest-private-fields.rs
+++ b/tests/ui/structs/suggest-private-fields.rs
diff --git a/src/test/ui/structs/suggest-private-fields.stderr b/tests/ui/structs/suggest-private-fields.stderr
index d628bd162..d628bd162 100644
--- a/src/test/ui/structs/suggest-private-fields.stderr
+++ b/tests/ui/structs/suggest-private-fields.stderr
diff --git a/src/test/ui/structs/suggest-replacing-field-when-specifying-same-type.rs b/tests/ui/structs/suggest-replacing-field-when-specifying-same-type.rs
index dd2fe7973..dd2fe7973 100644
--- a/src/test/ui/structs/suggest-replacing-field-when-specifying-same-type.rs
+++ b/tests/ui/structs/suggest-replacing-field-when-specifying-same-type.rs
diff --git a/src/test/ui/structs/suggest-replacing-field-when-specifying-same-type.stderr b/tests/ui/structs/suggest-replacing-field-when-specifying-same-type.stderr
index e8503f540..e8503f540 100644
--- a/src/test/ui/structs/suggest-replacing-field-when-specifying-same-type.stderr
+++ b/tests/ui/structs/suggest-replacing-field-when-specifying-same-type.stderr
diff --git a/src/test/ui/structs/unresolved-struct-with-fru.rs b/tests/ui/structs/unresolved-struct-with-fru.rs
index c9fdca457..c9fdca457 100644
--- a/src/test/ui/structs/unresolved-struct-with-fru.rs
+++ b/tests/ui/structs/unresolved-struct-with-fru.rs
diff --git a/src/test/ui/structs/unresolved-struct-with-fru.stderr b/tests/ui/structs/unresolved-struct-with-fru.stderr
index a5796a222..a5796a222 100644
--- a/src/test/ui/structs/unresolved-struct-with-fru.stderr
+++ b/tests/ui/structs/unresolved-struct-with-fru.stderr