about summary refs log tree commit diff
path: root/src/libstd/panic.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-01-23 16:31:53 +0100
committerSimon Sapin <simon.sapin@exyr.org>2018-01-23 16:38:26 +0100
commit2f98f4b12b8fd5d93ffff3d7b98931b3f1f2b07a (patch)
treea6aad25ef4ae1b91c9ff51df6033959f87426788 /src/libstd/panic.rs
parent48a7ea9c4095e3218df39832dfc51a456534ecc9 (diff)
downloadrust-2f98f4b12b8fd5d93ffff3d7b98931b3f1f2b07a.tar.gz
rust-2f98f4b12b8fd5d93ffff3d7b98931b3f1f2b07a.zip
Move PanicInfo and Location to libcore
Per https://rust-lang.github.io/rfcs/2070-panic-implementation.html
Diffstat (limited to 'src/libstd/panic.rs')
-rw-r--r--src/libstd/panic.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs
index 560876006d3..566ef16f295 100644
--- a/src/libstd/panic.rs
+++ b/src/libstd/panic.rs
@@ -23,7 +23,10 @@ use sync::{Arc, Mutex, RwLock, atomic};
 use thread::Result;
 
 #[stable(feature = "panic_hooks", since = "1.10.0")]
-pub use panicking::{take_hook, set_hook, PanicInfo, Location};
+pub use panicking::{take_hook, set_hook};
+
+#[stable(feature = "panic_hooks", since = "1.10.0")]
+pub use core::panic::{PanicInfo, Location};
 
 /// A marker trait which represents "panic safe" types in Rust.
 ///