Rollup merge of #155142 - nxsaken:const_residual_control_flow, r=fee1-dead

matthiaskrgr · web-flow · commit 11469dc9f574 · 2026-04-12T08:15:48.000+02:00
impl const Residual for ControlFlow Feature: #91285 (`try_trait_v2_residual`/`const_try_residual`) r? @fee1-dead
diff --git a/library/core/src/ops/control_flow.rs b/library/core/src/ops/control_flow.rs
@@ -134,7 +134,8 @@ impl<B, C> const ops::FromResidual<ControlFlow<B, convert::Infallible>> for Cont
 }
 
 #[unstable(feature = "try_trait_v2_residual", issue = "91285")]
-impl<B, C> ops::Residual<C> for ControlFlow<B, convert::Infallible> {
+#[rustc_const_unstable(feature = "const_try_residual", issue = "91285")]
+impl<B, C> const ops::Residual<C> for ControlFlow<B, convert::Infallible> {
     type TryType = ControlFlow<B, C>;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,8 @@ impl<B, C> const ops::FromResidual<ControlFlow<B, convert::Infallible>> for Cont`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`#[unstable(feature = "try_trait_v2_residual", issue = "91285")]`
`137`		`-impl<B, C> ops::Residual<C> for ControlFlow<B, convert::Infallible> {`
	`137`	`+#[rustc_const_unstable(feature = "const_try_residual", issue = "91285")]`
	`138`	`+impl<B, C> const ops::Residual<C> for ControlFlow<B, convert::Infallible> {`
`138`	`139`	`type TryType = ControlFlow<B, C>;`
`139`	`140`	`}`
`140`	`141`