Auto merge of #127653 - matthiaskrgr:rollup-72bqgvp, r=matthiaskrgr · rust-lang/rust@5d76a13

@@ -16,9 +16,9 @@ use crate::delegate::SolverDelegate;

1616

use crate::solve::inspect::{self, ProofTreeBuilder};

1717

use crate::solve::search_graph::SearchGraph;

1818

use crate::solve::{

19-

search_graph, CanonicalInput, CanonicalResponse, Certainty, Goal, GoalEvaluationKind,

20-

GoalSource, MaybeCause, NestedNormalizationGoals, NoSolution, PredefinedOpaquesData,

21-

QueryResult, SolverMode, FIXPOINT_STEP_LIMIT,

19+

CanonicalInput, CanonicalResponse, Certainty, Goal, GoalEvaluationKind, GoalSource, MaybeCause,

20+

NestedNormalizationGoals, NoSolution, PredefinedOpaquesData, QueryResult, SolverMode,

21+

FIXPOINT_STEP_LIMIT,

2222

};

23232424

pub(super) mod canonical;

7272

/// new placeholders to the caller.

7373

pub(super) max_input_universe: ty::UniverseIndex,

747475-

pub(super) search_graph: &'a mut SearchGraph<I>,

75+

pub(super) search_graph: &'a mut SearchGraph<D>,

76767777

nested_goals: NestedGoals<I>,

7878

@@ -200,7 +200,7 @@ where

200200

generate_proof_tree: GenerateProofTree,

201201

f: impl FnOnce(&mut EvalCtxt<'_, D>) -> R,

202202

) -> (R, Option<inspect::GoalEvaluation<I>>) {

203-

let mut search_graph = search_graph::SearchGraph::new(delegate.solver_mode());

203+

let mut search_graph = SearchGraph::new(delegate.solver_mode());

204204205205

let mut ecx = EvalCtxt {

206206

delegate,

@@ -241,7 +241,7 @@ where

241241

/// and registering opaques from the canonicalized input.

242242

fn enter_canonical<R>(

243243

cx: I,

244-

search_graph: &'a mut search_graph::SearchGraph<I>,

244+

search_graph: &'a mut SearchGraph<D>,

245245

canonical_input: CanonicalInput<I>,

246246

canonical_goal_evaluation: &mut ProofTreeBuilder<D>,

247247

f: impl FnOnce(&mut EvalCtxt<'_, D>, Goal<I, I::Predicate>) -> R,

@@ -296,7 +296,7 @@ where

296296

#[instrument(level = "debug", skip(cx, search_graph, goal_evaluation), ret)]

297297

fn evaluate_canonical_goal(

298298

cx: I,

299-

search_graph: &'a mut search_graph::SearchGraph<I>,

299+

search_graph: &'a mut SearchGraph<D>,

300300

canonical_input: CanonicalInput<I>,

301301

goal_evaluation: &mut ProofTreeBuilder<D>,

302302

) -> QueryResult<I> {