Add a back-compat hack so that nightly code can still call Try::into_result

scottmcm · scottmcm · commit a77b588bf4d7 · 2021-02-21T13:00:14.000-08:00
diff --git a/library/core/src/ops/try.rs b/library/core/src/ops/try.rs
@@ -123,6 +123,15 @@ pub trait Try2021: FromResidual {
             ControlFlow::Break(r) => FromResidual::from_residual(r),
         }
     }
+
+    /// Hack so that calls to `Try::into_result` keep building on nightly for a while
+    #[unstable(feature = "try_trait", issue = "42327")]
+    fn into_result(self) -> Result<<Self as Try2015>::Ok, <Self as Try2015>::Error>
+    where
+        Self: Try2015,
+    {
+        <Self as Try2015>::into_result(self)
+    }
 }
 
 /// Allows you to pick with other types can be converted into your `Try` type.

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,15 @@ pub trait Try2021: FromResidual {`
`123`	`123`	`ControlFlow::Break(r) => FromResidual::from_residual(r),`
`124`	`124`	`}`
`125`	`125`	`}`
	`126`	`+`
	`127`	+ /// Hack so that calls to `Try::into_result` keep building on nightly for a while
	`128`	`+ #[unstable(feature = "try_trait", issue = "42327")]`
	`129`	`+ fn into_result(self) -> Result<<Self as Try2015>::Ok, <Self as Try2015>::Error>`
	`130`	`+ where`
	`131`	`+ Self: Try2015,`
	`132`	`+ {`
	`133`	`+ <Self as Try2015>::into_result(self)`
	`134`	`+ }`
`126`	`135`	`}`
`127`	`136`
`128`	`137`	/// Allows you to pick with other types can be converted into your `Try` type.