---

yaml
---
r: 125960
b: refs/heads/try
c: f7ab07c
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: f2fa55903e378368ed9173560f03a0ef16e371c2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
-refs/heads/try: 4636b32a42ea3111f53048197092e7ac08e6f792
+refs/heads/try: f7ab07c7806bb4a7418f228c1cf266cdf011a878
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/macros.rs

@@ -33,7 +33,8 @@ macro_rules! fail(
         // up with the number of calls to fail!()
         #[inline(always)]
         fn run_fmt(fmt: &::std::fmt::Arguments) -> ! {
-            ::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)*)
     });

branches/try/src/libstd/macros.rs

@@ -38,12 +38,16 @@
 /// ```
 #[macro_export]
 macro_rules! fail(
-    () => (
-        ::std::rt::begin_unwind_no_time_to_explain(&(file!(), line!()))
-    );
-    ($msg:expr) => (
-        ::std::rt::begin_unwind($msg, file!(), line!())
-    );
+    () => ({
+        // 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)
+    });
+    ($msg:expr) => ({
+        static file_line: (&'static str, uint) = (file!(), line!());
+        let (file, line) = file_line;
+        ::std::rt::begin_unwind($msg, file, line)
+    });
     ($fmt:expr, $($arg:tt)*) => ({
         // a closure can't have return type !, so we need a full
         // function to pass to format_args!, *and* we need the
@@ -58,7 +62,8 @@ macro_rules! fail(
         // up with the number of calls to fail!()
         #[inline(always)]
         fn run_fmt(fmt: &::std::fmt::Arguments) -> ! {
-            ::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)*)
     });