bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stop calling impl_polarity when impl_trait_ref was also called

Browse source
This commit is contained in:
Oli Scherer 2024-02-10 22:27:03 +00:00
parent ab0e8b3145
commit b43fbe63e7
12 changed files with 96 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_middle/src/ty/mod.rs
View file

@ -1590,15 +1590,16 @@ impl<'tcx> TyCtxt<'tcx> {
def_id1: DefId,
def_id2: DefId,
) -> Option<ImplOverlapKind> {
let impl_trait_ref1 = self.impl_trait_ref(def_id1).unwrap().instantiate_identity();
let impl_trait_ref2 = self.impl_trait_ref(def_id2).unwrap().instantiate_identity();
let impl1 = self.impl_trait_header(def_id1).unwrap().instantiate_identity();
let impl2 = self.impl_trait_header(def_id2).unwrap().instantiate_identity();
// If either trait impl references an error, they're allowed to overlap,
// as one of them essentially doesn't exist.
if impl_trait_ref1.references_error() || impl_trait_ref2.references_error() {
if impl1.references_error() || impl2.references_error() {
return Some(ImplOverlapKind::Permitted { marker: false });
}
match (self.impl_polarity(def_id1), self.impl_polarity(def_id2)) {
match (impl1.polarity, impl2.polarity) {
(ImplPolarity::Reservation, _) | (_, ImplPolarity::Reservation) => {
// `#[rustc_reservation_impl]` impls don't overlap with anything
return Some(ImplOverlapKind::Permitted { marker: false });
@ -1615,7 +1616,7 @@ impl<'tcx> TyCtxt<'tcx> {
let is_marker_overlap = {
let is_marker_impl =
|trait_ref: TraitRef<'_>| -> bool { self.trait_def(trait_ref.def_id).is_marker };
is_marker_impl(impl_trait_ref1) && is_marker_impl(impl_trait_ref2)
is_marker_impl(impl1.trait_ref) && is_marker_impl(impl2.trait_ref)
};
if is_marker_overlap {