Remove unadorned

compiler-errors · compiler-errors · commit c085071631bd · 2024-10-11T11:30:08.000-04:00
diff --git a/compiler/rustc_ast_passes/messages.ftl b/compiler/rustc_ast_passes/messages.ftl
@@ -70,8 +70,8 @@ ast_passes_extern_fn_qualifiers = functions in `extern` blocks cannot have quali
     .label = in this `extern` block
     .suggestion = remove this qualifier
 
-ast_passes_extern_invalid_safety = items in unadorned `extern` blocks cannot have safety qualifiers
-    .suggestion = add unsafe to this `extern` block
+ast_passes_extern_invalid_safety = items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
+    .suggestion = add `unsafe` to this `extern` block
 
 ast_passes_extern_item_ascii = items in `extern` blocks cannot use non-ascii identifiers
     .label = in this `extern` block
diff --git a/tests/rustdoc-json/fns/extern_safe.rs b/tests/rustdoc-json/fns/extern_safe.rs
@@ -2,7 +2,7 @@ extern "C" {
     //@ is "$.index[*][?(@.name=='f1')].inner.function.header.is_unsafe" true
     pub fn f1();
 
-    // items in unadorned `extern` blocks cannot have safety qualifiers
+    // items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
 }
 
 unsafe extern "C" {
diff --git a/tests/ui/parser/fn-header-semantic-fail.rs b/tests/ui/parser/fn-header-semantic-fail.rs
@@ -42,14 +42,14 @@ fn main() {
 
     extern "C" {
         async fn fe1(); //~ ERROR functions in `extern` blocks cannot have qualifiers
-        unsafe fn fe2(); //~ ERROR items in unadorned `extern` blocks cannot have safety qualifiers
+        unsafe fn fe2(); //~ ERROR items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
         const fn fe3(); //~ ERROR functions in `extern` blocks cannot have qualifiers
         extern "C" fn fe4(); //~ ERROR functions in `extern` blocks cannot have qualifiers
         const async unsafe extern "C" fn fe5();
         //~^ ERROR functions in `extern` blocks
         //~| ERROR functions in `extern` blocks
         //~| ERROR functions in `extern` blocks
         //~| ERROR functions cannot be both `const` and `async`
-        //~| ERROR items in unadorned `extern` blocks cannot have safety qualifiers
+        //~| ERROR items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
     }
 }
diff --git a/tests/ui/parser/fn-header-semantic-fail.stderr b/tests/ui/parser/fn-header-semantic-fail.stderr
@@ -78,13 +78,13 @@ LL |     extern "C" {
 LL |         async fn fe1();
    |         ^^^^^ help: remove this qualifier
 
-error: items in unadorned `extern` blocks cannot have safety qualifiers
+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
   --> $DIR/fn-header-semantic-fail.rs:45:9
    |
 LL |         unsafe fn fe2();
    |         ^^^^^^^^^^^^^^^^
    |
-help: add unsafe to this `extern` block
+help: add `unsafe` to this `extern` block
    |
 LL |     unsafe extern "C" {
    |     ++++++
@@ -134,13 +134,13 @@ LL |     extern "C" {
 LL |         const async unsafe extern "C" fn fe5();
    |                            ^^^^^^^^^^ help: remove this qualifier
 
-error: items in unadorned `extern` blocks cannot have safety qualifiers
+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
   --> $DIR/fn-header-semantic-fail.rs:48:9
    |
 LL |         const async unsafe extern "C" fn fe5();
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-help: add unsafe to this `extern` block
+help: add `unsafe` to this `extern` block
    |
 LL |     unsafe extern "C" {
    |     ++++++
diff --git a/tests/ui/parser/no-const-fn-in-extern-block.rs b/tests/ui/parser/no-const-fn-in-extern-block.rs
@@ -3,7 +3,7 @@ extern "C" {
     //~^ ERROR functions in `extern` blocks cannot have qualifiers
     const unsafe fn bar();
     //~^ ERROR functions in `extern` blocks cannot have qualifiers
-    //~| ERROR items in unadorned `extern` blocks cannot have safety qualifiers
+    //~| ERROR items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
 }
 
 fn main() {}
diff --git a/tests/ui/parser/no-const-fn-in-extern-block.stderr b/tests/ui/parser/no-const-fn-in-extern-block.stderr
@@ -15,13 +15,13 @@ LL | extern "C" {
 LL |     const unsafe fn bar();
    |     ^^^^^ help: remove this qualifier
 
-error: items in unadorned `extern` blocks cannot have safety qualifiers
+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
   --> $DIR/no-const-fn-in-extern-block.rs:4:5
    |
 LL |     const unsafe fn bar();
    |     ^^^^^^^^^^^^^^^^^^^^^^
    |
-help: add unsafe to this `extern` block
+help: add `unsafe` to this `extern` block
    |
 LL | unsafe extern "C" {
    | ++++++
diff --git a/tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.edition2021.stderr b/tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.edition2021.stderr
@@ -1,21 +1,21 @@
-error: items in unadorned `extern` blocks cannot have safety qualifiers
+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
   --> $DIR/safe-unsafe-on-unadorned-extern-block.rs:8:5
    |
 LL |     safe static TEST1: i32;
    |     ^^^^^^^^^^^^^^^^^^^^^^^
    |
-help: add unsafe to this `extern` block
+help: add `unsafe` to this `extern` block
    |
 LL | unsafe extern "C" {
    | ++++++
 
-error: items in unadorned `extern` blocks cannot have safety qualifiers
+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
   --> $DIR/safe-unsafe-on-unadorned-extern-block.rs:10:5
    |
 LL |     safe fn test1(i: i32);
    |     ^^^^^^^^^^^^^^^^^^^^^^
    |
-help: add unsafe to this `extern` block
+help: add `unsafe` to this `extern` block
    |
 LL | unsafe extern "C" {
    | ++++++
diff --git a/tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.edition2024.stderr b/tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.edition2024.stderr
@@ -10,24 +10,24 @@ LL | |
 LL | | }
    | |_^
 
-error: items in unadorned `extern` blocks cannot have safety qualifiers
+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
   --> $DIR/safe-unsafe-on-unadorned-extern-block.rs:8:5
    |
 LL |     safe static TEST1: i32;
    |     ^^^^^^^^^^^^^^^^^^^^^^^
    |
-help: add unsafe to this `extern` block
+help: add `unsafe` to this `extern` block
    |
 LL | unsafe extern "C" {
    | ++++++
 
-error: items in unadorned `extern` blocks cannot have safety qualifiers
+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
   --> $DIR/safe-unsafe-on-unadorned-extern-block.rs:10:5
    |
 LL |     safe fn test1(i: i32);
    |     ^^^^^^^^^^^^^^^^^^^^^^
    |
-help: add unsafe to this `extern` block
+help: add `unsafe` to this `extern` block
    |
 LL | unsafe extern "C" {
    | ++++++
diff --git a/tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.rs b/tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.rs
@@ -6,9 +6,9 @@
 extern "C" {
     //[edition2024]~^ ERROR extern blocks must be unsafe
     safe static TEST1: i32;
-    //~^ ERROR items in unadorned `extern` blocks cannot have safety qualifiers
+    //~^ ERROR items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
     safe fn test1(i: i32);
-    //~^ ERROR items in unadorned `extern` blocks cannot have safety qualifiers
+    //~^ ERROR items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
 }
 
 fn test2() {
diff --git a/tests/ui/rust-2024/unsafe-extern-blocks/unsafe-on-extern-block-issue-126756.fixed b/tests/ui/rust-2024/unsafe-extern-blocks/unsafe-on-extern-block-issue-126756.fixed
@@ -3,7 +3,7 @@
 #![allow(dead_code)]
 
 unsafe extern "C" {
-    unsafe fn foo(); //~ ERROR items in unadorned `extern` blocks cannot have safety qualifiers
+    unsafe fn foo(); //~ ERROR items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
 }
 
 fn main() {}
diff --git a/tests/ui/rust-2024/unsafe-extern-blocks/unsafe-on-extern-block-issue-126756.rs b/tests/ui/rust-2024/unsafe-extern-blocks/unsafe-on-extern-block-issue-126756.rs
@@ -3,7 +3,7 @@
 #![allow(dead_code)]
 
 extern "C" {
-    unsafe fn foo(); //~ ERROR items in unadorned `extern` blocks cannot have safety qualifiers
+    unsafe fn foo(); //~ ERROR items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
 }
 
 fn main() {}
diff --git a/tests/ui/rust-2024/unsafe-extern-blocks/unsafe-on-extern-block-issue-126756.stderr b/tests/ui/rust-2024/unsafe-extern-blocks/unsafe-on-extern-block-issue-126756.stderr
@@ -1,10 +1,10 @@
-error: items in unadorned `extern` blocks cannot have safety qualifiers
+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
   --> $DIR/unsafe-on-extern-block-issue-126756.rs:6:5
    |
 LL |     unsafe fn foo();
    |     ^^^^^^^^^^^^^^^^
    |
-help: add unsafe to this `extern` block
+help: add `unsafe` to this `extern` block
    |
 LL | unsafe extern "C" {
    | ++++++

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ extern "C" {`
`2`	`2`	`//@ is "$.index[*][?(@.name=='f1')].inner.function.header.is_unsafe" true`
`3`	`3`	`pub fn f1();`
`4`	`4`
`5`		- // items in unadorned `extern` blocks cannot have safety qualifiers
	`5`	+ // items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`unsafe extern "C" {`
Original file line number	Diff line number	Diff line change
`@@ -78,13 +78,13 @@ LL \| extern "C" {`
`78`	`78`	`LL \| async fn fe1();`
`79`	`79`	`\| ^^^^^ help: remove this qualifier`
`80`	`80`
`81`		-error: items in unadorned `extern` blocks cannot have safety qualifiers
	`81`	+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
`82`	`82`	`--> $DIR/fn-header-semantic-fail.rs:45:9`
`83`	`83`	`\|`
`84`	`84`	`LL \| unsafe fn fe2();`
`85`	`85`	`\| ^^^^^^^^^^^^^^^^`
`86`	`86`	`\|`
`87`		-help: add unsafe to this `extern` block
	`87`	+help: add `unsafe` to this `extern` block
`88`	`88`	`\|`
`89`	`89`	`LL \| unsafe extern "C" {`
`90`	`90`	`\| ++++++`
`@@ -134,13 +134,13 @@ LL \| extern "C" {`
`134`	`134`	`LL \| const async unsafe extern "C" fn fe5();`
`135`	`135`	`\| ^^^^^^^^^^ help: remove this qualifier`
`136`	`136`
`137`		-error: items in unadorned `extern` blocks cannot have safety qualifiers
	`137`	+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
`138`	`138`	`--> $DIR/fn-header-semantic-fail.rs:48:9`
`139`	`139`	`\|`
`140`	`140`	`LL \| const async unsafe extern "C" fn fe5();`
`141`	`141`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`142`	`142`	`\|`
`143`		-help: add unsafe to this `extern` block
	`143`	+help: add `unsafe` to this `extern` block
`144`	`144`	`\|`
`145`	`145`	`LL \| unsafe extern "C" {`
`146`	`146`	`\| ++++++`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ extern "C" {`
`3`	`3`	//~^ ERROR functions in `extern` blocks cannot have qualifiers
`4`	`4`	`const unsafe fn bar();`
`5`	`5`	//~^ ERROR functions in `extern` blocks cannot have qualifiers
`6`		- //~\| ERROR items in unadorned `extern` blocks cannot have safety qualifiers
	`6`	+ //~\| ERROR items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`fn main() {}`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,13 @@ LL \| extern "C" {`
`15`	`15`	`LL \| const unsafe fn bar();`
`16`	`16`	`\| ^^^^^ help: remove this qualifier`
`17`	`17`
`18`		-error: items in unadorned `extern` blocks cannot have safety qualifiers
	`18`	+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
`19`	`19`	`--> $DIR/no-const-fn-in-extern-block.rs:4:5`
`20`	`20`	`\|`
`21`	`21`	`LL \| const unsafe fn bar();`
`22`	`22`	`\| ^^^^^^^^^^^^^^^^^^^^^^`
`23`	`23`	`\|`
`24`		-help: add unsafe to this `extern` block
	`24`	+help: add `unsafe` to this `extern` block
`25`	`25`	`\|`
`26`	`26`	`LL \| unsafe extern "C" {`
`27`	`27`	`\| ++++++`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,21 @@`
`1`		-error: items in unadorned `extern` blocks cannot have safety qualifiers
	`1`	+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
`2`	`2`	`--> $DIR/safe-unsafe-on-unadorned-extern-block.rs:8:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| safe static TEST1: i32;`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`		-help: add unsafe to this `extern` block
	`7`	+help: add `unsafe` to this `extern` block
`8`	`8`	`\|`
`9`	`9`	`LL \| unsafe extern "C" {`
`10`	`10`	`\| ++++++`
`11`	`11`
`12`		-error: items in unadorned `extern` blocks cannot have safety qualifiers
	`12`	+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
`13`	`13`	`--> $DIR/safe-unsafe-on-unadorned-extern-block.rs:10:5`
`14`	`14`	`\|`
`15`	`15`	`LL \| safe fn test1(i: i32);`
`16`	`16`	`\| ^^^^^^^^^^^^^^^^^^^^^^`
`17`	`17`	`\|`
`18`		-help: add unsafe to this `extern` block
	`18`	+help: add `unsafe` to this `extern` block
`19`	`19`	`\|`
`20`	`20`	`LL \| unsafe extern "C" {`
`21`	`21`	`\| ++++++`
Original file line number	Diff line number	Diff line change
`@@ -10,24 +10,24 @@ LL \| \|`
`10`	`10`	`LL \| \| }`
`11`	`11`	`\| \|_^`
`12`	`12`
`13`		-error: items in unadorned `extern` blocks cannot have safety qualifiers
	`13`	+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
`14`	`14`	`--> $DIR/safe-unsafe-on-unadorned-extern-block.rs:8:5`
`15`	`15`	`\|`
`16`	`16`	`LL \| safe static TEST1: i32;`
`17`	`17`	`\| ^^^^^^^^^^^^^^^^^^^^^^^`
`18`	`18`	`\|`
`19`		-help: add unsafe to this `extern` block
	`19`	+help: add `unsafe` to this `extern` block
`20`	`20`	`\|`
`21`	`21`	`LL \| unsafe extern "C" {`
`22`	`22`	`\| ++++++`
`23`	`23`
`24`		-error: items in unadorned `extern` blocks cannot have safety qualifiers
	`24`	+error: items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
`25`	`25`	`--> $DIR/safe-unsafe-on-unadorned-extern-block.rs:10:5`
`26`	`26`	`\|`
`27`	`27`	`LL \| safe fn test1(i: i32);`
`28`	`28`	`\| ^^^^^^^^^^^^^^^^^^^^^^`
`29`	`29`	`\|`
`30`		-help: add unsafe to this `extern` block
	`30`	+help: add `unsafe` to this `extern` block
`31`	`31`	`\|`
`32`	`32`	`LL \| unsafe extern "C" {`
`33`	`33`	`\| ++++++`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#![allow(dead_code)]`
`4`	`4`
`5`	`5`	`unsafe extern "C" {`
`6`		- unsafe fn foo(); //~ ERROR items in unadorned `extern` blocks cannot have safety qualifiers
	`6`	+ unsafe fn foo(); //~ ERROR items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`fn main() {}`