From 84666afb36365c3dafe0acfdcd17ea177f58af19 Mon Sep 17 00:00:00 2001
From: onestacked <chrisi.schrefl@gmail.com>
Date: Fri, 23 Sep 2022 20:17:31 +0200
Subject: [PATCH] Constify Residual behind const_try

---
 library/core/src/ops/control_flow.rs | 1 +
 library/core/src/option.rs           | 3 ++-
 library/core/src/result.rs           | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/library/core/src/ops/control_flow.rs b/library/core/src/ops/control_flow.rs
index 8d236a9fecae..72ebe653caff 100644
--- a/library/core/src/ops/control_flow.rs
+++ b/library/core/src/ops/control_flow.rs
@@ -126,6 +126,7 @@ impl<B, C> const ops::FromResidual for ControlFlow<B, C> {
 }
 
 #[unstable(feature = "try_trait_v2_residual", issue = "91285")]
+#[rustc_const_unstable(feature = "const_try", issue = "74935")]
 impl<B, C> const ops::Residual<C> for ControlFlow<B, convert::Infallible> {
     type TryType = ControlFlow<B, C>;
 }
diff --git a/library/core/src/option.rs b/library/core/src/option.rs
index 934175863630..96b16b13256c 100644
--- a/library/core/src/option.rs
+++ b/library/core/src/option.rs
@@ -2321,7 +2321,8 @@ impl<T> ops::FromResidual<ops::Yeet<()>> for Option<T> {
 }
 
 #[unstable(feature = "try_trait_v2_residual", issue = "91285")]
-impl<T> ops::Residual<T> for Option<convert::Infallible> {
+#[rustc_const_unstable(feature = "const_try", issue = "74935")]
+impl<T> const ops::Residual<T> for Option<convert::Infallible> {
     type TryType = Option<T>;
 }
 
diff --git a/library/core/src/result.rs b/library/core/src/result.rs
index 76eaa191f781..dc90e90402c8 100644
--- a/library/core/src/result.rs
+++ b/library/core/src/result.rs
@@ -2116,6 +2116,7 @@ impl<T, E, F: From<E>> ops::FromResidual<ops::Yeet<E>> for Result<T, F> {
 }
 
 #[unstable(feature = "try_trait_v2_residual", issue = "91285")]
-impl<T, E> ops::Residual<T> for Result<convert::Infallible, E> {
+#[rustc_const_unstable(feature = "const_try", issue = "74935")]
+impl<T, E> const ops::Residual<T> for Result<convert::Infallible, E> {
     type TryType = Result<T, E>;
 }