mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline loose_check fn on call site

Browse Source
This commit is contained in:
Santiago Pastorino 2022-02-10 16:39:52 -03:00
parent 45983fecff
commit 8c4ffaaa7c
No known key found for this signature in database
GPG Key ID: 8131A24E0C79EFAF
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_trait_selection/src/traits/coherence.rs
View File

@ -287,7 +287,7 @@ fn implicit_negative<'cx, 'tcx>(
predicate: p,
})
.chain(obligations)
.find(|o| loose_check(selcx, o));
.find(|o| !selcx.predicate_may_hold_fatal(o));
if let Some(failing_obligation) = opt_failing_obligation {
debug!("overlap: obligation unsatisfiable {:?}", failing_obligation);
@ -363,16 +363,6 @@ fn negative_impl<'cx, 'tcx>(
})
}
fn loose_check<'cx, 'tcx>(
selcx: &mut SelectionContext<'cx, 'tcx>,
o: &PredicateObligation<'tcx>,
) -> bool {
// FIXME: the call to `selcx.predicate_may_hold_fatal` below should be ported
// to the canonical trait query form, `infcx.predicate_may_hold`, once
// the new system supports intercrate mode (which coherence needs).
!selcx.predicate_may_hold_fatal(o)
}
fn negative_impl_exists<'cx, 'tcx>(
selcx: &SelectionContext<'cx, 'tcx>,
param_env: ty::ParamEnv<'tcx>,