Auto merge of #127653 - matthiaskrgr:rollup-72bqgvp, r=matthiaskrgr · rust-lang/rust@5d76a13 (original) (raw)
`@@ -16,9 +16,9 @@ use crate::delegate::SolverDelegate;
`
16
16
`use crate::solve::inspect::{self, ProofTreeBuilder};
`
17
17
`use crate::solve::search_graph::SearchGraph;
`
18
18
`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,
`
22
22
`};
`
23
23
``
24
24
`pub(super) mod canonical;
`
72
72
`/// new placeholders to the caller.
`
73
73
`pub(super) max_input_universe: ty::UniverseIndex,
`
74
74
``
75
``
`-
pub(super) search_graph: &'a mut SearchGraph,
`
``
75
`+
pub(super) search_graph: &'a mut SearchGraph,
`
76
76
``
77
77
`nested_goals: NestedGoals,
`
78
78
``
`@@ -200,7 +200,7 @@ where
`
200
200
`generate_proof_tree: GenerateProofTree,
`
201
201
`f: impl FnOnce(&mut EvalCtxt<'_, D>) -> R,
`
202
202
`) -> (R, Option<inspect::GoalEvaluation>) {
`
203
``
`-
let mut search_graph = search_graph::SearchGraph::new(delegate.solver_mode());
`
``
203
`+
let mut search_graph = SearchGraph::new(delegate.solver_mode());
`
204
204
``
205
205
`let mut ecx = EvalCtxt {
`
206
206
` delegate,
`
`@@ -241,7 +241,7 @@ where
`
241
241
`/// and registering opaques from the canonicalized input.
`
242
242
`fn enter_canonical(
`
243
243
`cx: I,
`
244
``
`-
search_graph: &'a mut search_graph::SearchGraph,
`
``
244
`+
search_graph: &'a mut SearchGraph,
`
245
245
`canonical_input: CanonicalInput,
`
246
246
`canonical_goal_evaluation: &mut ProofTreeBuilder,
`
247
247
`f: impl FnOnce(&mut EvalCtxt<'_, D>, Goal<I, I::Predicate>) -> R,
`
`@@ -296,7 +296,7 @@ where
`
296
296
`#[instrument(level = "debug", skip(cx, search_graph, goal_evaluation), ret)]
`
297
297
`fn evaluate_canonical_goal(
`
298
298
`cx: I,
`
299
``
`-
search_graph: &'a mut search_graph::SearchGraph,
`
``
299
`+
search_graph: &'a mut SearchGraph,
`
300
300
`canonical_input: CanonicalInput,
`
301
301
`goal_evaluation: &mut ProofTreeBuilder,
`
302
302
`) -> QueryResult {
`