Update panic::recover usage

alexcrichton · May 10, 2016 · 166e453 · 166e453
1 parent 5398094
commit 166e453
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -67,7 +67,6 @@
 #![allow(trivial_numeric_casts, trivial_casts)]
 #![deny(missing_docs)]
 #![cfg_attr(test, deny(warnings))]
-#![cfg_attr(feature = "unstable", feature(recover, std_panic))]
 
 extern crate libc;
 extern crate url;

diff --git a/src/panic.rs b/src/panic.rs
@@ -6,12 +6,12 @@ thread_local!(static LAST_ERROR: RefCell<Option<Box<Any + Send>>> = {
 });
 
 #[cfg(feature = "unstable")]
-pub fn wrap<T, F: FnOnce() -> T + ::std::panic::RecoverSafe>(f: F) -> Option<T> {
+pub fn wrap<T, F: FnOnce() -> T + ::std::panic::UnwindSafe>(f: F) -> Option<T> {
     use std::panic;
     if LAST_ERROR.with(|slot| slot.borrow().is_some()) {
         return None
     }
-    match panic::recover(f) {
+    match panic::catch_unwind(f) {
         Ok(ret) => Some(ret),
         Err(e) => {
             LAST_ERROR.with(move |slot| {