Auto merge of #31728 - Amanieu:recoversafe_into_inner, r=alexcrichton

bors · bors · commit f075698ea597 · 2016-02-18T10:35:25.000Z
This allows a `FnOnce` to be wrapped in an `AssertRecoverSafe`.
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs
@@ -193,6 +193,12 @@ impl<T> AssertRecoverSafe<T> {
     pub fn new(t: T) -> AssertRecoverSafe<T> {
         AssertRecoverSafe(t)
     }
+
+    /// Consumes the `AssertRecoverSafe`, returning the wrapped value.
+    #[unstable(feature = "recover", reason = "awaiting feedback", issue = "27719")]
+    pub fn into_inner(self) -> T {
+        self.0
+    }
 }
 
 impl<T> Deref for AssertRecoverSafe<T> {

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,12 @@ impl<T> AssertRecoverSafe<T> {`
`193`	`193`	`pub fn new(t: T) -> AssertRecoverSafe<T> {`
`194`	`194`	`AssertRecoverSafe(t)`
`195`	`195`	`}`
	`196`	`+`
	`197`	+ /// Consumes the `AssertRecoverSafe`, returning the wrapped value.
	`198`	`+ #[unstable(feature = "recover", reason = "awaiting feedback", issue = "27719")]`
	`199`	`+ pub fn into_inner(self) -> T {`
	`200`	`+ self.0`
	`201`	`+ }`
`196`	`202`	`}`
`197`	`203`
`198`	`204`	`impl<T> Deref for AssertRecoverSafe<T> {`