Unrolled build for #154874

rust-timer · web-flow · commit ee80fbca3122 · 2026-04-22T11:45:01.000+02:00
Rollup merge of #154874 - cijiugechu:fix-const-closure-inherited-conditions, r=oli-obk Fix ICE for inherited const conditions on const closures Synchronize `evaluate_host_effect_for_fn_goal` with the behavior of `extract_fn_def_from_const_callable` in new solver. Closes #153861 .
diff --git a/compiler/rustc_trait_selection/src/traits/effects.rs b/compiler/rustc_trait_selection/src/traits/effects.rs
@@ -556,15 +556,8 @@ fn evaluate_host_effect_for_fn_goal<'tcx>(
 
         ty::Closure(def, args) => {
             // For now we limit ourselves to closures without binders. The next solver can handle them.
-            let sig =
-                args.as_closure().sig().no_bound_vars().ok_or(EvaluationFailure::NoSolution)?;
-            (
-                def,
-                tcx.mk_args_from_iter(
-                    [ty::GenericArg::from(*sig.inputs().get(0).unwrap()), sig.output().into()]
-                        .into_iter(),
-                ),
-            )
+            args.as_closure().sig().no_bound_vars().ok_or(EvaluationFailure::NoSolution)?;
+            (def, args)
         }
 
         // Everything else needs explicit impls or cannot have an impl
diff --git a/tests/ui/traits/const-traits/const-closure-inherited-const-condition.rs b/tests/ui/traits/const-traits/const-closure-inherited-const-condition.rs
@@ -0,0 +1,11 @@
+//@ check-pass
+//@ revisions: next old
+//@[next] compile-flags: -Znext-solver
+
+#![feature(const_closures, const_trait_impl)]
+
+const trait Foo {}
+
+const fn qux<T: [const] Foo>() { (const || {})() }
+
+fn main() {}
