Avoid notes that only make sense for unsafe functions
This commit is contained in:
parent
1952b87780
commit
767d4fe64e
4 changed files with 9 additions and 17 deletions
|
@ -747,7 +747,10 @@ impl UnsafeOpKind {
|
|||
) {
|
||||
let parent_id = tcx.hir().get_parent_item(hir_id);
|
||||
let parent_owner = tcx.hir_owner_node(parent_id);
|
||||
let should_suggest = parent_owner.fn_sig().is_some_and(|sig| sig.header.is_unsafe());
|
||||
let should_suggest = parent_owner.fn_sig().is_some_and(|sig| {
|
||||
// Do not suggest for safe target_feature functions
|
||||
matches!(sig.header.safety, hir::HeaderSafety::Normal(hir::Safety::Unsafe))
|
||||
});
|
||||
let unsafe_not_inherited_note = if should_suggest {
|
||||
suggest_unsafe_block.then(|| {
|
||||
let body_span = tcx.hir().body(parent_owner.body_id().unwrap()).value.span;
|
||||
|
@ -910,7 +913,7 @@ impl UnsafeOpKind {
|
|||
{
|
||||
true
|
||||
} else if let Some(sig) = tcx.hir().fn_sig_by_hir_id(*id)
|
||||
&& sig.header.is_unsafe()
|
||||
&& matches!(sig.header.safety, hir::HeaderSafety::Normal(hir::Safety::Unsafe))
|
||||
{
|
||||
true
|
||||
} else {
|
||||
|
|
|
@ -461,11 +461,13 @@ impl<T> Trait<T> for X {
|
|||
(ty::FnPtr(_, hdr), ty::FnDef(def_id, _))
|
||||
| (ty::FnDef(def_id, _), ty::FnPtr(_, hdr)) => {
|
||||
if tcx.fn_sig(def_id).skip_binder().safety() < hdr.safety {
|
||||
if !tcx.codegen_fn_attrs(def_id).safe_target_features {
|
||||
diag.note(
|
||||
"unsafe functions cannot be coerced into safe function pointers",
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
(ty::Adt(_, _), ty::Adt(def, args))
|
||||
if let ObligationCauseCode::IfExpression(cause) = cause.code()
|
||||
&& let hir::Node::Block(blk) = self.tcx.hir_node(cause.then_id)
|
||||
|
|
|
@ -12,7 +12,6 @@ LL | let foo: fn() = foo;
|
|||
= note: expected fn pointer `fn()`
|
||||
found fn item `#[target_features] fn() {foo}`
|
||||
= note: functions with `#[target_feature]` can only be coerced to `unsafe` function pointers
|
||||
= note: unsafe functions cannot be coerced into safe function pointers
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
|
|
|
@ -26,9 +26,6 @@ LL | Quux.avx_bmi2();
|
|||
error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||
--> $DIR/safe-calls.rs:38:5
|
||||
|
|
||||
LL | fn bar() {
|
||||
| -------- items do not inherit unsafety from separate enclosing items
|
||||
LL | sse2();
|
||||
LL | avx_bmi2();
|
||||
| ^^^^^^^^^^ call to function with `#[target_feature]`
|
||||
|
|
||||
|
@ -37,9 +34,6 @@ LL | avx_bmi2();
|
|||
error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||
--> $DIR/safe-calls.rs:40:5
|
||||
|
|
||||
LL | fn bar() {
|
||||
| -------- items do not inherit unsafety from separate enclosing items
|
||||
...
|
||||
LL | Quux.avx_bmi2();
|
||||
| ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
|
||||
|
|
||||
|
@ -48,9 +42,6 @@ LL | Quux.avx_bmi2();
|
|||
error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||
--> $DIR/safe-calls.rs:47:5
|
||||
|
|
||||
LL | fn baz() {
|
||||
| -------- items do not inherit unsafety from separate enclosing items
|
||||
LL | sse2();
|
||||
LL | avx_bmi2();
|
||||
| ^^^^^^^^^^ call to function with `#[target_feature]`
|
||||
|
|
||||
|
@ -59,9 +50,6 @@ LL | avx_bmi2();
|
|||
error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
|
||||
--> $DIR/safe-calls.rs:49:5
|
||||
|
|
||||
LL | fn baz() {
|
||||
| -------- items do not inherit unsafety from separate enclosing items
|
||||
...
|
||||
LL | Quux.avx_bmi2();
|
||||
| ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
|
||||
|
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue