summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-08-31 08:51:53 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-12-09 07:19:17 -0800
commit0a13f1abafe70cddf34bf2b2ba3946c418ed6241 (patch)
tree83dc0df06aa7029c29aa4655e332e15b5f47929e /src/libstd/lib.rs
parent8864f2c83ac800881da34c3e835c931c081a8785 (diff)
downloadrust-0a13f1abafe70cddf34bf2b2ba3946c418ed6241.tar.gz
rust-0a13f1abafe70cddf34bf2b2ba3946c418ed6241.zip
std: Rename thread::catch_panic to panic::recover
This commit is an implementation of [RFC 1236] and [RFC 1323] which
rename the `thread::catch_panic` function to `panic::recover` while also
replacing the `Send + 'static` bounds with a new `PanicSafe` bound.

[RFC 1236]: https://github.com/rust-lang/rfcs/pull/1236
[RFC 1323]: https://github.com/rust-lang/rfcs/pull/1323

cc #27719
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 0385dff65d1..8e6c32ff2fc 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -248,6 +248,7 @@
 #![feature(link_args)]
 #![feature(linkage)]
 #![feature(macro_reexport)]
+#![feature(on_unimplemented)]
 #![feature(oom)]
 #![feature(optin_builtin_traits)]
 #![feature(placement_in_syntax)]
@@ -255,6 +256,7 @@
 #![feature(range_inclusive)]
 #![feature(raw)]
 #![feature(reflect_marker)]
+#![feature(shared)]
 #![feature(slice_bytes)]
 #![feature(slice_concat_ext)]
 #![feature(slice_patterns)]
@@ -424,6 +426,7 @@ pub mod fs;
 pub mod io;
 pub mod net;
 pub mod os;
+pub mod panic;
 pub mod path;
 pub mod process;
 pub mod sync;