bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

negative_impl_exists should take an InferCtxt

Browse source
This commit is contained in:
Santiago Pastorino 2022-11-21 11:26:23 -03:00
parent 2faad3b699
commit 16c9e39021
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -327,11 +327,10 @@ fn equate<'tcx>(
return true; return true;
}; };
let selcx = &mut SelectionContext::new(&infcx);
let opt_failing_obligation = obligations let opt_failing_obligation = obligations
.into_iter() .into_iter()
.chain(more_obligations) .chain(more_obligations)
.find(|o| negative_impl_exists(selcx, o, body_def_id)); .find(|o| negative_impl_exists(infcx, o, body_def_id));
if let Some(failing_obligation) = opt_failing_obligation { if let Some(failing_obligation) = opt_failing_obligation {
debug!("overlap: obligation unsatisfiable {:?}", failing_obligation); debug!("overlap: obligation unsatisfiable {:?}", failing_obligation);
@ -342,19 +341,19 @@ fn equate<'tcx>(
} }
/// Try to prove that a negative impl exist for the given obligation and its super predicates. /// Try to prove that a negative impl exist for the given obligation and its super predicates.
#[instrument(level = "debug", skip(selcx))] #[instrument(level = "debug", skip(infcx))]
fn negative_impl_exists<'cx, 'tcx>( fn negative_impl_exists<'tcx>(
selcx: &SelectionContext<'cx, 'tcx>, infcx: &InferCtxt<'tcx>,
o: &PredicateObligation<'tcx>, o: &PredicateObligation<'tcx>,
body_def_id: DefId, body_def_id: DefId,
) -> bool { ) -> bool {
if resolve_negative_obligation(selcx.infcx().fork(), o, body_def_id) { if resolve_negative_obligation(infcx.fork(), o, body_def_id) {
return true; return true;
} }
// Try to prove a negative obligation exists for super predicates // Try to prove a negative obligation exists for super predicates
for o in util::elaborate_predicates(selcx.tcx(), iter::once(o.predicate)) { for o in util::elaborate_predicates(infcx.tcx, iter::once(o.predicate)) {
if resolve_negative_obligation(selcx.infcx().fork(), &o, body_def_id) { if resolve_negative_obligation(infcx.fork(), &o, body_def_id) {
return true; return true;
} }
} }