diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-12-25 16:54:30 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-12-25 16:54:30 +0530 |
| commit | 12f171b052c07d60760cabbc109d15188ce285ec (patch) | |
| tree | 8afb6543bf472286e76868fdf6c3078fc990aa16 /src/libstd/panic.rs | |
| parent | 711f11e8d607b3ecf297366fa704b5200709d12d (diff) | |
| parent | f1148a540a16ba4ba2635403a9b014da9683851b (diff) | |
| download | rust-12f171b052c07d60760cabbc109d15188ce285ec.tar.gz rust-12f171b052c07d60760cabbc109d15188ce285ec.zip | |
Rollup merge of #30485 - sfackler:panic-handler, r=alexcrichton
r? @alexcrichton
Diffstat (limited to 'src/libstd/panic.rs')
| -rw-r--r-- | src/libstd/panic.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 6e4ba337b08..1550d55d177 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -21,6 +21,8 @@ use sync::{Arc, Mutex, RwLock}; use sys_common::unwind; use thread::Result; +pub use panicking::{take_handler, set_handler, PanicInfo, Location}; + /// A marker trait which represents "panic safe" types in Rust. /// /// This trait is implemented by default for many types and behaves similarly in |