Skip to content

Commit

Permalink
Use correct conventions for static
Browse files Browse the repository at this point in the history
  • Loading branch information
brson committed Jul 28, 2014
1 parent 53f0eae commit f49f157
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libcore/macros.rs
Expand Up @@ -33,8 +33,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!());
::core::failure::begin_unwind(fmt, &file_line)
static FILE_LINE: (&'static str, uint) = (file!(), line!());
::core::failure::begin_unwind(fmt, &FILE_LINE)
}
format_args!(run_fmt, $fmt, $($arg)*)
});
Expand Down

5 comments on commit f49f157

@bors
Copy link
Contributor

@bors bors commented on f49f157 Jul 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@f49f157

@bors
Copy link
Contributor

@bors bors commented on f49f157 Jul 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/fail = f49f157 into auto

@bors
Copy link
Contributor

@bors bors commented on f49f157 Jul 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/fail = f49f157 merged ok, testing candidate = 279a780

@bors
Copy link
Contributor

@bors bors commented on f49f157 Jul 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 279a780

Please sign in to comment.