rust-analyzer

diff --git a/crates/hir-def/src/data.rs b/crates/hir-def/src/data.rs
index 3ecb57c756..f2c49813fa 100644
--- a/crates/hir-def/src/data.rs
+++ b/crates/hir-def/src/data.rs

@@ -148,6 +148,10 @@ impl FunctionData {

self.flags.contains(FnFlags::HAS_UNSAFE_KW)

}

+ pub fn is_safe(&self) -> bool {

+ self.flags.contains(FnFlags::HAS_SAFE_KW)

+ }

pub fn is_varargs(&self) -> bool {

self.flags.contains(FnFlags::IS_VARARGS)

}

diff --git a/crates/hir-def/src/item_tree.rs b/crates/hir-def/src/item_tree.rs
index f16230e1dc..4bee7eeb9e 100644
--- a/crates/hir-def/src/item_tree.rs
+++ b/crates/hir-def/src/item_tree.rs

@@ -754,6 +754,7 @@ bitflags::bitflags! {

const HAS_ASYNC_KW = 1 << 4;

const HAS_UNSAFE_KW = 1 << 5;

const IS_VARARGS = 1 << 6;

+ const HAS_SAFE_KW = 1 << 7;

}

diff --git a/crates/hir-def/src/item_tree/lower.rs b/crates/hir-def/src/item_tree/lower.rs
index 7aac383ab4..1d8d236d97 100644
--- a/crates/hir-def/src/item_tree/lower.rs
+++ b/crates/hir-def/src/item_tree/lower.rs

