bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #131550 - compiler-errors:extern-diags, r=spastorino

Browse source 
Make some tweaks to extern block diagnostics

Self-explanatory. See the diagnostic changes; I hope they make them a bit more descriptive.

r? spastorino
This commit is contained in:
Matthias Krüger 2024-10-14 17:06:38 +02:00 • committed by GitHub
commit b8cdca8cce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 62 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_ast_passes/messages.ftl
View file

@ -62,12 +62,12 @@ ast_passes_equality_in_where = equality constraints are not yet supported in `wh
ast_passes_extern_block_suggestion = if you meant to declare an externally defined function, use an `extern` block ast_passes_extern_block_suggestion = if you meant to declare an externally defined function, use an `extern` block
ast_passes_extern_fn_qualifiers = functions in `extern` blocks cannot have qualifiers ast_passes_extern_fn_qualifiers = functions in `extern` blocks cannot have `{$kw}` qualifier
.label = in this `extern` block .label = in this `extern` block
.suggestion = remove this qualifier .suggestion = remove the `{$kw}` 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

15
compiler/rustc_ast_passes/src/ast_validation.rs
View file

@ -524,21 +524,24 @@ impl<'a> AstValidator<'a> {
// Deconstruct to ensure exhaustiveness // Deconstruct to ensure exhaustiveness
FnHeader { safety: _, coroutine_kind, constness, ext }: FnHeader, FnHeader { safety: _, coroutine_kind, constness, ext }: FnHeader,
) { ) {
let report_err = |span| { let report_err = |span, kw| {
self.dcx() self.dcx().emit_err(errors::FnQualifierInExtern {
.emit_err(errors::FnQualifierInExtern { span, block: self.current_extern_span() }); span,
kw,
block: self.current_extern_span(),
});
}; };
match coroutine_kind { match coroutine_kind {
Some(knd) => report_err(knd.span()), Some(kind) => report_err(kind.span(), kind.as_str()),
None => (), None => (),
} }
match constness { match constness {
Const::Yes(span) => report_err(span), Const::Yes(span) => report_err(span, "const"),
Const::No => (), Const::No => (),
} }
match ext { match ext {
Extern::None => (), Extern::None => (),
Extern::Implicit(span) | Extern::Explicit(_, span) => report_err(span), Extern::Implicit(span) | Extern::Explicit(_, span) => report_err(span, "extern"),
} }
} }

1
compiler/rustc_ast_passes/src/errors.rs
View file

@ -295,6 +295,7 @@ pub(crate) struct FnQualifierInExtern {
pub span: Span, pub span: Span,
#[label] #[label]
pub block: Span, pub block: Span,
pub kw: &'static str,
} }
#[derive(Diagnostic)] #[derive(Diagnostic)]

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" {

2
tests/ui/extern/issue-95829.rs vendored
View file

@ -2,7 +2,7 @@
extern { extern {
async fn L() { //~ ERROR: incorrect function inside `extern` block async fn L() { //~ ERROR: incorrect function inside `extern` block
//~^ ERROR: functions in `extern` blocks cannot have qualifiers //~^ ERROR: functions in `extern` blocks cannot have `async` qualifier
async fn M() {} async fn M() {}
} }
} }

4
tests/ui/extern/issue-95829.stderr vendored
View file

@ -15,13 +15,13 @@ LL | | }
= help: you might have meant to write a function accessible through FFI, which can be done by writing `extern fn` outside of the `extern` block = help: you might have meant to write a function accessible through FFI, which can be done by writing `extern fn` outside of the `extern` block
= note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
error: functions in `extern` blocks cannot have qualifiers error: functions in `extern` blocks cannot have `async` qualifier
--> $DIR/issue-95829.rs:4:5 --> $DIR/issue-95829.rs:4:5
| |
LL | extern { LL | extern {
| ------ in this `extern` block | ------ in this `extern` block
LL | async fn L() { LL | async fn L() {
| ^^^^^ help: remove this qualifier | ^^^^^ help: remove the `async` qualifier
error: aborting due to 2 previous errors error: aborting due to 2 previous errors

10
tests/ui/parser/fn-header-semantic-fail.rs
View file

@ -41,15 +41,15 @@ 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
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
const fn fe3(); //~ ERROR functions in `extern` blocks cannot have qualifiers const fn fe3(); //~ ERROR functions in `extern` blocks cannot
extern "C" fn fe4(); //~ ERROR functions in `extern` blocks cannot have qualifiers extern "C" fn fe4(); //~ ERROR functions in `extern` blocks cannot
const async unsafe extern "C" fn fe5(); const async unsafe extern "C" fn fe5();
//~^ ERROR functions in `extern` blocks //~^ ERROR functions in `extern` blocks
//~| 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
} }
} }

32
tests/ui/parser/fn-header-semantic-fail.stderr
View file

@ -70,77 +70,77 @@ LL | const async unsafe extern "C" fn fi5() {}
| | `async` because of this | | `async` because of this
| `const` because of this | `const` because of this
error: functions in `extern` blocks cannot have qualifiers error: functions in `extern` blocks cannot have `async` qualifier
--> $DIR/fn-header-semantic-fail.rs:44:9 --> $DIR/fn-header-semantic-fail.rs:44:9
| |
LL | extern "C" { LL | extern "C" {
| ---------- in this `extern` block | ---------- in this `extern` block
LL | async fn fe1(); LL | async fn fe1();
| ^^^^^ help: remove this qualifier | ^^^^^ help: remove the `async` 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" {
| ++++++ | ++++++
error: functions in `extern` blocks cannot have qualifiers error: functions in `extern` blocks cannot have `const` qualifier
--> $DIR/fn-header-semantic-fail.rs:46:9 --> $DIR/fn-header-semantic-fail.rs:46:9
| |
LL | extern "C" { LL | extern "C" {
| ---------- in this `extern` block | ---------- in this `extern` block
... ...
LL | const fn fe3(); LL | const fn fe3();
| ^^^^^ help: remove this qualifier | ^^^^^ help: remove the `const` qualifier
error: functions in `extern` blocks cannot have qualifiers error: functions in `extern` blocks cannot have `extern` qualifier
--> $DIR/fn-header-semantic-fail.rs:47:9 --> $DIR/fn-header-semantic-fail.rs:47:9
| |
LL | extern "C" { LL | extern "C" {
| ---------- in this `extern` block | ---------- in this `extern` block
... ...
LL | extern "C" fn fe4(); LL | extern "C" fn fe4();
| ^^^^^^^^^^ help: remove this qualifier | ^^^^^^^^^^ help: remove the `extern` qualifier
error: functions in `extern` blocks cannot have qualifiers error: functions in `extern` blocks cannot have `async` qualifier
--> $DIR/fn-header-semantic-fail.rs:48:15 --> $DIR/fn-header-semantic-fail.rs:48:15
| |
LL | extern "C" { LL | extern "C" {
| ---------- in this `extern` block | ---------- in this `extern` block
... ...
LL | const async unsafe extern "C" fn fe5(); LL | const async unsafe extern "C" fn fe5();
| ^^^^^ help: remove this qualifier | ^^^^^ help: remove the `async` qualifier
error: functions in `extern` blocks cannot have qualifiers error: functions in `extern` blocks cannot have `const` qualifier
--> $DIR/fn-header-semantic-fail.rs:48:9 --> $DIR/fn-header-semantic-fail.rs:48:9
| |
LL | extern "C" { LL | extern "C" {
| ---------- in this `extern` block | ---------- in this `extern` block
... ...
LL | const async unsafe extern "C" fn fe5(); LL | const async unsafe extern "C" fn fe5();
| ^^^^^ help: remove this qualifier | ^^^^^ help: remove the `const` qualifier
error: functions in `extern` blocks cannot have qualifiers error: functions in `extern` blocks cannot have `extern` qualifier
--> $DIR/fn-header-semantic-fail.rs:48:28 --> $DIR/fn-header-semantic-fail.rs:48:28
| |
LL | extern "C" { LL | extern "C" {
| ---------- in this `extern` block | ---------- in this `extern` block
... ...
LL | const async unsafe extern "C" fn fe5(); LL | const async unsafe extern "C" fn fe5();
| ^^^^^^^^^^ help: remove this qualifier | ^^^^^^^^^^ help: remove the `extern` 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" {
| ++++++ | ++++++

6
tests/ui/parser/no-const-fn-in-extern-block.rs
View file

@ -1,9 +1,9 @@
extern "C" { extern "C" {
const fn foo(); const fn foo();
//~^ ERROR functions in `extern` blocks cannot have qualifiers //~^ ERROR functions in `extern` blocks cannot
const unsafe fn bar(); const unsafe fn bar();
//~^ ERROR functions in `extern` blocks cannot have qualifiers //~^ ERROR functions in `extern` blocks cannot
//~| ERROR items in unadorned `extern` blocks cannot have safety qualifiers //~| ERROR items in `extern` blocks without an `unsafe` qualifier cannot
} }
fn main() {} fn main() {}

12
tests/ui/parser/no-const-fn-in-extern-block.stderr
View file

@ -1,27 +1,27 @@
error: functions in `extern` blocks cannot have qualifiers error: functions in `extern` blocks cannot have `const` qualifier
--> $DIR/no-const-fn-in-extern-block.rs:2:5 --> $DIR/no-const-fn-in-extern-block.rs:2:5
| |
LL | extern "C" { LL | extern "C" {
| ---------- in this `extern` block | ---------- in this `extern` block
LL | const fn foo(); LL | const fn foo();
| ^^^^^ help: remove this qualifier | ^^^^^ help: remove the `const` qualifier
error: functions in `extern` blocks cannot have qualifiers error: functions in `extern` blocks cannot have `const` qualifier
--> $DIR/no-const-fn-in-extern-block.rs:4:5 --> $DIR/no-const-fn-in-extern-block.rs:4:5
| |
LL | extern "C" { LL | extern "C" {
| ---------- in this `extern` block | ---------- in this `extern` block
... ...
LL | const unsafe fn bar(); LL | const unsafe fn bar();
| ^^^^^ help: remove this qualifier | ^^^^^ help: remove the `const` 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" {
| ++++++ | ++++++