about summary refs log tree commit diff
path: root/src/libstd/macros.rs
diff options
context:
space:
mode:
authorest31 <MTest31@outlook.com>2017-07-25 22:10:10 +0200
committerest31 <MTest31@outlook.com>2017-07-25 22:10:10 +0200
commit90ac6408baa80fcd7fa28bc98af6046dba8c4bbb (patch)
tree8a770ed8d696edd657aab041df0345b2b02d2d46 /src/libstd/macros.rs
parentc417ee9ae8c30ac307c58591da46cf62e91caac1 (diff)
downloadrust-90ac6408baa80fcd7fa28bc98af6046dba8c4bbb.tar.gz
rust-90ac6408baa80fcd7fa28bc98af6046dba8c4bbb.zip
Switch to begin_panic again
In https://github.com/rust-lang/rust/pull/42938 we made the compiler
emit a call to begin_panic_new in order to pass column info to it. Now
with stage0 updated (https://github.com/rust-lang/rust/pull/43320),
we can safely change begin_panic and start emitting calls for it again.
Diffstat (limited to 'src/libstd/macros.rs')
-rw-r--r--src/libstd/macros.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index 6ad22820a7d..44e8a23d353 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -46,7 +46,7 @@ macro_rules! panic {
         panic!("explicit panic")
     });
     ($msg:expr) => ({
-        $crate::rt::begin_panic_new($msg, {
+        $crate::rt::begin_panic($msg, {
             // static requires less code at runtime, more constant data
             static _FILE_LINE_COL: (&'static str, u32, u32) = (file!(), line!(), column!());
             &_FILE_LINE_COL