diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/macros.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 9ce142836cf..f3f47e3923d 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -40,12 +40,12 @@ macro_rules! fail( () => ({ // static requires less code at runtime, more constant data - static file_line: (&'static str, uint) = (file!(), line!()); - ::std::rt::begin_unwind_no_time_to_explain(&file_line) + static FILE_LINE: (&'static str, uint) = (file!(), line!()); + ::std::rt::begin_unwind_no_time_to_explain(&FILE_LINE) }); ($msg:expr) => ({ - static file_line: (&'static str, uint) = (file!(), line!()); - let (file, line) = file_line; + static FILE_LINE: (&'static str, uint) = (file!(), line!()); + let (file, line) = FILE_LINE; ::std::rt::begin_unwind($msg, file, line) }); ($fmt:expr, $($arg:tt)*) => ({ @@ -62,8 +62,8 @@ macro_rules! fail( // up with the number of calls to fail!() #[inline(always)] fn run_fmt(fmt: &::std::fmt::Arguments) -> ! { - static file_line: (&'static str, uint) = (file!(), line!()); - ::std::rt::begin_unwind_fmt(fmt, &file_line) + static FILE_LINE: (&'static str, uint) = (file!(), line!()); + ::std::rt::begin_unwind_fmt(fmt, &FILE_LINE) } format_args!(run_fmt, $fmt, $($arg)*) }); |