Skip to content

Commit 565ad1f

Browse files
committed
---
yaml --- r: 125962 b: refs/heads/try c: cf7a89f h: refs/heads/master v: v3
1 parent f33445f commit 565ad1f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: f2fa55903e378368ed9173560f03a0ef16e371c2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
5-
refs/heads/try: a43e7d5cb9b5725dd32376eeea41b4d23ab93160
5+
refs/heads/try: cf7a89f0c0935412f24d64c0ae2e202970124ff9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/macros.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
macro_rules! fail(
4141
() => ({
4242
// static requires less code at runtime, more constant data
43-
static file_line: (&'static str, uint) = (file!(), line!());
44-
::std::rt::begin_unwind_no_time_to_explain(&file_line)
43+
static FILE_LINE: (&'static str, uint) = (file!(), line!());
44+
::std::rt::begin_unwind_no_time_to_explain(&FILE_LINE)
4545
});
4646
($msg:expr) => ({
47-
static file_line: (&'static str, uint) = (file!(), line!());
48-
let (file, line) = file_line;
47+
static FILE_LINE: (&'static str, uint) = (file!(), line!());
48+
let (file, line) = FILE_LINE;
4949
::std::rt::begin_unwind($msg, file, line)
5050
});
5151
($fmt:expr, $($arg:tt)*) => ({
@@ -62,8 +62,8 @@ macro_rules! fail(
6262
// up with the number of calls to fail!()
6363
#[inline(always)]
6464
fn run_fmt(fmt: &::std::fmt::Arguments) -> ! {
65-
static file_line: (&'static str, uint) = (file!(), line!());
66-
::std::rt::begin_unwind_fmt(fmt, &file_line)
65+
static FILE_LINE: (&'static str, uint) = (file!(), line!());
66+
::std::rt::begin_unwind_fmt(fmt, &FILE_LINE)
6767
}
6868
format_args!(run_fmt, $fmt, $($arg)*)
6969
});

0 commit comments

Comments
 (0)