]> git.lizzy.rs Git - rust.git/commitdiff
Use new helper inside probe
authorWilco Kusee <wilcokusee@gmail.com>
Fri, 3 Feb 2023 09:04:15 +0000 (10:04 +0100)
committerWilco Kusee <wilcokusee@gmail.com>
Fri, 3 Feb 2023 09:04:15 +0000 (10:04 +0100)
compiler/rustc_trait_selection/src/solve/project_goals.rs

index 170b560d7b6a131d95305327c46f46c7be09177a..9f62f686af647f2c1a3f6a314954e89dbd804c81 100644 (file)
@@ -587,12 +587,8 @@ fn consider_builtin_discriminant_kind_candidate(
         goal: Goal<'tcx, Self>,
     ) -> QueryResult<'tcx> {
         let discriminant = goal.predicate.self_ty().discriminant_ty(ecx.tcx());
-        let nested_goals = ecx.infcx.eq(
-            goal.param_env,
-            goal.predicate.term.ty().expect("expected ty goal"),
-            discriminant,
-        )?;
-        ecx.evaluate_all_and_make_canonical_response(nested_goals)
+        ecx.infcx
+            .probe(|_| ecx.eq_term_and_make_canonical_response(goal, Certainty::Yes, discriminant))
     }
 }