bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove intermediate function doesn't make more sense

Browse source
This commit is contained in:
Santiago Pastorino 2022-01-21 15:30:10 -03:00
parent 19e3c86003
commit e2567b034d
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
1 changed files with 11 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -249,33 +249,6 @@ fn stable_disjoint<'cx, 'tcx>(
param_env: ty::ParamEnv<'tcx>, param_env: ty::ParamEnv<'tcx>,
impl1_header: &ty::ImplHeader<'tcx>, impl1_header: &ty::ImplHeader<'tcx>,
impl2_header: ty::ImplHeader<'tcx>, impl2_header: ty::ImplHeader<'tcx>,
) -> bool {
let infcx = selcx.infcx();
let tcx = infcx.tcx;
disjoint_with_filter(selcx, param_env, impl1_header, impl2_header, |selcx, o| {
loose_check(selcx, o) || tcx.features().negative_impls && strict_check(selcx, o)
})
}
fn strict_disjoint<'cx, 'tcx>(
selcx: &mut SelectionContext<'cx, 'tcx>,
impl1_def_id: DefId,
impl2_def_id: DefId,
) -> bool {
explicit_disjoint(selcx, impl1_def_id, impl2_def_id)
|| explicit_disjoint(selcx, impl2_def_id, impl1_def_id)
}
fn disjoint_with_filter<'cx, 'tcx>(
selcx: &mut SelectionContext<'cx, 'tcx>,
param_env: ty::ParamEnv<'tcx>,
impl1_header: &ty::ImplHeader<'tcx>,
impl2_header: ty::ImplHeader<'tcx>,
mut filter: impl FnMut(
&mut SelectionContext<'cx, 'tcx>,
&rustc_infer::traits::Obligation<'tcx, rustc_middle::ty::Predicate<'tcx>>,
) -> bool,
) -> bool { ) -> bool {
debug!("overlap: impl1_header={:?}", impl1_header); debug!("overlap: impl1_header={:?}", impl1_header);
debug!("overlap: impl2_header={:?}", impl2_header); debug!("overlap: impl2_header={:?}", impl2_header);
@ -316,6 +289,7 @@ fn disjoint_with_filter<'cx, 'tcx>(
// hold we need to check if `&'?a str: !Error` holds, if doesn't hold there's overlap because // hold we need to check if `&'?a str: !Error` holds, if doesn't hold there's overlap because
// at some point an impl for `&'?a str: Error` could be added. // at some point an impl for `&'?a str: Error` could be added.
let infcx = selcx.infcx(); let infcx = selcx.infcx();
let tcx = infcx.tcx;
let opt_failing_obligation = impl1_header let opt_failing_obligation = impl1_header
.predicates .predicates
.iter() .iter()
@ -329,7 +303,7 @@ fn disjoint_with_filter<'cx, 'tcx>(
predicate: p, predicate: p,
}) })
.chain(obligations) .chain(obligations)
.find(|o| filter(selcx, o)); .find(|o| loose_check(selcx, o) || tcx.features().negative_impls && strict_check(selcx, o));
// 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
// to the canonical trait query form, `infcx.predicate_may_hold`, once // to the canonical trait query form, `infcx.predicate_may_hold`, once
// the new system supports intercrate mode (which coherence needs). // the new system supports intercrate mode (which coherence needs).
@ -344,6 +318,15 @@ fn disjoint_with_filter<'cx, 'tcx>(
/// Given impl1 and impl2 check if both impls are never satisfied by a common type (including /// Given impl1 and impl2 check if both impls are never satisfied by a common type (including
/// where-clauses) If so, return true, they are disjoint and false otherwise. /// where-clauses) If so, return true, they are disjoint and false otherwise.
fn strict_disjoint<'cx, 'tcx>(
selcx: &mut SelectionContext<'cx, 'tcx>,
impl1_def_id: DefId,
impl2_def_id: DefId,
) -> bool {
explicit_disjoint(selcx, impl1_def_id, impl2_def_id)
|| explicit_disjoint(selcx, impl2_def_id, impl1_def_id)
}
fn explicit_disjoint<'cx, 'tcx>( fn explicit_disjoint<'cx, 'tcx>(
selcx: &mut SelectionContext<'cx, 'tcx>, selcx: &mut SelectionContext<'cx, 'tcx>,
impl1_def_id: DefId, impl1_def_id: DefId,