Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions crates/hir/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,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;
Expand Down Expand Up @@ -782,10 +782,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_?;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,13 @@ struct S;
"#,
);
}

#[test]
fn unsafe_unresolved_trait() {
check_diagnostics(
r#"
unsafe impl TestTrait for u32 {}
"#,
);
}
}