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

Auto merge of #99743 - compiler-errors:fulfillment-context-cleanups, r=jackh726

Browse source 
Some `FulfillmentContext`-related cleanups

Use `ObligationCtxt` in some places, remove some `FulfillmentContext`s in others...

r? types
This commit is contained in:
bors 2022-08-06 06:48:15 +00:00
commit bd04658eb6
12 changed files with 126 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_const_eval/src/transform/check_consts/qualifs.rs
View file

@ -5,12 +5,11 @@
use rustc_errors::ErrorGuaranteed;
use rustc_hir::LangItem;
use rustc_infer::infer::TyCtxtInferExt;
use rustc_infer::traits::TraitEngine;
use rustc_middle::mir::*;
use rustc_middle::ty::{self, subst::SubstsRef, AdtDef, Ty};
use rustc_span::DUMMY_SP;
use rustc_trait_selection::traits::{
self, ImplSource, Obligation, ObligationCause, SelectionContext, TraitEngineExt,
self, ImplSource, Obligation, ObligationCause, SelectionContext,
};
use super::ConstCx;
@ -189,15 +188,8 @@ impl Qualif for NeedsNonConstDrop {
return false;
}
// If we successfully found one, then select all of the predicates
// implied by our const drop impl.
let mut fcx = <dyn TraitEngine<'tcx>>::new(cx.tcx);
for nested in impl_src.nested_obligations() {
fcx.register_predicate_obligation(&infcx, nested);
}
// If we had any errors, then it's bad
!fcx.select_all_or_error(&infcx).is_empty()
!traits::fully_solve_obligations(&infcx, impl_src.nested_obligations()).is_empty()
})
}