proof tree cleanup 2/n

Author: lcnr

compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs

@@ -20,7 +20,7 @@ use crate::coherence;
 use crate::delegate::SolverDelegate;
 use crate::placeholder::BoundVarReplacer;
 use crate::resolve::eager_resolve_vars;
-use crate::solve::inspect::{self, ProofTreeBuilder};
+use crate::solve::inspect::{self, GoalEvaluationBuilder};
 use crate::solve::search_graph::SearchGraph;
 use crate::solve::ty::may_use_unstable_feature;
 use crate::solve::{
@@ -129,7 +129,7 @@ where
     // evaluation code.
     tainted: Result<(), NoSolution>,
 
-    pub(super) inspect: ProofTreeBuilder<D>,
+    pub(super) inspect: inspect::EvaluationStepBuilder<D>,
 }
 
 #[derive(PartialEq, Eq, Debug, Hash, Clone, Copy)]
@@ -292,7 +292,7 @@ where
             delegate,
             search_graph: &mut search_graph,
             nested_goals: Default::default(),
-            inspect: ProofTreeBuilder::new_noop(),
+            inspect: inspect::EvaluationStepBuilder::new_noop(),
 
             // Only relevant when canonicalizing the response,
             // which we don't do within this evaluation context.
@@ -324,7 +324,7 @@ where
         cx: I,
         search_graph: &'a mut SearchGraph<D>,
         canonical_input: CanonicalInput<I>,
-        canonical_goal_evaluation: &mut ProofTreeBuilder<D>,
+        canonical_goal_evaluation: &mut GoalEvaluationBuilder<D>,
         f: impl FnOnce(&mut EvalCtxt<'_, D>, Goal<I, I::Predicate>) -> R,
     ) -> R {
         let (ref delegate, input, var_values) = D::build_with_canonical(cx, &canonical_input);
@@ -439,7 +439,7 @@ where
             self.cx(),
             canonical_goal,
             self.step_kind_for_source(source),
-            &mut ProofTreeBuilder::new_noop(),
+            &mut GoalEvaluationBuilder::new_noop(),
         );
         let response = match canonical_result {
             Err(e) => return Err(e),
@@ -523,7 +523,7 @@ where
         let (goal, opaque_types) = eager_resolve_vars(self.delegate, (goal, opaque_types));
 
         let (orig_values, canonical_goal) = self.canonicalize_goal(goal, opaque_types);
-        let mut goal_evaluation = ProofTreeBuilder::new_goal_evaluation(goal, &orig_values);
+        let mut goal_evaluation = GoalEvaluationBuilder::new(goal, &orig_values);
         let canonical_result = self.search_graph.evaluate_goal(
             self.cx(),
             canonical_goal,