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

Call fully_solve_obligations instead of repeating code

Browse Source
This commit is contained in:
Santiago Pastorino 2022-11-17 11:44:24 -03:00
parent ad094cdceb
commit 5b3a06a3c2
No known key found for this signature in database
GPG Key ID: 8131A24E0C79EFAF
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/rustc_trait_selection/src/traits/mod.rs
View File

@ -402,9 +402,7 @@ pub fn fully_solve_obligation<'tcx>(
infcx: &InferCtxt<'tcx>, infcx: &InferCtxt<'tcx>,
obligation: PredicateObligation<'tcx>, obligation: PredicateObligation<'tcx>,
) -> Vec<FulfillmentError<'tcx>> { ) -> Vec<FulfillmentError<'tcx>> {
let ocx = ObligationCtxt::new(infcx); fully_solve_obligations(infcx, [obligation])
ocx.register_obligation(obligation);
ocx.select_all_or_error()
} }
/// Process a set of obligations (and any nested obligations that come from them) /// Process a set of obligations (and any nested obligations that come from them)
@ -428,9 +426,16 @@ pub fn fully_solve_bound<'tcx>(
ty: Ty<'tcx>, ty: Ty<'tcx>,
bound: DefId, bound: DefId,
) -> Vec<FulfillmentError<'tcx>> { ) -> Vec<FulfillmentError<'tcx>> {
let ocx = ObligationCtxt::new(infcx); let tcx = infcx.tcx;
ocx.register_bound(cause, param_env, ty, bound); let trait_ref = ty::TraitRef { def_id: bound, substs: tcx.mk_substs_trait(ty, []) };
ocx.select_all_or_error() let obligation = Obligation {
cause,
recursion_depth: 0,
param_env,
predicate: ty::Binder::dummy(trait_ref).without_const().to_predicate(tcx),
};
fully_solve_obligation(infcx, obligation)
} }
/// Normalizes the predicates and checks whether they hold in an empty environment. If this /// Normalizes the predicates and checks whether they hold in an empty environment. If this