bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Avoid suggesting to add unsafe when the extern block is already unsafe

Browse source
This commit is contained in:
Santiago Pastorino 2024-06-28 23:14:09 -03:00
parent a62cbda57e
commit 15d5dac32e
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -459,13 +459,18 @@ impl<'a> AstValidator<'a> {
fn check_item_safety(&self, span: Span, safety: Safety) {
match self.extern_mod_safety {
Some(extern_safety) => {
if matches!(safety, Safety::Unsafe(_) | Safety::Safe(_))
&& (extern_safety == Safety::Default || !self.features.unsafe_extern_blocks)
{
self.dcx().emit_err(errors::InvalidSafetyOnExtern {
item_span: span,
block: self.current_extern_span().shrink_to_lo(),
});
if matches!(safety, Safety::Unsafe(_) | Safety::Safe(_)) {
if extern_safety == Safety::Default {
self.dcx().emit_err(errors::InvalidSafetyOnExtern {
item_span: span,
block: Some(self.current_extern_span().shrink_to_lo()),
});
} else if !self.features.unsafe_extern_blocks {
self.dcx().emit_err(errors::InvalidSafetyOnExtern {
item_span: span,
block: None,
});
}
}
}
None => {

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

@ -222,7 +222,7 @@ pub struct InvalidSafetyOnExtern {
#[primary_span]
pub item_span: Span,
#[suggestion(code = "unsafe ", applicability = "machine-applicable", style = "verbose")]
pub block: Span,
pub block: Option<Span>,
}
#[derive(Diagnostic)]