rust-lang
diff --git a/‎compiler/rustc_trait_selection/src/solve/assembly/mod.rs‎
Lines changed: 3 additions & 1 deletion b/‎compiler/rustc_trait_selection/src/solve/assembly/mod.rs‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎tests/ui/traits/next-solver/normalize-async-closure-in-trait.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-async-closure-in-trait.rs‎ b/‎tests/ui/traits/next-solver/normalize-async-closure-in-trait.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-async-closure-in-trait.rs‎
diff --git a/‎tests/ui/traits/next-solver/normalize-param-env-1.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-1.rs‎ b/‎tests/ui/traits/next-solver/normalize-param-env-1.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-1.rs‎
diff --git a/‎tests/ui/traits/next-solver/normalize-param-env-2.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-2.rs‎ b/‎tests/ui/traits/next-solver/normalize-param-env-2.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-2.rs‎
diff --git a/‎tests/ui/traits/next-solver/normalize-param-env-2.stderr‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-2.stderr‎ b/‎tests/ui/traits/next-solver/normalize-param-env-2.stderr‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-2.stderr‎
diff --git a/‎tests/ui/traits/next-solver/normalize-param-env-3.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-3.rs‎ b/‎tests/ui/traits/next-solver/normalize-param-env-3.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-3.rs‎
diff --git a/‎tests/ui/traits/next-solver/normalize-param-env-4.next.stderr‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-4.next.stderr‎ b/‎tests/ui/traits/next-solver/normalize-param-env-4.next.stderr‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-4.next.stderr‎
diff --git a/‎tests/ui/traits/next-solver/normalize-param-env-4.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-4.rs‎ b/‎tests/ui/traits/next-solver/normalize-param-env-4.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-param-env-4.rs‎
diff --git a/‎tests/ui/traits/next-solver/normalize-path-for-method.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-path-for-method.rs‎ b/‎tests/ui/traits/next-solver/normalize-path-for-method.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-path-for-method.rs‎
diff --git a/‎tests/ui/traits/next-solver/normalize-rcvr-for-inherent.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-rcvr-for-inherent.rs‎ b/‎tests/ui/traits/next-solver/normalize-rcvr-for-inherent.rs‎ renamed to ‎tests/ui/traits/next-solver/normalize/normalize-rcvr-for-inherent.rs‎
@@ -274,7 +274,9 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
 
         let goal =
             goal.with(self.tcx(), goal.predicate.with_self_ty(self.tcx(), normalized_self_ty));
-        debug_assert_eq!(goal, self.resolve_vars_if_possible(goal));
+        // 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);
 
         let mut candidates = vec![];