Skip to content

Add a suggestion to MissingUnsafeOnExtern diagnostic #160617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Aug 6, 2026
Merged

Add a suggestion to MissingUnsafeOnExtern diagnostic #160617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion compiler/rustc_ast_passes/src/ast_validation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,10 @@ impl Visitor<'_> for AstValidator<'_> {

if &Safety::Default == safety {
if item.span.at_least_rust_2024() {
self.dcx().emit_err(diagnostics::MissingUnsafeOnExtern { span: item.span });
self.dcx().emit_err(diagnostics::MissingUnsafeOnExtern {
span: item.span,
unsafe_span: item.span.shrink_to_lo(),
});
} else {
self.lint_buffer.buffer_lint(
MISSING_UNSAFE_ON_EXTERN,
Expand Down
7 changes: 7 additions & 0 deletions compiler/rustc_ast_passes/src/diagnostics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,13 @@ pub(crate) struct UnsafeItem {
pub(crate) struct MissingUnsafeOnExtern {
#[primary_span]
pub span: Span,

#[suggestion(
"needs `unsafe` before the extern keyword",
code = "unsafe ",
applicability = "machine-applicable"
)]
pub unsafe_span: Span,
}

#[derive(Diagnostic)]
Expand Down
6 changes: 5 additions & 1 deletion tests/ui/rust-2024/unsafe-extern-blocks/extern-items.edition2024.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
error: extern blocks must be unsafe
--> $DIR/extern-items.rs:6:1
|
LL | / extern "C" {
LL | extern "C" {
| ^
| |
| _help: needs `unsafe` before the extern keyword: `unsafe`
| |
LL | |
LL | | static TEST1: i32;
LL | | fn test1(i: i32);
Expand Down
6 changes: 5 additions & 1 deletion ...i/rust-2024/unsafe-extern-blocks/safe-unsafe-on-unadorned-extern-block.edition2024.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
error: extern blocks must be unsafe
--> $DIR/safe-unsafe-on-unadorned-extern-block.rs:5:1
|
LL | / extern "C" {
LL | extern "C" {
| ^
| |
| _help: needs `unsafe` before the extern keyword: `unsafe`
| |
LL | |
LL | | safe static TEST1: i32;
... |
Expand Down
Loading