w

Author: lcnr

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

@@ -399,19 +399,15 @@ where
             return (candidates, failed_candidate_info);
         };
 
+        let goal: Goal<I, G> = goal
+            .with(self.cx(), goal.predicate.with_replaced_self_ty(self.cx(), normalized_self_ty));
+
         if normalized_self_ty.is_ty_var() {
             debug!("self type has been normalized to infer");
-            self.try_assemble_bounds_via_registered_opaque(
-                goal,
-                normalized_self_ty,
-                &mut candidates,
-            );
+            self.try_assemble_bounds_via_registered_opaque(goal, &mut candidates);
             return (candidates, failed_candidate_info);
         }
 
-        let goal: Goal<I, G> = goal
-            .with(self.cx(), goal.predicate.with_replaced_self_ty(self.cx(), normalized_self_ty));
-
         // Vars that show up in the rest of the goal substs may have been constrained by
         // normalizing the self type as well, since type variables are not uniquified.
         let goal = self.resolve_vars_if_possible(goal);
@@ -959,9 +955,9 @@ where
     fn try_assemble_bounds_via_registered_opaque<G: GoalKind<D>>(
         &mut self,
         goal: Goal<I, G>,
-        self_ty: I::Ty,
         candidates: &mut Vec<Candidate<I>>,
     ) {
+        let self_ty = goal.predicate.self_ty();
         let mut is_hidden_type_of_alias = false;
         for alias_ty in self.find_sup_as_registered_opaque(self_ty) {
             is_hidden_type_of_alias = true;