dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unadorned

This commit is contained in:
Michael Goulet 2024-10-11 11:24:14 -04:00
parent ce697f919d
commit c085071631
12 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_ast_passes/messages.ftl
View File

@ -70,8 +70,8 @@ ast_passes_extern_fn_qualifiers = functions in `extern` blocks cannot have quali
.label = in this `extern` block .label = in this `extern` block
.suggestion = remove this qualifier .suggestion = remove this qualifier
ast_passes_extern_invalid_safety = items in unadorned `extern` blocks cannot have safety qualifiers ast_passes_extern_invalid_safety = items in `extern` blocks without an `unsafe` qualifier cannot have safety qualifiers
.suggestion = add unsafe to this `extern` block .suggestion = add `unsafe` to this `extern` block
ast_passes_extern_item_ascii = items in `extern` blocks cannot use non-ascii identifiers ast_passes_extern_item_ascii = items in `extern` blocks cannot use non-ascii identifiers
.label = in this `extern` block .label = in this `extern` block

2
tests/rustdoc-json/fns/extern_safe.rs
View File

@ -2,7 +2,7 @@ extern "C" {
//@ is "$.index[*][?(@.name=='f1')].inner.function.header.is_unsafe" true //@ is "$.index[*][?(@.name=='f1')].inner.function.header.is_unsafe" true
pub fn f1(); 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" { unsafe extern "C" {

4
tests/ui/parser/fn-header-semantic-fail.rs
View File

@ -42,7 +42,7 @@ fn main() {
extern "C" { extern "C" {
async fn fe1(); //~ ERROR functions in `extern` blocks cannot have qualifiers 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 const fn fe3(); //~ ERROR functions in `extern` blocks cannot have qualifiers
extern "C" fn fe4(); //~ 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(); const async unsafe extern "C" fn fe5();
@ -50,6 +50,6 @@ fn main() {
//~| ERROR functions in `extern` blocks //~| ERROR functions in `extern` blocks
//~| ERROR functions in `extern` blocks //~| ERROR functions in `extern` blocks
//~| ERROR functions cannot be both `const` and `async` //~| 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
} }
} }

8
tests/ui/parser/fn-header-semantic-fail.stderr
View File

@ -78,13 +78,13 @@ LL | extern "C" {
LL | async fn fe1(); LL | async fn fe1();
| ^^^^^ help: remove this qualifier | ^^^^^ 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 --> $DIR/fn-header-semantic-fail.rs:45:9
| |
LL | unsafe fn fe2(); LL | unsafe fn fe2();
| ^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^
| |
help: add unsafe to this `extern` block help: add `unsafe` to this `extern` block
| |
LL | unsafe extern "C" { LL | unsafe extern "C" {
| ++++++ | ++++++
@ -134,13 +134,13 @@ LL | extern "C" {
LL | const async unsafe extern "C" fn fe5(); LL | const async unsafe extern "C" fn fe5();
| ^^^^^^^^^^ help: remove this qualifier | ^^^^^^^^^^ 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 --> $DIR/fn-header-semantic-fail.rs:48:9
| |
LL | const async unsafe extern "C" fn fe5(); 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" { LL | unsafe extern "C" {
| ++++++ | ++++++

2
tests/ui/parser/no-const-fn-in-extern-block.rs
View File

@ -3,7 +3,7 @@ extern "C" {
//~^ ERROR functions in `extern` blocks cannot have qualifiers //~^ ERROR functions in `extern` blocks cannot have qualifiers
const unsafe fn bar(); const unsafe fn bar();
//~^ ERROR functions in `extern` blocks cannot have qualifiers //~^ 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() {} fn main() {}

4
tests/ui/parser/no-const-fn-in-extern-block.stderr
View File

@ -15,13 +15,13 @@ LL | extern "C" {
LL | const unsafe fn bar(); LL | const unsafe fn bar();
| ^^^^^ help: remove this qualifier | ^^^^^ 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 --> $DIR/no-const-fn-in-extern-block.rs:4:5
| |
LL | const unsafe fn bar(); LL | const unsafe fn bar();
| ^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^
| |
help: add unsafe to this `extern` block help: add `unsafe` to this `extern` block
| |
LL | unsafe extern "C" { LL | unsafe extern "C" {
| ++++++ | ++++++

8
tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.edition2021.stderr
View File

@ -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 --> $DIR/safe-unsafe-on-unadorned-extern-block.rs:8:5
| |
LL | safe static TEST1: i32; LL | safe static TEST1: i32;
| ^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^
| |
help: add unsafe to this `extern` block help: add `unsafe` to this `extern` block
| |
LL | unsafe extern "C" { 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 --> $DIR/safe-unsafe-on-unadorned-extern-block.rs:10:5
| |
LL | safe fn test1(i: i32); LL | safe fn test1(i: i32);
| ^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^
| |
help: add unsafe to this `extern` block help: add `unsafe` to this `extern` block
| |
LL | unsafe extern "C" { LL | unsafe extern "C" {
| ++++++ | ++++++

8
tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.edition2024.stderr
View File

@ -10,24 +10,24 @@ LL | |
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 --> $DIR/safe-unsafe-on-unadorned-extern-block.rs:8:5
| |
LL | safe static TEST1: i32; LL | safe static TEST1: i32;
| ^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^
| |
help: add unsafe to this `extern` block help: add `unsafe` to this `extern` block
| |
LL | unsafe extern "C" { 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 --> $DIR/safe-unsafe-on-unadorned-extern-block.rs:10:5
| |
LL | safe fn test1(i: i32); LL | safe fn test1(i: i32);
| ^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^
| |
help: add unsafe to this `extern` block help: add `unsafe` to this `extern` block
| |
LL | unsafe extern "C" { LL | unsafe extern "C" {
| ++++++ | ++++++

4
tests/ui/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.rs
View File

@ -6,9 +6,9 @@
extern "C" { extern "C" {
//[edition2024]~^ ERROR extern blocks must be unsafe //[edition2024]~^ ERROR extern blocks must be unsafe
safe static TEST1: i32; 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); 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() { fn test2() {

2
tests/ui/rust-2024/unsafe-extern-blocks/unsafe-on-extern-block-issue-126756.fixed
View File

@ -3,7 +3,7 @@
#![allow(dead_code)] #![allow(dead_code)]
unsafe extern "C" { 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() {} fn main() {}

2
tests/ui/rust-2024/unsafe-extern-blocks/unsafe-on-extern-block-issue-126756.rs
View File

@ -3,7 +3,7 @@
#![allow(dead_code)] #![allow(dead_code)]
extern "C" { 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() {} fn main() {}

4
tests/ui/rust-2024/unsafe-extern-blocks/unsafe-on-extern-block-issue-126756.stderr
View File

@ -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 --> $DIR/unsafe-on-extern-block-issue-126756.rs:6:5
| |
LL | unsafe fn foo(); LL | unsafe fn foo();
| ^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^
| |
help: add unsafe to this `extern` block help: add `unsafe` to this `extern` block
| |
LL | unsafe extern "C" { LL | unsafe extern "C" {
| ++++++ | ++++++