Skip to content

Commit f21a01f

Browse files
borsbors
committed
Auto merge of #18354 - roife:safe-kw-2, r=lnicola
fix: classify `safe` as a contextual kw fix#18352
2 parents d2c7e0f + 8183f6b commit f21a01f

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎src/tools/rust-analyzer/crates/hir-ty/src/utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ pub fn is_fn_unsafe_to_call(db: &dyn HirDatabase, func: FunctionId) -> bool {
273273
!data.attrs.by_key(&sym::rustc_safe_intrinsic).exists()
274274
}else{
275275
// Extern items without `safe` modifier are always unsafe
276-
!db.function_data(func).is_safe()
276+
!data.is_safe()
277277
}
278278
}
279279
_ => false,

‎src/tools/rust-analyzer/crates/ide-diagnostics/src/handlers/missing_unsafe.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ fn main() {
554554
r#"
555555
//- /ed2021.rs crate:ed2021 edition:2021
556556
#[rustc_deprecated_safe_2024]
557-
unsafe fn safe_fn() -> u8 {
557+
unsafe fn safe() -> u8 {
558558
0
559559
}
560560
//- /ed2024.rs crate:ed2024 edition:2024
@@ -564,7 +564,7 @@ unsafe fn not_safe() -> u8 {
564564
}
565565
//- /main.rs crate:main deps:ed2021,ed2024
566566
fn main() {
567-
ed2021::safe_fn();
567+
ed2021::safe();
568568
ed2024::not_safe();
569569
//^^^^^^^^^^^^^^^^^^💡 error: this operation is unsafe and requires an unsafe function or block
570570
}

‎src/tools/rust-analyzer/crates/parser/src/grammar/items.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ pub(super) fn opt_item(p: &mut Parser<'_>, m: Marker) -> Result<(), Marker> {
135135
has_mods = true;
136136
}
137137

138-
if p.at(T![safe]){
139-
p.eat(T![safe]);
138+
if p.at_contextual_kw(T![safe]){
139+
p.eat_contextual_kw(T![safe]);
140140
has_mods = true;
141141
}
142142

‎src/tools/rust-analyzer/crates/parser/src/syntax_kind/generated.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ pub enum SyntaxKind {
9494
PUB_KW,
9595
REF_KW,
9696
RETURN_KW,
97-
SAFE_KW,
9897
SELF_KW,
9998
STATIC_KW,
10099
STRUCT_KW,
@@ -137,6 +136,7 @@ pub enum SyntaxKind {
137136
PURE_KW,
138137
RAW_KW,
139138
READONLY_KW,
139+
SAFE_KW,
140140
SYM_KW,
141141
TRY_KW,
142142
UNION_KW,
@@ -365,7 +365,6 @@ impl SyntaxKind {
365365
| PUB_KW
366366
| REF_KW
367367
| RETURN_KW
368-
| SAFE_KW
369368
| SELF_KW
370369
| STATIC_KW
371370
| STRUCT_KW
@@ -418,6 +417,7 @@ impl SyntaxKind {
418417
PURE_KW => true,
419418
RAW_KW => true,
420419
READONLY_KW => true,
420+
SAFE_KW => true,
421421
SYM_KW => true,
422422
UNION_KW => true,
423423
YEET_KW => true,
@@ -460,7 +460,6 @@ impl SyntaxKind {
460460
| PUB_KW
461461
| REF_KW
462462
| RETURN_KW
463-
| SAFE_KW
464463
| SELF_KW
465464
| STATIC_KW
466465
| STRUCT_KW
@@ -506,6 +505,7 @@ impl SyntaxKind {
506505
PURE_KW => true,
507506
RAW_KW => true,
508507
READONLY_KW => true,
508+
SAFE_KW => true,
509509
SYM_KW => true,
510510
UNION_KW => true,
511511
YEET_KW => true,
@@ -617,7 +617,6 @@ impl SyntaxKind {
617617
"pub" => PUB_KW,
618618
"ref" => REF_KW,
619619
"return" => RETURN_KW,
620-
"safe" => SAFE_KW,
621620
"self" => SELF_KW,
622621
"static" => STATIC_KW,
623622
"struct" => STRUCT_KW,
@@ -668,6 +667,7 @@ impl SyntaxKind {
668667
"pure" => PURE_KW,
669668
"raw" => RAW_KW,
670669
"readonly" => READONLY_KW,
670+
"safe" => SAFE_KW,
671671
"sym" => SYM_KW,
672672
"union" => UNION_KW,
673673
"yeet" => YEET_KW,
@@ -711,4 +711,4 @@ impl SyntaxKind {
711711
}
712712
}
713713
#[macro_export]
714-
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};}
714+
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};[safe] => { $ crate::SyntaxKind::SAFE_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};}

‎src/tools/rust-analyzer/xtask/src/codegen/grammar/ast_src.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const RESERVED: &[&str] = &[
111111
// keywords that are keywords only in specific parse contexts
112112
#[doc(alias = "WEAK_KEYWORDS")]
113113
constCONTEXTUAL_KEYWORDS:&[&str] =
114-
&["macro_rules","union","default","raw","dyn","auto","yeet"];
114+
&["macro_rules","union","default","raw","dyn","auto","yeet","safe"];
115115
// keywords we use for special macro expansions
116116
constCONTEXTUAL_BUILTIN_KEYWORDS:&[&str] = &[
117117
"asm",

0 commit comments

Comments
 (0)