@@ -440,6 +440,9 @@ impl<'a> Ctx<'a> {

if func.unsafe_token().is_some() {

flags |= FnFlags::HAS_UNSAFE_KW;

}

+ if func.safe_token().is_some() {

+ flags |= FnFlags::HAS_SAFE_KW;

+ }

if has_var_args {

flags |= FnFlags::IS_VARARGS;

}

diff --git a/crates/hir-def/src/item_tree/pretty.rs b/crates/hir-def/src/item_tree/pretty.rs
index b5a65abce8..5ab4718a36 100644
--- a/crates/hir-def/src/item_tree/pretty.rs
+++ b/crates/hir-def/src/item_tree/pretty.rs

@@ -278,6 +278,9 @@ impl Printer<'_> {

if flags.contains(FnFlags::HAS_UNSAFE_KW) {

w!(self, "unsafe ");

}

+ if flags.contains(FnFlags::HAS_SAFE_KW) {

+ w!(self, "safe ");

+ }

if let Some(abi) = abi {

w!(self, "extern \"{}\" ", abi);

}

diff --git a/crates/hir-ty/src/utils.rs b/crates/hir-ty/src/utils.rs
index d1ce68da6d..10252ce6f3 100644
--- a/crates/hir-ty/src/utils.rs
+++ b/crates/hir-ty/src/utils.rs

@@ -257,10 +257,12 @@ pub fn is_fn_unsafe_to_call(db: &dyn HirDatabase, func: FunctionId) -> bool {

return true;

}

- match func.lookup(db.upcast()).container {

+ let loc = func.lookup(db.upcast());

+ match loc.container {

hir_def::ItemContainerId::ExternBlockId(block) => {

- // Function in an `extern` block are always unsafe to call, except when it has

- // `"rust-intrinsic"` ABI there are a few exceptions.

+ // Function in an `extern` block are always unsafe to call, except when

+ // it is marked as `safe` or it has `"rust-intrinsic"` ABI there are a

+ // few exceptions.

let id = block.lookup(db.upcast()).id;

let is_intrinsic =

@@ -270,8 +272,8 @@ pub fn is_fn_unsafe_to_call(db: &dyn HirDatabase, func: FunctionId) -> bool {

// Intrinsics are unsafe unless they have the rustc_safe_intrinsic attribute

!data.attrs.by_key(&sym::rustc_safe_intrinsic).exists()

} else {

- // Extern items are always unsafe

- true

+ // Extern items without `safe` modifier are always unsafe

+ !db.function_data(func).is_safe()

}

_ => false,

diff --git a/crates/ide-diagnostics/src/handlers/missing_unsafe.rs b/crates/ide-diagnostics/src/handlers/missing_unsafe.rs
index 5b43f4b2af..a53dd31286 100644
--- a/crates/ide-diagnostics/src/handlers/missing_unsafe.rs
+++ b/crates/ide-diagnostics/src/handlers/missing_unsafe.rs

@@ -554,7 +554,7 @@ fn main() {

r#"

//- /ed2021.rs crate:ed2021 edition:2021

#[rustc_deprecated_safe_2024]

-unsafe fn safe() -> u8 {

+unsafe fn safe_fn() -> u8 {

}

//- /ed2024.rs crate:ed2024 edition:2024

@@ -564,7 +564,7 @@ unsafe fn not_safe() -> u8 {

}

//- /main.rs crate:main deps:ed2021,ed2024

fn main() {

- ed2021::safe();

+ ed2021::safe_fn();

ed2024::not_safe();

//^^^^^^^^^^^^^^^^^^💡 error: this operation is unsafe and requires an unsafe function or block

}

diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs
index 4e2a50d7a1..5f46093da5 100644
--- a/crates/parser/src/grammar/items.rs
+++ b/crates/parser/src/grammar/items.rs

@@ -135,6 +135,11 @@ pub(super) fn opt_item(p: &mut Parser<'_>, m: Marker) -> Result<(), Marker> {

has_mods = true;

}

+ if p.at(T![safe]) {

+ p.eat(T![safe]);

+ has_mods = true;

+ }

if p.at(T![extern]) {

has_extern = true;

has_mods = true;

@@ -189,6 +194,7 @@ pub(super) fn opt_item(p: &mut Parser<'_>, m: Marker) -> Result<(), Marker> {

T![fn] => fn_(p, m),

T![const] if p.nth(1) != T!['{'] => consts::konst(p, m),

+ T![static] if matches!(p.nth(1), IDENT | T![_] | T![mut]) => consts::static_(p, m),

T![trait] => traits::trait_(p, m),

T![impl] => traits::impl_(p, m),

diff --git a/crates/parser/src/syntax_kind/generated.rs b/crates/parser/src/syntax_kind/generated.rs
index 288a07ef44..39d9d7e340 100644
--- a/crates/parser/src/syntax_kind/generated.rs
+++ b/crates/parser/src/syntax_kind/generated.rs

@@ -94,6 +94,7 @@ pub enum SyntaxKind {

PUB_KW,

REF_KW,

RETURN_KW,

+ SAFE_KW,

SELF_KW,

STATIC_KW,

STRUCT_KW,

@@ -364,6 +365,7 @@ impl SyntaxKind {

| PUB_KW

| REF_KW

| RETURN_KW

+ | SAFE_KW

| SELF_KW

| STATIC_KW

| STRUCT_KW

@@ -458,6 +460,7 @@ impl SyntaxKind {

| PUB_KW

| REF_KW

| RETURN_KW

+ | SAFE_KW

| SELF_KW

| STATIC_KW

| STRUCT_KW

@@ -614,6 +617,7 @@ impl SyntaxKind {

"pub" => PUB_KW,

"ref" => REF_KW,

"return" => RETURN_KW,

+ "safe" => SAFE_KW,

"self" => SELF_KW,

"static" => STATIC_KW,

"struct" => STRUCT_KW,

@@ -707,4 +711,4 @@ impl SyntaxKind {

}

#[macro_export]

-macro_rules ! T { [$] => { $ crate :: SyntaxKind :: DOLLAR } ; [;] => { $ crate :: SyntaxKind :: SEMICOLON } ; [,] => { $ crate :: SyntaxKind :: COMMA } ; ['('] => { $ crate :: SyntaxKind :: L_PAREN } ; [')'] => { $ crate :: SyntaxKind :: R_PAREN } ; ['{'] => { $ crate :: SyntaxKind :: L_CURLY } ; ['}'] => { $ crate :: SyntaxKind :: R_CURLY } ; ['['] => { $ crate :: SyntaxKind :: L_BRACK } ; [']'] => { $ crate :: SyntaxKind :: R_BRACK } ; [<] => { $ crate :: SyntaxKind :: L_ANGLE } ; [>] => { $ crate :: SyntaxKind :: R_ANGLE } ; [@] => { $ crate :: SyntaxKind :: AT } ; [#] => { $ crate :: SyntaxKind :: POUND } ; [~] => { $ crate :: SyntaxKind :: TILDE } ; [?] => { $ crate :: SyntaxKind :: QUESTION } ; [&] => { $ crate :: SyntaxKind :: AMP } ; [|] => { $ crate :: SyntaxKind :: PIPE } ; [+] => { $ crate :: SyntaxKind :: PLUS } ; [*] => { $ crate :: SyntaxKind :: STAR } ; [/] => { $ crate :: SyntaxKind :: SLASH } ; [^] => { $ crate :: SyntaxKind :: CARET } ; [%] => { $ crate :: SyntaxKind :: PERCENT } ; [_] => { $ crate :: SyntaxKind :: UNDERSCORE } ; [.] => { $ crate :: SyntaxKind :: DOT } ; [..] => { $ crate :: SyntaxKind :: DOT2 } ; [...] => { $ crate :: SyntaxKind :: DOT3 } ; [..=] => { $ crate :: SyntaxKind :: DOT2EQ } ; [:] => { $ crate :: SyntaxKind :: COLON } ; [::] => { $ crate :: SyntaxKind :: COLON2 } ; [=] => { $ crate :: SyntaxKind :: EQ } ; [==] => { $ crate :: SyntaxKind :: EQ2 } ; [=>] => { $ crate :: SyntaxKind :: FAT_ARROW } ; [!] => { $ crate :: SyntaxKind :: BANG } ; [!=] => { $ crate :: SyntaxKind :: NEQ } ; [-] => { $ crate :: SyntaxKind :: MINUS } ; [->] => { $ crate :: SyntaxKind :: THIN_ARROW } ; [<=] => { $ crate :: SyntaxKind :: LTEQ } ; [>=] => { $ crate :: SyntaxKind :: GTEQ } ; [+=] => { $ crate :: SyntaxKind :: PLUSEQ } ; [-=] => { $ crate :: SyntaxKind :: MINUSEQ } ; [|=] => { $ crate :: SyntaxKind :: PIPEEQ } ; [&=] => { $ crate :: SyntaxKind :: AMPEQ } ; [^=] => { $ crate :: SyntaxKind :: CARETEQ } ; [/=] => { $ crate :: SyntaxKind :: SLASHEQ } ; [*=] => { $ crate :: SyntaxKind :: STAREQ } ; [%=] => { $ crate :: SyntaxKind :: PERCENTEQ } ; [&&] => { $ crate :: SyntaxKind :: AMP2 } ; [||] => { $ crate :: SyntaxKind :: PIPE2 } ; [<<] => { $ crate :: SyntaxKind :: SHL } ; [>>] => { $ crate :: SyntaxKind :: SHR } ; [<<=] => { $ crate :: SyntaxKind :: SHLEQ } ; [>>=] => { $ crate :: SyntaxKind :: SHREQ } ; [Self] => { $ crate :: SyntaxKind :: SELF_TYPE_KW } ; [abstract] => { $ crate :: SyntaxKind :: ABSTRACT_KW } ; [as] => { $ crate :: SyntaxKind :: AS_KW } ; [become] => { $ crate :: SyntaxKind :: BECOME_KW } ; [box] => { $ crate :: SyntaxKind :: BOX_KW } ; [break] => { $ crate :: SyntaxKind :: BREAK_KW } ; [const] => { $ crate :: SyntaxKind :: CONST_KW } ; [continue] => { $ crate :: SyntaxKind :: CONTINUE_KW } ; [crate] => { $ crate :: SyntaxKind :: CRATE_KW } ; [do] => { $ crate :: SyntaxKind :: DO_KW } ; [else] => { $ crate :: SyntaxKind :: ELSE_KW } ; [enum] => { $ crate :: SyntaxKind :: ENUM_KW } ; [extern] => { $ crate :: SyntaxKind :: EXTERN_KW } ; [false] => { $ crate :: SyntaxKind :: FALSE_KW } ; [final] => { $ crate :: SyntaxKind :: FINAL_KW } ; [fn] => { $ crate :: SyntaxKind :: FN_KW } ; [for] => { $ crate :: SyntaxKind :: FOR_KW } ; [if] => { $ crate :: SyntaxKind :: IF_KW } ; [impl] => { $ crate :: SyntaxKind :: IMPL_KW } ; [in] => { $ crate :: SyntaxKind :: IN_KW } ; [let] => { $ crate :: SyntaxKind :: LET_KW } ; [loop] => { $ crate :: SyntaxKind :: LOOP_KW } ; [macro] => { $ crate :: SyntaxKind :: MACRO_KW } ; [match] => { $ crate :: SyntaxKind :: MATCH_KW } ; [mod] => { $ crate :: SyntaxKind :: MOD_KW } ; [move] => { $ crate :: SyntaxKind :: MOVE_KW } ; [mut] => { $ crate :: SyntaxKind :: MUT_KW } ; [override] => { $ crate :: SyntaxKind :: OVERRIDE_KW } ; [priv] => { $ crate :: SyntaxKind :: PRIV_KW } ; [pub] => { $ crate :: SyntaxKind :: PUB_KW } ; [ref] => { $ crate :: SyntaxKind :: REF_KW } ; [return] => { $ crate :: SyntaxKind :: RETURN_KW } ; [self] => { $ crate :: SyntaxKind :: SELF_KW } ; [static] => { $ crate :: SyntaxKind :: STATIC_KW } ; [struct] => { $ crate :: SyntaxKind :: STRUCT_KW } ; [super] => { $ crate :: SyntaxKind :: SUPER_KW } ; [trait] => { $ crate :: SyntaxKind :: TRAIT_KW } ; [true] => { $ crate :: SyntaxKind :: TRUE_KW } ; [type] => { $ crate :: SyntaxKind :: TYPE_KW } ; [typeof] => { $ crate :: SyntaxKind :: TYPEOF_KW } ; [unsafe] => { $ crate :: SyntaxKind :: UNSAFE_KW } ; [unsized] => { $ crate :: SyntaxKind :: UNSIZED_KW } ; [use] => { $ crate :: SyntaxKind :: USE_KW } ; [virtual] => { $ crate :: SyntaxKind :: VIRTUAL_KW } ; [where] => { $ crate :: SyntaxKind :: WHERE_KW } ; [while] => { $ crate :: SyntaxKind :: WHILE_KW } ; [yield] => { $ crate :: SyntaxKind :: YIELD_KW } ; [asm] => { $ crate :: SyntaxKind :: ASM_KW } ; [att_syntax] => { $ crate :: SyntaxKind :: ATT_SYNTAX_KW } ; [auto] => { $ crate :: SyntaxKind :: AUTO_KW } ; [builtin] => { $ crate :: SyntaxKind :: BUILTIN_KW } ; [clobber_abi] => { $ crate :: SyntaxKind :: CLOBBER_ABI_KW } ; [default] => { $ crate :: SyntaxKind :: DEFAULT_KW } ; [dyn] => { $ crate :: SyntaxKind :: DYN_KW } ; [format_args] => { $ crate :: SyntaxKind :: FORMAT_ARGS_KW } ; [inlateout] => { $ crate :: SyntaxKind :: INLATEOUT_KW } ; [inout] => { $ crate :: SyntaxKind :: INOUT_KW } ; [label] => { $ crate :: SyntaxKind :: LABEL_KW } ; [lateout] => { $ crate :: SyntaxKind :: LATEOUT_KW } ; [macro_rules] => { $ crate :: SyntaxKind :: MACRO_RULES_KW } ; [may_unwind] => { $ crate :: SyntaxKind :: MAY_UNWIND_KW } ; [nomem] => { $ crate :: SyntaxKind :: NOMEM_KW } ; [noreturn] => { $ crate :: SyntaxKind :: NORETURN_KW } ; [nostack] => { $ crate :: SyntaxKind :: NOSTACK_KW } ; [offset_of] => { $ crate :: SyntaxKind :: OFFSET_OF_KW } ; [options] => { $ crate :: SyntaxKind :: OPTIONS_KW } ; [out] => { $ crate :: SyntaxKind :: OUT_KW } ; [preserves_flags] => { $ crate :: SyntaxKind :: PRESERVES_FLAGS_KW } ; [pure] => { $ crate :: SyntaxKind :: PURE_KW } ; [raw] => { $ crate :: SyntaxKind :: RAW_KW } ; [readonly] => { $ crate :: SyntaxKind :: READONLY_KW } ; [sym] => { $ crate :: SyntaxKind :: SYM_KW } ; [union] => { $ crate :: SyntaxKind :: UNION_KW } ; [yeet] => { $ crate :: SyntaxKind :: YEET_KW } ; [async] => { $ crate :: SyntaxKind :: ASYNC_KW } ; [await] => { $ crate :: SyntaxKind :: AWAIT_KW } ; [dyn] => { $ crate :: SyntaxKind :: DYN_KW } ; [gen] => { $ crate :: SyntaxKind :: GEN_KW } ; [try] => { $ crate :: SyntaxKind :: TRY_KW } ; [lifetime_ident] => { $ crate :: SyntaxKind :: LIFETIME_IDENT } ; [int_number] => { $ crate :: SyntaxKind :: INT_NUMBER } ; [ident] => { $ crate :: SyntaxKind :: IDENT } ; [string] => { $ crate :: SyntaxKind :: STRING } ; [shebang] => { $ crate :: SyntaxKind :: SHEBANG } ; }

+macro_rules ! T { [$] => { $ crate :: SyntaxKind :: DOLLAR } ; [;] => { $ crate :: SyntaxKind :: SEMICOLON } ; [,] => { $ crate :: SyntaxKind :: COMMA } ; ['('] => { $ crate :: SyntaxKind :: L_PAREN } ; [')'] => { $ crate :: SyntaxKind :: R_PAREN } ; ['{'] => { $ crate :: SyntaxKind :: L_CURLY } ; ['}'] => { $ crate :: SyntaxKind :: R_CURLY } ; ['['] => { $ crate :: SyntaxKind :: L_BRACK } ; [']'] => { $ crate :: SyntaxKind :: R_BRACK } ; [<] => { $ crate :: SyntaxKind :: L_ANGLE } ; [>] => { $ crate :: SyntaxKind :: R_ANGLE } ; [@] => { $ crate :: SyntaxKind :: AT } ; [#] => { $ crate :: SyntaxKind :: POUND } ; [~] => { $ crate :: SyntaxKind :: TILDE } ; [?] => { $ crate :: SyntaxKind :: QUESTION } ; [&] => { $ crate :: SyntaxKind :: AMP } ; [|] => { $ crate :: SyntaxKind :: PIPE } ; [+] => { $ crate :: SyntaxKind :: PLUS } ; [*] => { $ crate :: SyntaxKind :: STAR } ; [/] => { $ crate :: SyntaxKind :: SLASH } ; [^] => { $ crate :: SyntaxKind :: CARET } ; [%] => { $ crate :: SyntaxKind :: PERCENT } ; [_] => { $ crate :: SyntaxKind :: UNDERSCORE } ; [.] => { $ crate :: SyntaxKind :: DOT } ; [..] => { $ crate :: SyntaxKind :: DOT2 } ; [...] => { $ crate :: SyntaxKind :: DOT3 } ; [..=] => { $ crate :: SyntaxKind :: DOT2EQ } ; [:] => { $ crate :: SyntaxKind :: COLON } ; [::] => { $ crate :: SyntaxKind :: COLON2 } ; [=] => { $ crate :: SyntaxKind :: EQ } ; [==] => { $ crate :: SyntaxKind :: EQ2 } ; [=>] => { $ crate :: SyntaxKind :: FAT_ARROW } ; [!] => { $ crate :: SyntaxKind :: BANG } ; [!=] => { $ crate :: SyntaxKind :: NEQ } ; [-] => { $ crate :: SyntaxKind :: MINUS } ; [->] => { $ crate :: SyntaxKind :: THIN_ARROW } ; [<=] => { $ crate :: SyntaxKind :: LTEQ } ; [>=] => { $ crate :: SyntaxKind :: GTEQ } ; [+=] => { $ crate :: SyntaxKind :: PLUSEQ } ; [-=] => { $ crate :: SyntaxKind :: MINUSEQ } ; [|=] => { $ crate :: SyntaxKind :: PIPEEQ } ; [&=] => { $ crate :: SyntaxKind :: AMPEQ } ; [^=] => { $ crate :: SyntaxKind :: CARETEQ } ; [/=] => { $ crate :: SyntaxKind :: SLASHEQ } ; [*=] => { $ crate :: SyntaxKind :: STAREQ } ; [%=] => { $ crate :: SyntaxKind :: PERCENTEQ } ; [&&] => { $ crate :: SyntaxKind :: AMP2 } ; [||] => { $ crate :: SyntaxKind :: PIPE2 } ; [<<] => { $ crate :: SyntaxKind :: SHL } ; [>>] => { $ crate :: SyntaxKind :: SHR } ; [<<=] => { $ crate :: SyntaxKind :: SHLEQ } ; [>>=] => { $ crate :: SyntaxKind :: SHREQ } ; [Self] => { $ crate :: SyntaxKind :: SELF_TYPE_KW } ; [abstract] => { $ crate :: SyntaxKind :: ABSTRACT_KW } ; [as] => { $ crate :: SyntaxKind :: AS_KW } ; [become] => { $ crate :: SyntaxKind :: BECOME_KW } ; [box] => { $ crate :: SyntaxKind :: BOX_KW } ; [break] => { $ crate :: SyntaxKind :: BREAK_KW } ; [const] => { $ crate :: SyntaxKind :: CONST_KW } ; [continue] => { $ crate :: SyntaxKind :: CONTINUE_KW } ; [crate] => { $ crate :: SyntaxKind :: CRATE_KW } ; [do] => { $ crate :: SyntaxKind :: DO_KW } ; [else] => { $ crate :: SyntaxKind :: ELSE_KW } ; [enum] => { $ crate :: SyntaxKind :: ENUM_KW } ; [extern] => { $ crate :: SyntaxKind :: EXTERN_KW } ; [false] => { $ crate :: SyntaxKind :: FALSE_KW } ; [final] => { $ crate :: SyntaxKind :: FINAL_KW } ; [fn] => { $ crate :: SyntaxKind :: FN_KW } ; [for] => { $ crate :: SyntaxKind :: FOR_KW } ; [if] => { $ crate :: SyntaxKind :: IF_KW } ; [impl] => { $ crate :: SyntaxKind :: IMPL_KW } ; [in] => { $ crate :: SyntaxKind :: IN_KW } ; [let] => { $ crate :: SyntaxKind :: LET_KW } ; [loop] => { $ crate :: SyntaxKind :: LOOP_KW } ; [macro] => { $ crate :: SyntaxKind :: MACRO_KW } ; [match] => { $ crate :: SyntaxKind :: MATCH_KW } ; [mod] => { $ crate :: SyntaxKind :: MOD_KW } ; [move] => { $ crate :: SyntaxKind :: MOVE_KW } ; [mut] => { $ crate :: SyntaxKind :: MUT_KW } ; [override] => { $ crate :: SyntaxKind :: OVERRIDE_KW } ; [priv] => { $ crate :: SyntaxKind :: PRIV_KW } ; [pub] => { $ crate :: SyntaxKind :: PUB_KW } ; [ref] => { $ crate :: SyntaxKind :: REF_KW } ; [return] => { $ crate :: SyntaxKind :: RETURN_KW } ; [safe] => { $ crate :: SyntaxKind :: SAFE_KW } ; [self] => { $ crate :: SyntaxKind :: SELF_KW } ; [static] => { $ crate :: SyntaxKind :: STATIC_KW } ; [struct] => { $ crate :: SyntaxKind :: STRUCT_KW } ; [super] => { $ crate :: SyntaxKind :: SUPER_KW } ; [trait] => { $ crate :: SyntaxKind :: TRAIT_KW } ; [true] => { $ crate :: SyntaxKind :: TRUE_KW } ; [type] => { $ crate :: SyntaxKind :: TYPE_KW } ; [typeof] => { $ crate :: SyntaxKind :: TYPEOF_KW } ; [unsafe] => { $ crate :: SyntaxKind :: UNSAFE_KW } ; [unsized] => { $ crate :: SyntaxKind :: UNSIZED_KW } ; [use] => { $ crate :: SyntaxKind :: USE_KW } ; [virtual] => { $ crate :: SyntaxKind :: VIRTUAL_KW } ; [where] => { $ crate :: SyntaxKind :: WHERE_KW } ; [while] => { $ crate :: SyntaxKind :: WHILE_KW } ; [yield] => { $ crate :: SyntaxKind :: YIELD_KW } ; [asm] => { $ crate :: SyntaxKind :: ASM_KW } ; [att_syntax] => { $ crate :: SyntaxKind :: ATT_SYNTAX_KW } ; [auto] => { $ crate :: SyntaxKind :: AUTO_KW } ; [builtin] => { $ crate :: SyntaxKind :: BUILTIN_KW } ; [clobber_abi] => { $ crate :: SyntaxKind :: CLOBBER_ABI_KW } ; [default] => { $ crate :: SyntaxKind :: DEFAULT_KW } ; [dyn] => { $ crate :: SyntaxKind :: DYN_KW } ; [format_args] => { $ crate :: SyntaxKind :: FORMAT_ARGS_KW } ; [inlateout] => { $ crate :: SyntaxKind :: INLATEOUT_KW } ; [inout] => { $ crate :: SyntaxKind :: INOUT_KW } ; [label] => { $ crate :: SyntaxKind :: LABEL_KW } ; [lateout] => { $ crate :: SyntaxKind :: LATEOUT_KW } ; [macro_rules] => { $ crate :: SyntaxKind :: MACRO_RULES_KW } ; [may_unwind] => { $ crate :: SyntaxKind :: MAY_UNWIND_KW } ; [nomem] => { $ crate :: SyntaxKind :: NOMEM_KW } ; [noreturn] => { $ crate :: SyntaxKind :: NORETURN_KW } ; [nostack] => { $ crate :: SyntaxKind :: NOSTACK_KW } ; [offset_of] => { $ crate :: SyntaxKind :: OFFSET_OF_KW } ; [options] => { $ crate :: SyntaxKind :: OPTIONS_KW } ; [out] => { $ crate :: SyntaxKind :: OUT_KW } ; [preserves_flags] => { $ crate :: SyntaxKind :: PRESERVES_FLAGS_KW } ; [pure] => { $ crate :: SyntaxKind :: PURE_KW } ; [raw] => { $ crate :: SyntaxKind :: RAW_KW } ; [readonly] => { $ crate :: SyntaxKind :: READONLY_KW } ; [sym] => { $ crate :: SyntaxKind :: SYM_KW } ; [union] => { $ crate :: SyntaxKind :: UNION_KW } ; [yeet] => { $ crate :: SyntaxKind :: YEET_KW } ; [async] => { $ crate :: SyntaxKind :: ASYNC_KW } ; [await] => { $ crate :: SyntaxKind :: AWAIT_KW } ; [dyn] => { $ crate :: SyntaxKind :: DYN_KW } ; [gen] => { $ crate :: SyntaxKind :: GEN_KW } ; [try] => { $ crate :: SyntaxKind :: TRY_KW } ; [lifetime_ident] => { $ crate :: SyntaxKind :: LIFETIME_IDENT } ; [int_number] => { $ crate :: SyntaxKind :: INT_NUMBER } ; [ident] => { $ crate :: SyntaxKind :: IDENT } ; [string] => { $ crate :: SyntaxKind :: STRING } ; [shebang] => { $ crate :: SyntaxKind :: SHEBANG } ; }

diff --git a/crates/parser/test_data/parser/ok/0073_safe_declarations_in_extern_blocks.rast b/crates/parser/test_data/parser/ok/0073_safe_declarations_in_extern_blocks.rast
new file mode 100644
index 0000000000..b3d9e55806
--- /dev/null
+++ b/crates/parser/test_data/parser/ok/0073_safe_declarations_in_extern_blocks.rast

@@ -0,0 +1,208 @@

+SOURCE_FILE

+ EXTERN_BLOCK

+ UNSAFE_KW "unsafe"

+ WHITESPACE " "

+ ABI

+ EXTERN_KW "extern"

+ WHITESPACE " "

+ EXTERN_ITEM_LIST

+ L_CURLY "{"

+ WHITESPACE "\n "

+ FN

+ COMMENT "// sqrt (from libm) may be called with any `f64`"

+ WHITESPACE "\n "

+ VISIBILITY

+ PUB_KW "pub"

+ WHITESPACE " "

+ SAFE_KW "safe"

+ WHITESPACE " "

+ FN_KW "fn"

+ WHITESPACE " "

+ NAME

+ IDENT "sqrt"

+ PARAM_LIST

+ L_PAREN "("

+ PARAM

+ IDENT_PAT

+ NAME

+ IDENT "x"

+ COLON ":"

+ WHITESPACE " "

+ PATH_TYPE

+ PATH

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "f64"

+ R_PAREN ")"

+ WHITESPACE " "

+ RET_TYPE

+ THIN_ARROW "->"

+ WHITESPACE " "

+ PATH_TYPE

+ PATH

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "f64"

+ SEMICOLON ";"

+ WHITESPACE "\n\n "

+ FN

+ COMMENT "// strlen (from libc) requires a valid pointer,"

+ WHITESPACE "\n "

+ COMMENT "// so we mark it as being an unsafe fn"

+ WHITESPACE "\n "

+ VISIBILITY

+ PUB_KW "pub"

+ WHITESPACE " "

+ UNSAFE_KW "unsafe"

+ WHITESPACE " "

+ FN_KW "fn"

+ WHITESPACE " "

+ NAME

+ IDENT "strlen"

+ PARAM_LIST

+ L_PAREN "("

+ PARAM

+ IDENT_PAT

+ NAME

+ IDENT "p"

+ COLON ":"

+ WHITESPACE " "

+ PTR_TYPE

+ STAR "*"

+ CONST_KW "const"

+ WHITESPACE " "

+ PATH_TYPE

+ PATH

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "c_char"

+ R_PAREN ")"

+ WHITESPACE " "

+ RET_TYPE

+ THIN_ARROW "->"

+ WHITESPACE " "

+ PATH_TYPE

+ PATH

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "usize"

+ SEMICOLON ";"

+ WHITESPACE "\n\n "

+ FN

+ COMMENT "// this function doesn't say safe or unsafe, so it defaults to unsafe"

+ WHITESPACE "\n "

+ VISIBILITY

+ PUB_KW "pub"

+ WHITESPACE " "

+ FN_KW "fn"

+ WHITESPACE " "

+ NAME

+ IDENT "free"

+ PARAM_LIST

+ L_PAREN "("

+ PARAM

+ IDENT_PAT

+ NAME

+ IDENT "p"

+ COLON ":"

+ WHITESPACE " "

+ PTR_TYPE

+ STAR "*"

+ MUT_KW "mut"

+ WHITESPACE " "

+ PATH_TYPE

+ PATH

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "core"

+ COLON2 "::"

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "ffi"

+ COLON2 "::"

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "c_void"

+ R_PAREN ")"

+ SEMICOLON ";"

+ WHITESPACE "\n\n "

+ STATIC

+ VISIBILITY

+ PUB_KW "pub"

+ WHITESPACE " "

+ SAFE_KW "safe"

+ WHITESPACE " "

+ STATIC_KW "static"

+ WHITESPACE " "

+ MUT_KW "mut"

+ WHITESPACE " "

+ NAME

+ IDENT "COUNTER"

+ COLON ":"

+ WHITESPACE " "

+ PATH_TYPE

+ PATH

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "i32"

+ SEMICOLON ";"

+ WHITESPACE "\n\n "

+ STATIC

+ VISIBILITY

+ PUB_KW "pub"

+ WHITESPACE " "

+ UNSAFE_KW "unsafe"

+ WHITESPACE " "

+ STATIC_KW "static"

+ WHITESPACE " "

+ NAME

+ IDENT "IMPORTANT_BYTES"

+ COLON ":"

+ WHITESPACE " "

+ ARRAY_TYPE

+ L_BRACK "["

+ PATH_TYPE

+ PATH

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "u8"

+ SEMICOLON ";"

+ WHITESPACE " "

+ CONST_ARG

+ LITERAL

+ INT_NUMBER "256"

+ R_BRACK "]"

+ SEMICOLON ";"

+ WHITESPACE "\n\n "

+ STATIC

+ VISIBILITY

+ PUB_KW "pub"

+ WHITESPACE " "

+ SAFE_KW "safe"

+ WHITESPACE " "

+ STATIC_KW "static"

+ WHITESPACE " "

+ NAME

+ IDENT "LINES"

+ COLON ":"

+ WHITESPACE " "

+ PATH_TYPE

+ PATH

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "SyncUnsafeCell"

+ GENERIC_ARG_LIST

+ L_ANGLE "<"

+ TYPE_ARG

+ PATH_TYPE

+ PATH

+ PATH_SEGMENT

+ NAME_REF

+ IDENT "i32"

+ R_ANGLE ">"

+ SEMICOLON ";"

+ WHITESPACE "\n"

+ R_CURLY "}"

+ WHITESPACE "\n"

diff --git a/crates/parser/test_data/parser/ok/0073_safe_declarations_in_extern_blocks.rs b/crates/parser/test_data/parser/ok/0073_safe_declarations_in_extern_blocks.rs
new file mode 100644
index 0000000000..267a128649
--- /dev/null
+++ b/crates/parser/test_data/parser/ok/0073_safe_declarations_in_extern_blocks.rs

@@ -0,0 +1,17 @@

+unsafe extern {

+ // sqrt (from libm) may be called with any `f64`

+ pub safe fn sqrt(x: f64) -> f64;

+ // strlen (from libc) requires a valid pointer,

+ // so we mark it as being an unsafe fn

+ pub unsafe fn strlen(p: *const c_char) -> usize;

+ // this function doesn't say safe or unsafe, so it defaults to unsafe

+ pub fn free(p: *mut core::ffi::c_void);

+ pub safe static mut COUNTER: i32;

+ pub unsafe static IMPORTANT_BYTES: [u8; 256];

+ pub safe static LINES: SyncUnsafeCell<i32>;

diff --git a/crates/syntax/rust.ungram b/crates/syntax/rust.ungram
index 52ad439e4d..90441c27f6 100644
--- a/crates/syntax/rust.ungram
+++ b/crates/syntax/rust.ungram

@@ -190,7 +190,7 @@ UseTreeList =

Fn =

Attr* Visibility?

- 'default'? 'const'? 'async'? 'gen'? 'unsafe'? Abi?

+ 'default'? 'const'? 'async'? 'gen'? 'unsafe'? 'safe'? Abi?

'fn' Name GenericParamList? ParamList RetType? WhereClause?

(body:BlockExpr | ';')

@@ -284,6 +284,7 @@ Const =

Static =

Attr* Visibility?

+ 'unsafe'? 'safe'?

'static' 'mut'? Name ':' Type

('=' body:Expr)? ';'

diff --git a/crates/syntax/src/ast/generated/nodes.rs b/crates/syntax/src/ast/generated/nodes.rs
index c81a19f3bd..4f8bff489c 100644
--- a/crates/syntax/src/ast/generated/nodes.rs
+++ b/crates/syntax/src/ast/generated/nodes.rs

@@ -668,6 +668,8 @@ impl Fn {

#[inline]

pub fn gen_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![gen]) }

#[inline]

+ pub fn safe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![safe]) }

+ #[inline]

pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }

}

@@ -1761,7 +1763,11 @@ impl Static {

#[inline]

pub fn mut_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![mut]) }

#[inline]

+ pub fn safe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![safe]) }

+ #[inline]

pub fn static_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![static]) }

+ #[inline]

+ pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }

}

#[derive(Debug, Clone, PartialEq, Eq, Hash)]