diff options
| author | est31 <MTest31@outlook.com> | 2017-06-27 04:26:52 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2017-07-02 13:53:29 +0200 |
| commit | da887074fc70a9f8d2afec8dbe6e2eeea6fc1406 (patch) | |
| tree | 8c9777a4efcf37736d7ef89aa6f273c61968a5ac /src/libstd/macros.rs | |
| parent | c3a130cffca55c650c4a6d2de77c3138cf74c3f8 (diff) | |
| download | rust-da887074fc70a9f8d2afec8dbe6e2eeea6fc1406.tar.gz rust-da887074fc70a9f8d2afec8dbe6e2eeea6fc1406.zip | |
Output line column info when panicking
Diffstat (limited to 'src/libstd/macros.rs')
| -rw-r--r-- | src/libstd/macros.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 9a4c5ec8f6b..6eb9faacf7f 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -41,10 +41,10 @@ macro_rules! panic { panic!("explicit panic") }); ($msg:expr) => ({ - $crate::rt::begin_panic($msg, { + $crate::rt::begin_panic_new($msg, { // static requires less code at runtime, more constant data - static _FILE_LINE: (&'static str, u32) = (file!(), line!()); - &_FILE_LINE + static _FILE_LINE_COL: (&'static str, u32, u32) = (file!(), line!(), column!()); + &_FILE_LINE_COL }) }); ($fmt:expr, $($arg:tt)+) => ({ @@ -53,8 +53,8 @@ macro_rules! panic { // used inside a dead function. Just `#[allow(dead_code)]` is // insufficient, since the user may have // `#[forbid(dead_code)]` and which cannot be overridden. - static _FILE_LINE: (&'static str, u32) = (file!(), line!()); - &_FILE_LINE + static _FILE_LINE_COL: (&'static str, u32, u32) = (file!(), line!(), column!()); + &_FILE_LINE_COL }) }); } |
