user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20770 from ChayimFriedman2/unsafe-impl-unresolved

Browse source 
fix: Ignore impl trait safety errors when the trait is unresolved
This commit is contained in:
Shoyu Vanilla (Flint) 2025-10-02 03:29:55 +00:00 • committed by GitHub
commit 5e7247dcdd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tools/rust-analyzer/crates/hir/src/lib.rs
View file

@ -754,7 +754,7 @@ impl Module {
GenericDef::Impl(impl_def).diagnostics(db, acc);
let loc = impl_def.id.lookup(db);
let source_map = db.impl_signature_with_source_map(impl_def.id).1;
let (impl_signature, source_map) = db.impl_signature_with_source_map(impl_def.id);
expr_store_diagnostics(db, acc, &source_map);
let file_id = loc.id.file_id;
@ -783,10 +783,17 @@ impl Module {
}
let trait_ = impl_def.trait_(db);
let trait_is_unsafe = trait_.is_some_and(|t| t.is_unsafe(db));
let mut trait_is_unsafe = trait_.is_some_and(|t| t.is_unsafe(db));
let impl_is_negative = impl_def.is_negative(db);
let impl_is_unsafe = impl_def.is_unsafe(db);
let trait_is_unresolved = trait_.is_none() && impl_signature.target_trait.is_some();
if trait_is_unresolved {
// Ignore trait safety errors when the trait is unresolved, as otherwise we'll treat it as safe,
// which may not be correct.
trait_is_unsafe = impl_is_unsafe;
}
let drop_maybe_dangle = (|| {
// FIXME: This can be simplified a lot by exposing hir-ty's utils.rs::Generics helper
let trait_ = trait_?;

9
src/tools/rust-analyzer/crates/ide-diagnostics/src/handlers/trait_impl_incorrect_safety.rs
View file

@ -127,4 +127,13 @@ struct S;
"#,
);
}
#[test]
fn unsafe_unresolved_trait() {
check_diagnostics(
r#"
unsafe impl TestTrait for u32 {}
"#,
);
}
}