w

Author: lcnr

compiler/rustc_next_trait_solver/src/solve/effect_goals.rs

@@ -5,7 +5,6 @@ use rustc_type_ir::fast_reject::DeepRejectCtxt;
 use rustc_type_ir::inherent::*;
 use rustc_type_ir::lang_items::TraitSolverLangItem;
 use rustc_type_ir::solve::SizedTraitKind;
-use rustc_type_ir::solve::inspect::ProbeKind;
 use rustc_type_ir::{self as ty, Interner, elaborate};
 use tracing::instrument;
 

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

@@ -472,7 +472,7 @@ where
         &mut self,
         goal: Goal<I, I::Predicate>,
     ) -> Result<Option<TraitGoalProvenVia>, NoSolution> {
-        let (orig_values, canonical_goal) = self.canonicalize_goal(goal);
+        let (_, canonical_goal) = self.canonicalize_goal(goal);
         let canonical_response = EvalCtxt::evaluate_canonical_goal(
             self.cx(),
             self.search_graph,

compiler/rustc_next_trait_solver/src/solve/mod.rs

@@ -363,9 +363,10 @@ fn response_no_constraints_raw<I: Interner>(
         variables,
         value: Response {
             var_values: ty::CanonicalVarValues::make_identity(cx, variables),
+            // Cycles start out without knowing how the trait goal was proven.
+            trait_goal_proven_via: None,
             // FIXME: maybe we should store the "no response" version in cx, like
             // we do for cx.types and stuff.
-            trait_goal_proven_via: None,
             external_constraints: cx.mk_external_constraints(ExternalConstraintsData::default()),
             certainty,
         },