diff options
| author | bors <bors@rust-lang.org> | 2017-07-27 04:25:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-27 04:25:37 +0000 |
| commit | e574ba4994c00b1e166ce4e450b7b984e1bff5d4 (patch) | |
| tree | 222f3e6c234d44a78afc884451f14b4edd949340 /src/libstd/macros.rs | |
| parent | 4a42ff482367afa83b6cdb1fbfad2ee69f836f97 (diff) | |
| parent | 90ac6408baa80fcd7fa28bc98af6046dba8c4bbb (diff) | |
| download | rust-e574ba4994c00b1e166ce4e450b7b984e1bff5d4.tar.gz rust-e574ba4994c00b1e166ce4e450b7b984e1bff5d4.zip | |
Auto merge of #43477 - est31:master, r=alexcrichton
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.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 343c499b3ff..03db1e4f01c 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 |