diff options
| author | Michael Goulet <michael@errs.io> | 2023-05-31 01:02:32 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2023-06-06 18:43:06 +0000 |
| commit | e0acff796a9221bc4d6769e3db5bf158647ef0e1 (patch) | |
| tree | 2a8cabfad9e1e4173ec2d44871a81dd10180b6d2 /compiler/rustc_trait_selection/src/traits/select/mod.rs | |
| parent | 3572d7451d1062e8bccf310af6bbf6255091d296 (diff) | |
| download | rust-e0acff796a9221bc4d6769e3db5bf158647ef0e1.tar.gz rust-e0acff796a9221bc4d6769e3db5bf158647ef0e1.zip | |
New trait solver is a property of inference context
Diffstat (limited to 'compiler/rustc_trait_selection/src/traits/select/mod.rs')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/select/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/select/mod.rs b/compiler/rustc_trait_selection/src/traits/select/mod.rs index 42c1b629ac2..25e5b5e17de 100644 --- a/compiler/rustc_trait_selection/src/traits/select/mod.rs +++ b/compiler/rustc_trait_selection/src/traits/select/mod.rs @@ -539,7 +539,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> { self.evaluation_probe(|this| { let goal = this.infcx.resolve_vars_if_possible((obligation.predicate, obligation.param_env)); - let mut result = if this.tcx().trait_solver_next() { + let mut result = if this.infcx.next_trait_solver() { this.evaluate_predicates_recursively_in_new_solver([obligation.clone()])? } else { this.evaluate_predicate_recursively( @@ -593,7 +593,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> { where I: IntoIterator<Item = PredicateObligation<'tcx>> + std::fmt::Debug, { - if self.tcx().trait_solver_next() { + if self.infcx.next_trait_solver() { self.evaluate_predicates_recursively_in_new_solver(predicates) } else { let mut result = EvaluatedToOk; |
