UI test changes

tests/ui/attributes/unsafe/double-unsafe-attributes.stderr

@@ -9,6 +9,12 @@ help: escape `unsafe` to use it as an identifier
 LL | #[unsafe(r#unsafe(no_mangle))]
    |          ++
 
+error: cannot find attribute `r#unsafe` in this scope
+  --> $DIR/double-unsafe-attributes.rs:1:10
+   |
+LL | #[unsafe(unsafe(no_mangle))]
+   |          ^^^^^^
+
 error: `r#unsafe` is not an unsafe attribute
   --> $DIR/double-unsafe-attributes.rs:1:3
    |
@@ -17,11 +23,5 @@ LL | #[unsafe(unsafe(no_mangle))]
    |
    = note: extraneous unsafe is not allowed in attributes
 
-error: cannot find attribute `r#unsafe` in this scope
-  --> $DIR/double-unsafe-attributes.rs:1:10
-   |
-LL | #[unsafe(unsafe(no_mangle))]
-   |          ^^^^^^
-
 error: aborting due to 3 previous errors
 

tests/ui/attributes/unsafe/proc-unsafe-attributes.stderr

@@ -12,46 +12,6 @@ LL | #[unsafe(allow(unsafe(dead_code)))]
    |
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
-error: `proc_macro` is not an unsafe attribute
-  --> $DIR/proc-unsafe-attributes.rs:1:3
-   |
-LL | #[unsafe(proc_macro)]
-   |   ^^^^^^ this is not an unsafe attribute
-   |
-   = note: extraneous unsafe is not allowed in attributes
-
-error: `proc_macro_derive` is not an unsafe attribute
-  --> $DIR/proc-unsafe-attributes.rs:7:3
-   |
-LL | #[unsafe(proc_macro_derive(Foo))]
-   |   ^^^^^^ this is not an unsafe attribute
-   |
-   = note: extraneous unsafe is not allowed in attributes
-
-error: `proc_macro_attribute` is not an unsafe attribute
-  --> $DIR/proc-unsafe-attributes.rs:18:3
-   |
-LL | #[unsafe(proc_macro_attribute)]
-   |   ^^^^^^ this is not an unsafe attribute
-   |
-   = note: extraneous unsafe is not allowed in attributes
-
-error: `allow` is not an unsafe attribute
-  --> $DIR/proc-unsafe-attributes.rs:23:3
-   |
-LL | #[unsafe(allow(dead_code))]
-   |   ^^^^^^ this is not an unsafe attribute
-   |
-   = note: extraneous unsafe is not allowed in attributes
-
-error: `allow` is not an unsafe attribute
-  --> $DIR/proc-unsafe-attributes.rs:27:3
-   |
-LL | #[unsafe(allow(unsafe(dead_code)))]
-   |   ^^^^^^ this is not an unsafe attribute
-   |
-   = note: extraneous unsafe is not allowed in attributes
-
 error: expected identifier, found keyword `unsafe`
   --> $DIR/proc-unsafe-attributes.rs:27:16
    |
@@ -103,6 +63,22 @@ LL | #[unsafe(allow(unsafe(dead_code)))]
    |
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
+error: `proc_macro` is not an unsafe attribute
+  --> $DIR/proc-unsafe-attributes.rs:1:3
+   |
+LL | #[unsafe(proc_macro)]
+   |   ^^^^^^ this is not an unsafe attribute
+   |
+   = note: extraneous unsafe is not allowed in attributes
+
+error: `proc_macro_derive` is not an unsafe attribute
+  --> $DIR/proc-unsafe-attributes.rs:7:3
+   |
+LL | #[unsafe(proc_macro_derive(Foo))]
+   |   ^^^^^^ this is not an unsafe attribute
+   |
+   = note: extraneous unsafe is not allowed in attributes
+
 error: expected identifier, found keyword `unsafe`
   --> $DIR/proc-unsafe-attributes.rs:12:21
    |
@@ -132,6 +108,30 @@ LL - #[proc_macro_derive(unsafe(Foo))]
 LL + #[proc_macro_derive(TraitName, attributes(name1, name2, ...))]
    |
 
+error: `proc_macro_attribute` is not an unsafe attribute
+  --> $DIR/proc-unsafe-attributes.rs:18:3
+   |
+LL | #[unsafe(proc_macro_attribute)]
+   |   ^^^^^^ this is not an unsafe attribute
+   |
+   = note: extraneous unsafe is not allowed in attributes
+
+error: `allow` is not an unsafe attribute
+  --> $DIR/proc-unsafe-attributes.rs:23:3
+   |
+LL | #[unsafe(allow(dead_code))]
+   |   ^^^^^^ this is not an unsafe attribute
+   |
+   = note: extraneous unsafe is not allowed in attributes
+
+error: `allow` is not an unsafe attribute
+  --> $DIR/proc-unsafe-attributes.rs:27:3
+   |
+LL | #[unsafe(allow(unsafe(dead_code)))]
+   |   ^^^^^^ this is not an unsafe attribute
+   |
+   = note: extraneous unsafe is not allowed in attributes
+
 error[E0452]: malformed lint attribute input
   --> $DIR/proc-unsafe-attributes.rs:27:16
    |

tests/ui/ffi-attrs/ffi_const.stderr

@@ -1,14 +1,3 @@
-error: unsafe attribute used without unsafe
-  --> $DIR/ffi_const.rs:16:7
-   |
-LL |     #[ffi_const]
-   |       ^^^^^^^^^ usage of unsafe attribute
-   |
-help: wrap the attribute in `unsafe(...)`
-   |
-LL |     #[unsafe(ffi_const)]
-   |       +++++++         +
-
 error: `#[ffi_const]` attribute cannot be used on functions
   --> $DIR/ffi_const.rs:4:1
    |
@@ -33,5 +22,16 @@ LL |     #[unsafe(ffi_const)]
    |
    = help: `#[ffi_const]` can only be applied to foreign functions
 
+error: unsafe attribute used without unsafe
+  --> $DIR/ffi_const.rs:16:7
+   |
+LL |     #[ffi_const]
+   |       ^^^^^^^^^ usage of unsafe attribute
+   |
+help: wrap the attribute in `unsafe(...)`
+   |
+LL |     #[unsafe(ffi_const)]
+   |       +++++++         +
+
 error: aborting due to 4 previous errors
 

tests/ui/ffi-attrs/ffi_pure.stderr

@@ -1,14 +1,3 @@
-error: unsafe attribute used without unsafe
-  --> $DIR/ffi_pure.rs:16:7
-   |
-LL |     #[ffi_pure]
-   |       ^^^^^^^^ usage of unsafe attribute
-   |
-help: wrap the attribute in `unsafe(...)`
-   |
-LL |     #[unsafe(ffi_pure)]
-   |       +++++++        +
-
 error: `#[ffi_pure]` attribute cannot be used on functions
   --> $DIR/ffi_pure.rs:4:1
    |
@@ -33,5 +22,16 @@ LL |     #[unsafe(ffi_pure)]
    |
    = help: `#[ffi_pure]` can only be applied to foreign functions
 
+error: unsafe attribute used without unsafe
+  --> $DIR/ffi_pure.rs:16:7
+   |
+LL |     #[ffi_pure]
+   |       ^^^^^^^^ usage of unsafe attribute
+   |
+help: wrap the attribute in `unsafe(...)`
+   |
+LL |     #[unsafe(ffi_pure)]
+   |       +++++++        +
+
 error: aborting due to 4 previous errors