bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Avoid code duplication by extracting checks into fns

Browse source
This commit is contained in:
Santiago Pastorino 2021-10-23 00:03:33 -03:00
parent 9534186857
commit 3287f72d39
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
compiler/rustc_trait_selection/src/traits/coherence.rs
View file

@ -8,7 +8,9 @@ use crate::infer::{CombinedSnapshot, InferOk, TyCtxtInferExt};
use crate::traits::query::evaluate_obligation::InferCtxtExt; use crate::traits::query::evaluate_obligation::InferCtxtExt;
use crate::traits::select::IntercrateAmbiguityCause; use crate::traits::select::IntercrateAmbiguityCause;
use crate::traits::SkipLeakCheck; use crate::traits::SkipLeakCheck;
use crate::traits::{self, Normalized, Obligation, ObligationCause, SelectionContext}; use crate::traits::{
self, Normalized, Obligation, ObligationCause, PredicateObligation, SelectionContext,
};
use rustc_hir::def_id::{DefId, LOCAL_CRATE}; use rustc_hir::def_id::{DefId, LOCAL_CRATE};
use rustc_middle::ty::fold::TypeFoldable; use rustc_middle::ty::fold::TypeFoldable;
use rustc_middle::ty::subst::Subst; use rustc_middle::ty::subst::Subst;
@ -159,6 +161,19 @@ fn overlap_within_probe(
b_def_id: DefId, b_def_id: DefId,
snapshot: &CombinedSnapshot<'_, 'tcx>, snapshot: &CombinedSnapshot<'_, 'tcx>,
) -> Option<OverlapResult<'tcx>> { ) -> Option<OverlapResult<'tcx>> {
fn loose_check(selcx: &mut SelectionContext<'cx, 'tcx>, o: &PredicateObligation<'tcx>) -> bool {
!selcx.predicate_may_hold_fatal(o)
}
fn strict_check(selcx: &SelectionContext<'cx, 'tcx>, o: &PredicateObligation<'tcx>) -> bool {
let infcx = selcx.infcx();
let tcx = infcx.tcx;
o.flip_polarity(tcx)
.as_ref()
.map(|o| selcx.infcx().predicate_must_hold_modulo_regions(o))
.unwrap_or(false)
}
// For the purposes of this check, we don't bring any placeholder // For the purposes of this check, we don't bring any placeholder
// types into scope; instead, we replace the generic types with // types into scope; instead, we replace the generic types with
// fresh type variables, and hence we do our evaluations in an // fresh type variables, and hence we do our evaluations in an
@ -227,17 +242,9 @@ fn overlap_within_probe(
if tcx.has_attr(a_def_id, sym::rustc_strict_coherence) if tcx.has_attr(a_def_id, sym::rustc_strict_coherence)
&& tcx.has_attr(b_def_id, sym::rustc_strict_coherence) && tcx.has_attr(b_def_id, sym::rustc_strict_coherence)
{ {
o.flip_polarity(tcx) strict_check(selcx, o)
.as_ref()
.map(|o| selcx.infcx().predicate_must_hold_modulo_regions(o))
.unwrap_or(false)
} else { } else {
!selcx.predicate_may_hold_fatal(o) loose_check(selcx, o) || tcx.features().negative_impls && strict_check(selcx, o)
|| tcx.features().negative_impls
&& o.flip_polarity(tcx)
.as_ref()
.map(|o| selcx.infcx().predicate_must_hold_modulo_regions(o))
.unwrap_or(false)
} }
}); });
// FIXME: the call to `selcx.predicate_may_hold_fatal` above should be ported // FIXME: the call to `selcx.predicate_may_hold_fatal` above should be ported