]> git.lizzy.rs Git - rust.git/commitdiff
Constly impl TryV2 and FromResidual for Result
authorAlbin Hedman <albin9604@gmail.com>
Sat, 3 Jul 2021 22:58:32 +0000 (00:58 +0200)
committerAlbin Hedman <albin9604@gmail.com>
Wed, 15 Sep 2021 14:57:59 +0000 (16:57 +0200)
library/core/src/result.rs

index 092e6544342b7f4e2105ce21fd9b81d25d29bede..d3587a1b2b8d2e048e75ef267f2fa2e8496e3fd2 100644 (file)
@@ -1889,7 +1889,8 @@ fn from_iter<I: IntoIterator<Item = Result<A, E>>>(iter: I) -> Result<V, E> {
 }
 
 #[unstable(feature = "try_trait_v2", issue = "84277")]
-impl<T, E> ops::Try for Result<T, E> {
+#[rustc_const_unstable(feature = "const_convert", issue = "none")]
+impl<T, E> const ops::Try for Result<T, E> {
     type Output = T;
     type Residual = Result<convert::Infallible, E>;
 
@@ -1908,7 +1909,8 @@ fn branch(self) -> ControlFlow<Self::Residual, Self::Output> {
 }
 
 #[unstable(feature = "try_trait_v2", issue = "84277")]
-impl<T, E, F: From<E>> ops::FromResidual<Result<convert::Infallible, E>> for Result<T, F> {
+#[rustc_const_unstable(feature = "const_convert", issue = "none")]
+impl<T, E, F: From<E>> const ops::FromResidual<Result<convert::Infallible, E>> for Result<T, F> {
     #[inline]
     fn from_residual(residual: Result<convert::Infallible, E>) -> Self {
         match residual {