Merging upstream version 1.68.2+dfsg1.

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

99 files changed, 48 insertions, 0 deletions

diff --git a/src/test/ui/attributes/attr-before-view-item.rs b/tests/ui/attributes/attr-before-view-item.rs
index e1588aada..e1588aada 100644
--- a/src/test/ui/attributes/attr-before-view-item.rs
+++ b/tests/ui/attributes/attr-before-view-item.rs
diff --git a/src/test/ui/attributes/attr-before-view-item2.rs b/tests/ui/attributes/attr-before-view-item2.rs
index c1f667372..c1f667372 100644
--- a/src/test/ui/attributes/attr-before-view-item2.rs
+++ b/tests/ui/attributes/attr-before-view-item2.rs
diff --git a/src/test/ui/attributes/attr-eq-token-tree.rs b/tests/ui/attributes/attr-eq-token-tree.rs
index 330b11977..330b11977 100644
--- a/src/test/ui/attributes/attr-eq-token-tree.rs
+++ b/tests/ui/attributes/attr-eq-token-tree.rs
diff --git a/src/test/ui/attributes/attr-eq-token-tree.stderr b/tests/ui/attributes/attr-eq-token-tree.stderr
index 1846444b6..1846444b6 100644
--- a/src/test/ui/attributes/attr-eq-token-tree.stderr
+++ b/tests/ui/attributes/attr-eq-token-tree.stderr
diff --git a/src/test/ui/attributes/attr-mix-new.rs b/tests/ui/attributes/attr-mix-new.rs
index 8119df0c4..8119df0c4 100644
--- a/src/test/ui/attributes/attr-mix-new.rs
+++ b/tests/ui/attributes/attr-mix-new.rs
diff --git a/src/test/ui/attributes/attrs-on-params.rs b/tests/ui/attributes/attrs-on-params.rs
index 158a4500b..158a4500b 100644
--- a/src/test/ui/attributes/attrs-on-params.rs
+++ b/tests/ui/attributes/attrs-on-params.rs
diff --git a/src/test/ui/attributes/attrs-on-params.stderr b/tests/ui/attributes/attrs-on-params.stderr
index 306e862cb..306e862cb 100644
--- a/src/test/ui/attributes/attrs-on-params.stderr
+++ b/tests/ui/attributes/attrs-on-params.stderr
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-1.rs b/tests/ui/attributes/attrs-with-no-formal-in-generics-1.rs
index df9c8d894..df9c8d894 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-1.rs
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-1.rs
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-1.stderr b/tests/ui/attributes/attrs-with-no-formal-in-generics-1.stderr
index 5b4f5222a..5b4f5222a 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-1.stderr
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-1.stderr
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-2.rs b/tests/ui/attributes/attrs-with-no-formal-in-generics-2.rs
index d1d044035..d1d044035 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-2.rs
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-2.rs
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-2.stderr b/tests/ui/attributes/attrs-with-no-formal-in-generics-2.stderr
index fce3ff7de..fce3ff7de 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-2.stderr
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-2.stderr
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-3.rs b/tests/ui/attributes/attrs-with-no-formal-in-generics-3.rs
index 3cfc70b41..3cfc70b41 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-3.rs
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-3.rs
diff --git a/src/test/ui/attributes/attrs-with-no-formal-in-generics-3.stderr b/tests/ui/attributes/attrs-with-no-formal-in-generics-3.stderr
index b9ca00974..b9ca00974 100644
--- a/src/test/ui/attributes/attrs-with-no-formal-in-generics-3.stderr
+++ b/tests/ui/attributes/attrs-with-no-formal-in-generics-3.stderr
diff --git a/src/test/ui/attributes/auxiliary/key-value-expansion.rs b/tests/ui/attributes/auxiliary/key-value-expansion.rs
index b4eb80bb5..b4eb80bb5 100644
--- a/src/test/ui/attributes/auxiliary/key-value-expansion.rs
+++ b/tests/ui/attributes/auxiliary/key-value-expansion.rs
diff --git a/src/test/ui/attributes/class-attributes-1.rs b/tests/ui/attributes/class-attributes-1.rs
index 027b701e5..027b701e5 100644
--- a/src/test/ui/attributes/class-attributes-1.rs
+++ b/tests/ui/attributes/class-attributes-1.rs
diff --git a/src/test/ui/attributes/class-attributes-2.rs b/tests/ui/attributes/class-attributes-2.rs
index 6aba6b894..6aba6b894 100644
--- a/src/test/ui/attributes/class-attributes-2.rs
+++ b/tests/ui/attributes/class-attributes-2.rs
diff --git a/src/test/ui/attributes/collapse-debuginfo-invalid.rs b/tests/ui/attributes/collapse-debuginfo-invalid.rs
index 42d8982c1..42d8982c1 100644
--- a/src/test/ui/attributes/collapse-debuginfo-invalid.rs
+++ b/tests/ui/attributes/collapse-debuginfo-invalid.rs
diff --git a/src/test/ui/attributes/collapse-debuginfo-invalid.stderr b/tests/ui/attributes/collapse-debuginfo-invalid.stderr
index 01c476091..01c476091 100644
--- a/src/test/ui/attributes/collapse-debuginfo-invalid.stderr
+++ b/tests/ui/attributes/collapse-debuginfo-invalid.stderr
diff --git a/src/test/ui/attributes/const-stability-on-macro.rs b/tests/ui/attributes/const-stability-on-macro.rs
index 412af195d..412af195d 100644
--- a/src/test/ui/attributes/const-stability-on-macro.rs
+++ b/tests/ui/attributes/const-stability-on-macro.rs
diff --git a/src/test/ui/attributes/const-stability-on-macro.stderr b/tests/ui/attributes/const-stability-on-macro.stderr
index c3da02c79..c3da02c79 100644
--- a/src/test/ui/attributes/const-stability-on-macro.stderr
+++ b/tests/ui/attributes/const-stability-on-macro.stderr
diff --git a/src/test/ui/attributes/doc-attr.rs b/tests/ui/attributes/doc-attr.rs
index 980d1c0e2..980d1c0e2 100644
--- a/src/test/ui/attributes/doc-attr.rs
+++ b/tests/ui/attributes/doc-attr.rs
diff --git a/src/test/ui/attributes/doc-attr.stderr b/tests/ui/attributes/doc-attr.stderr
index 68df2771f..68df2771f 100644
--- a/src/test/ui/attributes/doc-attr.stderr
+++ b/tests/ui/attributes/doc-attr.stderr
diff --git a/src/test/ui/attributes/duplicated-attributes.rs b/tests/ui/attributes/duplicated-attributes.rs
index 84a5abcf8..84a5abcf8 100644
--- a/src/test/ui/attributes/duplicated-attributes.rs
+++ b/tests/ui/attributes/duplicated-attributes.rs
diff --git a/src/test/ui/attributes/duplicated-attributes.stderr b/tests/ui/attributes/duplicated-attributes.stderr
index 735d950b2..735d950b2 100644
--- a/src/test/ui/attributes/duplicated-attributes.stderr
+++ b/tests/ui/attributes/duplicated-attributes.stderr
diff --git a/src/test/ui/attributes/extented-attribute-macro-error.rs b/tests/ui/attributes/extented-attribute-macro-error.rs
index 492f84f56..492f84f56 100644
--- a/src/test/ui/attributes/extented-attribute-macro-error.rs
+++ b/tests/ui/attributes/extented-attribute-macro-error.rs
diff --git a/src/test/ui/attributes/extented-attribute-macro-error.stderr b/tests/ui/attributes/extented-attribute-macro-error.stderr
index 0fcde9b7c..0fcde9b7c 100644
--- a/src/test/ui/attributes/extented-attribute-macro-error.stderr
+++ b/tests/ui/attributes/extented-attribute-macro-error.stderr
diff --git a/src/test/ui/attributes/field-attributes-vis-unresolved.rs b/tests/ui/attributes/field-attributes-vis-unresolved.rs
index d1bd2a1e7..d1bd2a1e7 100644
--- a/src/test/ui/attributes/field-attributes-vis-unresolved.rs
+++ b/tests/ui/attributes/field-attributes-vis-unresolved.rs
diff --git a/src/test/ui/attributes/field-attributes-vis-unresolved.stderr b/tests/ui/attributes/field-attributes-vis-unresolved.stderr
index 439762546..439762546 100644
--- a/src/test/ui/attributes/field-attributes-vis-unresolved.stderr
+++ b/tests/ui/attributes/field-attributes-vis-unresolved.stderr
diff --git a/src/test/ui/attributes/invalid-doc-attr.rs b/tests/ui/attributes/invalid-doc-attr.rs
index de004b41e..de004b41e 100644
--- a/src/test/ui/attributes/invalid-doc-attr.rs
+++ b/tests/ui/attributes/invalid-doc-attr.rs
diff --git a/src/test/ui/attributes/invalid-doc-attr.stderr b/tests/ui/attributes/invalid-doc-attr.stderr
index 3c66e587b..3c66e587b 100644
--- a/src/test/ui/attributes/invalid-doc-attr.stderr
+++ b/tests/ui/attributes/invalid-doc-attr.stderr
diff --git a/src/test/ui/attributes/issue-100631.rs b/tests/ui/attributes/issue-100631.rs
index 0fefcf83f..0fefcf83f 100644
--- a/src/test/ui/attributes/issue-100631.rs
+++ b/tests/ui/attributes/issue-100631.rs
diff --git a/src/test/ui/attributes/issue-100631.stderr b/tests/ui/attributes/issue-100631.stderr
index caa5351dd..caa5351dd 100644
--- a/src/test/ui/attributes/issue-100631.stderr
+++ b/tests/ui/attributes/issue-100631.stderr
diff --git a/tests/ui/attributes/issue-105594-invalid-attr-validation.rs b/tests/ui/attributes/issue-105594-invalid-attr-validation.rs
new file mode 100644
index 000000000..6c68e6b04
--- /dev/null
+++ b/tests/ui/attributes/issue-105594-invalid-attr-validation.rs
@@ -0,0 +1,13 @@
+// This checks that the attribute validation ICE in issue #105594 doesn't
+// recur.
+//
+// ignore-thumbv8m.base
+#![feature(cmse_nonsecure_entry)]
+
+fn main() {}
+
+#[track_caller] //~ ERROR attribute should be applied to a function
+static _A: () = ();
+
+#[cmse_nonsecure_entry] //~ ERROR attribute should be applied to a function
+static _B: () = (); //~| ERROR #[cmse_nonsecure_entry]` is only valid for targets
diff --git a/tests/ui/attributes/issue-105594-invalid-attr-validation.stderr b/tests/ui/attributes/issue-105594-invalid-attr-validation.stderr
new file mode 100644
index 000000000..c6b2d6e78
--- /dev/null
+++ b/tests/ui/attributes/issue-105594-invalid-attr-validation.stderr
@@ -0,0 +1,26 @@
+error[E0739]: attribute should be applied to a function definition
+  --> $DIR/issue-105594-invalid-attr-validation.rs:9:1
+   |
+LL | #[track_caller]
+   | ^^^^^^^^^^^^^^^
+LL | static _A: () = ();
+   | ------------------- not a function definition
+
+error: attribute should be applied to a function definition
+  --> $DIR/issue-105594-invalid-attr-validation.rs:12:1
+   |
+LL | #[cmse_nonsecure_entry]
+   | ^^^^^^^^^^^^^^^^^^^^^^^
+LL | static _B: () = ();
+   | ------------------- not a function definition
+
+error[E0775]: `#[cmse_nonsecure_entry]` is only valid for targets with the TrustZone-M extension
+  --> $DIR/issue-105594-invalid-attr-validation.rs:12:1
+   |
+LL | #[cmse_nonsecure_entry]
+   | ^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0739, E0775.
+For more information about an error, try `rustc --explain E0739`.
diff --git a/src/test/ui/attributes/issue-40962.rs b/tests/ui/attributes/issue-40962.rs
index 7b91c0681..7b91c0681 100644
--- a/src/test/ui/attributes/issue-40962.rs
+++ b/tests/ui/attributes/issue-40962.rs
diff --git a/src/test/ui/attributes/issue-90873.rs b/tests/ui/attributes/issue-90873.rs
index 1411f6174..1411f6174 100644
--- a/src/test/ui/attributes/issue-90873.rs
+++ b/tests/ui/attributes/issue-90873.rs
diff --git a/src/test/ui/attributes/issue-90873.stderr b/tests/ui/attributes/issue-90873.stderr
index 894ec8341..894ec8341 100644
--- a/src/test/ui/attributes/issue-90873.stderr
+++ b/tests/ui/attributes/issue-90873.stderr
diff --git a/src/test/ui/attributes/item-attributes.rs b/tests/ui/attributes/item-attributes.rs
index c6bf6c656..c6bf6c656 100644
--- a/src/test/ui/attributes/item-attributes.rs
+++ b/tests/ui/attributes/item-attributes.rs
diff --git a/src/test/ui/attributes/key-value-expansion-on-mac.rs b/tests/ui/attributes/key-value-expansion-on-mac.rs
index c1d68d8cd..c1d68d8cd 100644
--- a/src/test/ui/attributes/key-value-expansion-on-mac.rs
+++ b/tests/ui/attributes/key-value-expansion-on-mac.rs
diff --git a/src/test/ui/attributes/key-value-expansion-on-mac.stderr b/tests/ui/attributes/key-value-expansion-on-mac.stderr
index 64ab892d9..64ab892d9 100644
--- a/src/test/ui/attributes/key-value-expansion-on-mac.stderr
+++ b/tests/ui/attributes/key-value-expansion-on-mac.stderr
diff --git a/src/test/ui/attributes/key-value-expansion.rs b/tests/ui/attributes/key-value-expansion.rs
index 83d601e5e..83d601e5e 100644
--- a/src/test/ui/attributes/key-value-expansion.rs
+++ b/tests/ui/attributes/key-value-expansion.rs
diff --git a/src/test/ui/attributes/key-value-expansion.stderr b/tests/ui/attributes/key-value-expansion.stderr
index 1b776322a..1b776322a 100644
--- a/src/test/ui/attributes/key-value-expansion.stderr
+++ b/tests/ui/attributes/key-value-expansion.stderr
diff --git a/src/test/ui/attributes/key-value-non-ascii.rs b/tests/ui/attributes/key-value-non-ascii.rs
index e14e2fc05..e14e2fc05 100644
--- a/src/test/ui/attributes/key-value-non-ascii.rs
+++ b/tests/ui/attributes/key-value-non-ascii.rs
diff --git a/src/test/ui/attributes/key-value-non-ascii.stderr b/tests/ui/attributes/key-value-non-ascii.stderr
index 23d482de6..23d482de6 100644
--- a/src/test/ui/attributes/key-value-non-ascii.stderr
+++ b/tests/ui/attributes/key-value-non-ascii.stderr
diff --git a/tests/ui/attributes/log-backtrace.rs b/tests/ui/attributes/log-backtrace.rs
new file mode 100644
index 000000000..3979d2001
--- /dev/null
+++ b/tests/ui/attributes/log-backtrace.rs
@@ -0,0 +1,9 @@
+// run-pass
+//
+// This test makes sure that log-backtrace option doesn't give a compilation error.
+//
+// dont-check-compiler-stdout
+// dont-check-compiler-stderr
+// rustc-env:RUSTC_LOG=info
+// compile-flags: -Zlog-backtrace=rustc_metadata::creader
+fn main() {}
diff --git a/src/test/ui/attributes/main-removed-1.rs b/tests/ui/attributes/main-removed-1.rs
index 0e887469d..0e887469d 100644
--- a/src/test/ui/attributes/main-removed-1.rs
+++ b/tests/ui/attributes/main-removed-1.rs
diff --git a/src/test/ui/attributes/main-removed-1.stderr b/tests/ui/attributes/main-removed-1.stderr
index 2422c5c3b..2422c5c3b 100644
--- a/src/test/ui/attributes/main-removed-1.stderr
+++ b/tests/ui/attributes/main-removed-1.stderr
diff --git a/src/test/ui/attributes/main-removed-2/auxiliary/tokyo.rs b/tests/ui/attributes/main-removed-2/auxiliary/tokyo.rs
index 196b5be2d..196b5be2d 100644
--- a/src/test/ui/attributes/main-removed-2/auxiliary/tokyo.rs
+++ b/tests/ui/attributes/main-removed-2/auxiliary/tokyo.rs
diff --git a/src/test/ui/attributes/main-removed-2/main.rs b/tests/ui/attributes/main-removed-2/main.rs
index e8fecf825..e8fecf825 100644
--- a/src/test/ui/attributes/main-removed-2/main.rs
+++ b/tests/ui/attributes/main-removed-2/main.rs
diff --git a/src/test/ui/attributes/method-attributes.rs b/tests/ui/attributes/method-attributes.rs
index 67439718b..67439718b 100644
--- a/src/test/ui/attributes/method-attributes.rs
+++ b/tests/ui/attributes/method-attributes.rs
diff --git a/src/test/ui/attributes/multiple-invalid.rs b/tests/ui/attributes/multiple-invalid.rs
index ae044eb84..ae044eb84 100644
--- a/src/test/ui/attributes/multiple-invalid.rs
+++ b/tests/ui/attributes/multiple-invalid.rs
diff --git a/src/test/ui/attributes/multiple-invalid.stderr b/tests/ui/attributes/multiple-invalid.stderr
index a8dba0ba3..a8dba0ba3 100644
--- a/src/test/ui/attributes/multiple-invalid.stderr
+++ b/tests/ui/attributes/multiple-invalid.stderr
diff --git a/src/test/ui/attributes/nonterminal-expansion.rs b/tests/ui/attributes/nonterminal-expansion.rs
index 97bf225f0..97bf225f0 100644
--- a/src/test/ui/attributes/nonterminal-expansion.rs
+++ b/tests/ui/attributes/nonterminal-expansion.rs
diff --git a/src/test/ui/attributes/nonterminal-expansion.stderr b/tests/ui/attributes/nonterminal-expansion.stderr
index 52376ac19..52376ac19 100644
--- a/src/test/ui/attributes/nonterminal-expansion.stderr
+++ b/tests/ui/attributes/nonterminal-expansion.stderr
diff --git a/src/test/ui/attributes/obsolete-attr.rs b/tests/ui/attributes/obsolete-attr.rs
index 7019abcaf..7019abcaf 100644
--- a/src/test/ui/attributes/obsolete-attr.rs
+++ b/tests/ui/attributes/obsolete-attr.rs
diff --git a/src/test/ui/attributes/obsolete-attr.stderr b/tests/ui/attributes/obsolete-attr.stderr
index 37c1cd0c9..37c1cd0c9 100644
--- a/src/test/ui/attributes/obsolete-attr.stderr
+++ b/tests/ui/attributes/obsolete-attr.stderr
diff --git a/src/test/ui/attributes/suffixed-literal-meta.rs b/tests/ui/attributes/suffixed-literal-meta.rs
index a6531490c..a6531490c 100644
--- a/src/test/ui/attributes/suffixed-literal-meta.rs
+++ b/tests/ui/attributes/suffixed-literal-meta.rs
diff --git a/src/test/ui/attributes/suffixed-literal-meta.stderr b/tests/ui/attributes/suffixed-literal-meta.stderr
index 5245ffead..5245ffead 100644
--- a/src/test/ui/attributes/suffixed-literal-meta.stderr
+++ b/tests/ui/attributes/suffixed-literal-meta.stderr
diff --git a/src/test/ui/attributes/tool_attributes.rs b/tests/ui/attributes/tool_attributes.rs
index be4a10c0e..be4a10c0e 100644
--- a/src/test/ui/attributes/tool_attributes.rs
+++ b/tests/ui/attributes/tool_attributes.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/auxiliary/sigpipe-utils.rs b/tests/ui/attributes/unix_sigpipe/auxiliary/sigpipe-utils.rs
index 74fbae035..74fbae035 100644
--- a/src/test/ui/attributes/unix_sigpipe/auxiliary/sigpipe-utils.rs
+++ b/tests/ui/attributes/unix_sigpipe/auxiliary/sigpipe-utils.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-crate.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.rs
index d6d020c52..d6d020c52 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-crate.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr
index a1fb4d678..a1fb4d678 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-crate.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.rs
index 294cb3852..294cb3852 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr
index 2362c17a0..2362c17a0 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-duplicates.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-error.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-error.rs
index 0a42a5b5e..0a42a5b5e 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-error.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-error.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs
index 4f8648077..4f8648077 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-inherit.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-list.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.rs
index b5ebc07a0..b5ebc07a0 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-list.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr
index 59a87e139..59a87e139 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-list.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.rs
index cde6719fc..cde6719fc 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr
index c4b81118c..c4b81118c 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-main-fn.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.rs
index 16f727639..16f727639 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr
index a04f605ed..a04f605ed 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-non-root-main.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-not-used.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-not-used.rs
index 100b4ce9f..100b4ce9f 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-not-used.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-not-used.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-only-feature.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-only-feature.rs
index b5adc2e55..b5adc2e55 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-only-feature.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-only-feature.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-rustc_main.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-rustc_main.rs
index 6befb9e95..6befb9e95 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-rustc_main.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-rustc_main.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-sig_dfl.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-sig_dfl.rs
index 238c0d57a..238c0d57a 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-sig_dfl.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-sig_dfl.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-start.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.rs
index 64fd5ec4f..64fd5ec4f 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-start.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr
index 2c9ce479b..2c9ce479b 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-start.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-struct.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.rs
index a5e47cfeb..a5e47cfeb 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-struct.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr
index c56ee60bb..c56ee60bb 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-struct.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.rs
index 4ec25de00..4ec25de00 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr
index a66e45aa2..a66e45aa2 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe-wrong.stderr
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe.rs b/tests/ui/attributes/unix_sigpipe/unix_sigpipe.rs
index 7bf1c7350..7bf1c7350 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe.rs
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe.rs
diff --git a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe.stderr b/tests/ui/attributes/unix_sigpipe/unix_sigpipe.stderr
index 1b1eda825..1b1eda825 100644
--- a/src/test/ui/attributes/unix_sigpipe/unix_sigpipe.stderr
+++ b/tests/ui/attributes/unix_sigpipe/unix_sigpipe.stderr
diff --git a/src/test/ui/attributes/unknown-attr.rs b/tests/ui/attributes/unknown-attr.rs
index 70fef04e9..70fef04e9 100644
--- a/src/test/ui/attributes/unknown-attr.rs
+++ b/tests/ui/attributes/unknown-attr.rs
diff --git a/src/test/ui/attributes/unknown-attr.stderr b/tests/ui/attributes/unknown-attr.stderr
index 85c227dc8..85c227dc8 100644
--- a/src/test/ui/attributes/unknown-attr.stderr
+++ b/tests/ui/attributes/unknown-attr.stderr
diff --git a/src/test/ui/attributes/unnamed-field-attributes-dup.rs b/tests/ui/attributes/unnamed-field-attributes-dup.rs
index 7edfd0337..7edfd0337 100644
--- a/src/test/ui/attributes/unnamed-field-attributes-dup.rs
+++ b/tests/ui/attributes/unnamed-field-attributes-dup.rs
diff --git a/src/test/ui/attributes/unnamed-field-attributes-vis.rs b/tests/ui/attributes/unnamed-field-attributes-vis.rs
index d12155f6d..d12155f6d 100644
--- a/src/test/ui/attributes/unnamed-field-attributes-vis.rs
+++ b/tests/ui/attributes/unnamed-field-attributes-vis.rs
diff --git a/src/test/ui/attributes/unnamed-field-attributes.rs b/tests/ui/attributes/unnamed-field-attributes.rs
index 93f364047..93f364047 100644
--- a/src/test/ui/attributes/unnamed-field-attributes.rs
+++ b/tests/ui/attributes/unnamed-field-attributes.rs
diff --git a/src/test/ui/attributes/unrestricted-attribute-tokens.rs b/tests/ui/attributes/unrestricted-attribute-tokens.rs
index e31bc91a0..e31bc91a0 100644
--- a/src/test/ui/attributes/unrestricted-attribute-tokens.rs
+++ b/tests/ui/attributes/unrestricted-attribute-tokens.rs
diff --git a/src/test/ui/attributes/unused-item-in-attr.rs b/tests/ui/attributes/unused-item-in-attr.rs
index 70dcd5413..70dcd5413 100644
--- a/src/test/ui/attributes/unused-item-in-attr.rs
+++ b/tests/ui/attributes/unused-item-in-attr.rs
diff --git a/src/test/ui/attributes/unused-item-in-attr.stderr b/tests/ui/attributes/unused-item-in-attr.stderr
index 92a8f5858..92a8f5858 100644
--- a/src/test/ui/attributes/unused-item-in-attr.stderr
+++ b/tests/ui/attributes/unused-item-in-attr.stderr
diff --git a/src/test/ui/attributes/used_with_arg.rs b/tests/ui/attributes/used_with_arg.rs
index ad80ff53f..ad80ff53f 100644
--- a/src/test/ui/attributes/used_with_arg.rs
+++ b/tests/ui/attributes/used_with_arg.rs
diff --git a/src/test/ui/attributes/used_with_arg.stderr b/tests/ui/attributes/used_with_arg.stderr
index 440e5c4a5..440e5c4a5 100644
--- a/src/test/ui/attributes/used_with_arg.stderr
+++ b/tests/ui/attributes/used_with_arg.stderr
diff --git a/src/test/ui/attributes/used_with_arg_no_mangle.rs b/tests/ui/attributes/used_with_arg_no_mangle.rs
index d0bbe76ef..d0bbe76ef 100644
--- a/src/test/ui/attributes/used_with_arg_no_mangle.rs
+++ b/tests/ui/attributes/used_with_arg_no_mangle.rs
diff --git a/src/test/ui/attributes/used_with_multi_args.rs b/tests/ui/attributes/used_with_multi_args.rs
index 2e17fcfd7..2e17fcfd7 100644
--- a/src/test/ui/attributes/used_with_multi_args.rs
+++ b/tests/ui/attributes/used_with_multi_args.rs
diff --git a/src/test/ui/attributes/used_with_multi_args.stderr b/tests/ui/attributes/used_with_multi_args.stderr
index c93aafcfc..c93aafcfc 100644
--- a/src/test/ui/attributes/used_with_multi_args.stderr
+++ b/tests/ui/attributes/used_with_multi_args.stderr
diff --git a/src/test/ui/attributes/variant-attributes.rs b/tests/ui/attributes/variant-attributes.rs
index ffcdeb52a..ffcdeb52a 100644
--- a/src/test/ui/attributes/variant-attributes.rs
+++ b/tests/ui/attributes/variant-attributes.rs
diff --git a/src/test/ui/z-crate-attr.rs b/tests/ui/attributes/z-crate-attr.rs
index 1021774fc..1021774fc 100644
--- a/src/test/ui/z-crate-attr.rs
+++ b/tests/ui/attributes/z-crate-attr.rs