diff options
Diffstat (limited to 'compiler/rustc_trait_selection/src/solve/inspect/build.rs')
| -rw-r--r-- | compiler/rustc_trait_selection/src/solve/inspect/build.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/compiler/rustc_trait_selection/src/solve/inspect/build.rs b/compiler/rustc_trait_selection/src/solve/inspect/build.rs index 35750598bc7..d750cd963de 100644 --- a/compiler/rustc_trait_selection/src/solve/inspect/build.rs +++ b/compiler/rustc_trait_selection/src/solve/inspect/build.rs @@ -9,10 +9,11 @@ use std::mem; use crate::solve::eval_ctxt::canonical; use crate::solve::{self, inspect, GenerateProofTree}; use rustc_middle::bug; +use rustc_next_trait_solver::infcx::SolverDelegate; use rustc_next_trait_solver::solve::{ CanonicalInput, Certainty, Goal, GoalSource, QueryInput, QueryResult, }; -use rustc_type_ir::{self as ty, InferCtxtLike, Interner}; +use rustc_type_ir::{self as ty, Interner}; /// The core data structure when building proof trees. /// @@ -34,9 +35,9 @@ use rustc_type_ir::{self as ty, InferCtxtLike, Interner}; /// trees. At the end of trait solving `ProofTreeBuilder::finalize` /// is called to recursively convert the whole structure to a /// finished proof tree. -pub(in crate::solve) struct ProofTreeBuilder<Infcx, I = <Infcx as InferCtxtLike>::Interner> +pub(in crate::solve) struct ProofTreeBuilder<Infcx, I = <Infcx as SolverDelegate>::Interner> where - Infcx: InferCtxtLike<Interner = I>, + Infcx: SolverDelegate<Interner = I>, I: Interner, { _infcx: PhantomData<Infcx>, @@ -232,7 +233,7 @@ impl<I: Interner> WipProbeStep<I> { } } -impl<Infcx: InferCtxtLike<Interner = I>, I: Interner> ProofTreeBuilder<Infcx> { +impl<Infcx: SolverDelegate<Interner = I>, I: Interner> ProofTreeBuilder<Infcx> { fn new(state: impl Into<DebugSolver<I>>) -> ProofTreeBuilder<Infcx> { ProofTreeBuilder { state: Some(Box::new(state.into())), _infcx: PhantomData } } |
