---

yaml
---
r: 81295
b: refs/heads/snap-stage3
c: 02054ac
h: refs/heads/master
i:
  81293: c25b601
  81291: c941c3c
  81287: 9cf0249
  81279: f0cc84b
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: ebf5f406ef6e291655ec9eca5aa8bd95775cc67c
+refs/heads/snap-stage3: 02054ac8a1490211a5a6873fdefe186bd0758b7b
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/run-fail/args-fail.rs

@@ -9,6 +9,6 @@
 // except according to those terms.
 
 // error-pattern:meep
-fn f(_a: int, _b: int, _c: @int) { fail!("moop"); }
+fn f(_a: int, _b: int, _c: @int) { fail2!("moop"); }
 
-fn main() { f(1, fail!("meep"), @42); }
+fn main() { f(1, fail2!("meep"), @42); }

branches/snap-stage3/src/test/run-fail/assert-macro-fmt.rs

@@ -11,5 +11,5 @@
 // error-pattern:failed at 'test-assert-fmt 42 rust'
 
 fn main() {
-    assert!(false, "test-assert-fmt %d %s", 42, "rust");
+    assert!(false, "test-assert-fmt {} {}", 42, "rust");
 }

branches/snap-stage3/src/test/run-fail/binop-fail-2.rs

@@ -9,5 +9,5 @@
 // except according to those terms.
 
 // error-pattern:quux
-fn my_err(s: ~str) -> ! { error!(s); fail!("quux"); }
+fn my_err(s: ~str) -> ! { error2!("{}", s); fail2!("quux"); }
 fn main() { 3u == my_err(~"bye"); }

branches/snap-stage3/src/test/run-fail/binop-fail-3.rs

@@ -9,5 +9,5 @@
 // except according to those terms.
 
 // error-pattern:quux
-fn foo() -> ! { fail!("quux"); }
+fn foo() -> ! { fail2!("quux"); }
 fn main() { foo() == foo(); }

branches/snap-stage3/src/test/run-fail/binop-fail.rs

@@ -9,5 +9,5 @@
 // except according to those terms.
 
 // error-pattern:quux
-fn my_err(s: ~str) -> ! { error!(s); fail!("quux"); }
+fn my_err(s: ~str) -> ! { error2!("{}", s); fail2!("quux"); }
 fn main() { 3u == my_err(~"bye"); }

branches/snap-stage3/src/test/run-fail/bug-2470-bounds-check-overflow.rs

@@ -24,13 +24,13 @@ fn main() {
     do x.as_imm_buf |p, _len| {
         let base = p as uint;
         let idx = base / sys::size_of::<uint>();
-        error!("ov1 base = 0x%x", base);
-        error!("ov1 idx = 0x%x", idx);
-        error!("ov1 sizeof::<uint>() = 0x%x", sys::size_of::<uint>());
-        error!("ov1 idx * sizeof::<uint>() = 0x%x",
+        error2!("ov1 base = 0x{:x}", base);
+        error2!("ov1 idx = 0x{:x}", idx);
+        error2!("ov1 sizeof::<uint>() = 0x{:x}", sys::size_of::<uint>());
+        error2!("ov1 idx * sizeof::<uint>() = 0x{:x}",
                idx * sys::size_of::<uint>());
 
         // This should fail.
-        error!("ov1 0x%x",  x[idx]);
+        error2!("ov1 0x{:x}",  x[idx]);
     }
 }

branches/snap-stage3/src/test/run-fail/bug-811.rs

@@ -19,6 +19,6 @@ struct chan_t<T> {
     port: port_id,
 }
 
-fn send<T:Send>(_ch: chan_t<T>, _data: T) { fail!(); }
+fn send<T:Send>(_ch: chan_t<T>, _data: T) { fail2!(); }
 
-fn main() { fail!("quux"); }
+fn main() { fail2!("quux"); }

branches/snap-stage3/src/test/run-fail/die-macro-expr.rs

@@ -1,5 +1,5 @@
 // error-pattern:test
 
 fn main() {
-    let _i: int = fail!("test");
+    let _i: int = fail2!("test");
 }

branches/snap-stage3/src/test/run-fail/die-macro-pure.rs

@@ -1,7 +1,7 @@
 // error-pattern:test
 
 fn f() {
-    fail!("test");
+    fail2!("test");
 }
 
 fn main() {

branches/snap-stage3/src/test/run-fail/die-macro.rs

@@ -1,5 +1,5 @@
 // error-pattern:test
 
 fn main() {
-    fail!("test");
+    fail2!("test");
 }

branches/snap-stage3/src/test/run-fail/doublefail.rs

@@ -12,6 +12,6 @@
 
 //error-pattern:One
 fn main() {
-    fail!("One");
-    fail!("Two");
+    fail2!("One");
+    fail2!("Two");
 }

branches/snap-stage3/src/test/run-fail/explicit-fail-msg.rs

@@ -15,5 +15,5 @@
 fn main() {
     let mut a = 1;
     if 1 == 1 { a = 2; }
-    fail!(~"woooo" + "o");
+    fail2!(~"woooo" + "o");
 }

branches/snap-stage3/src/test/run-fail/explicit-fail.rs

@@ -12,4 +12,4 @@
 
 
 // error-pattern:explicit
-fn main() { fail!(); }
+fn main() { fail2!(); }

branches/snap-stage3/src/test/run-fail/expr-fn-fail.rs

@@ -12,6 +12,6 @@
 
 
 // error-pattern:explicit failure
-fn f() -> ! { fail!() }
+fn f() -> ! { fail2!() }
 
 fn main() { f(); }

branches/snap-stage3/src/test/run-fail/expr-if-fail-fn.rs

@@ -12,7 +12,7 @@
 
 
 // error-pattern:explicit failure
-fn f() -> ! { fail!() }
+fn f() -> ! { fail2!() }
 
 fn g() -> int { let x = if true { f() } else { 10 }; return x; }
 

branches/snap-stage3/src/test/run-fail/expr-if-fail.rs

@@ -12,4 +12,4 @@
 
 
 // error-pattern:explicit failure
-fn main() { let _x = if false { 0 } else if true { fail!() } else { 10 }; }
+fn main() { let _x = if false { 0 } else if true { fail2!() } else { 10 }; }

branches/snap-stage3/src/test/run-fail/expr-match-fail-fn.rs

@@ -12,7 +12,7 @@
 
 
 // error-pattern:explicit failure
-fn f() -> ! { fail!() }
+fn f() -> ! { fail2!() }
 
 fn g() -> int { let x = match true { true => { f() } false => { 10 } }; return x; }
 

branches/snap-stage3/src/test/run-fail/expr-match-fail.rs

@@ -12,4 +12,4 @@
 
 
 // error-pattern:explicit failure
-fn main() { let _x = match true { false => { 0 } true => { fail!() } }; }
+fn main() { let _x = match true { false => { 0 } true => { fail2!() } }; }

branches/snap-stage3/src/test/run-fail/extern-fail.rs

@@ -45,7 +45,7 @@ fn main() {
         do task::spawn {
             let result = count(5u);
             info!("result = %?", result);
-            fail!();
+            fail2!();
         };
     }
 }

branches/snap-stage3/src/test/run-fail/fail-arg.rs

@@ -9,6 +9,6 @@
 // except according to those terms.
 
 // error-pattern:woe
-fn f(a: int) { info!(a); }
+fn f(a: int) { info2!("{}", a); }
 
-fn main() { f(fail!("woe")); }
+fn main() { f(fail2!("woe")); }

branches/snap-stage3/src/test/run-fail/fail-macro-explicit.rs

@@ -11,5 +11,5 @@
 // error-pattern:failed at 'explicit failure'
 
 fn main() {
-    fail!();
+    fail2!();
 }

branches/snap-stage3/src/test/run-fail/fail-macro-fmt.rs

@@ -11,5 +11,5 @@
 // error-pattern:failed at 'test-fail-fmt 42 rust'
 
 fn main() {
-    fail!("test-fail-fmt %d %s", 42, "rust");
+    fail2!("test-fail-fmt {} {}", 42, "rust");
 }

branches/snap-stage3/src/test/run-fail/fail-macro-owned.rs

@@ -11,5 +11,5 @@
 // error-pattern:failed at 'test-fail-owned'
 
 fn main() {
-    fail!("test-fail-owned");
+    fail2!("test-fail-owned");
 }

branches/snap-stage3/src/test/run-fail/fail-macro-static.rs

@@ -11,5 +11,5 @@
 // error-pattern:failed at 'test-fail-static'
 
 fn main() {
-    fail!("test-fail-static");
+    fail2!("test-fail-static");
 }

branches/snap-stage3/src/test/run-fail/fail-main.rs

@@ -10,4 +10,4 @@
 
 // error-pattern:moop
 extern mod extra;
-fn main() { fail!("moop"); }
+fn main() { fail2!("moop"); }

branches/snap-stage3/src/test/run-fail/fail-parens.rs

@@ -13,8 +13,8 @@
 // error-pattern:oops
 
 fn bigfail() {
-    while (fail!("oops")) { if (fail!()) {
-        match (fail!()) { () => {
+    while (fail2!("oops")) { if (fail2!()) {
+        match (fail2!()) { () => {
         }
                      }
     }};

branches/snap-stage3/src/test/run-fail/fmt-fail.rs

@@ -11,4 +11,4 @@
 // error-pattern:meh
 extern mod extra;
 
-fn main() { let str_var: ~str = ~"meh"; fail!(fmt!("%s", str_var)); }
+fn main() { let str_var: ~str = ~"meh"; fail2!("{}", str_var); }

branches/snap-stage3/src/test/run-fail/for-each-loop-fail.rs

@@ -11,4 +11,4 @@
 // error-pattern:moop
 extern mod extra;
 
-fn main() { for _ in range(0u, 10u) { fail!("moop"); } }
+fn main() { for _ in range(0u, 10u) { fail2!("moop"); } }

branches/snap-stage3/src/test/run-fail/if-check-fail.rs

@@ -17,9 +17,9 @@ fn even(x: uint) -> bool {
 
 fn foo(x: uint) {
     if even(x) {
-        info!(x);
+        info2!("{}", x);
     } else {
-        fail!("Number is odd");
+        fail2!("Number is odd");
     }
 }
 

branches/snap-stage3/src/test/run-fail/if-cond-bot.rs

@@ -9,5 +9,5 @@
 // except according to those terms.
 
 // error-pattern:quux
-fn my_err(s: ~str) -> ! { error!(s); fail!("quux"); }
+fn my_err(s: ~str) -> ! { error2!("{}", s); fail2!("quux"); }
 fn main() { if my_err(~"bye") { } }

branches/snap-stage3/src/test/run-fail/issue-2156.rs

@@ -19,6 +19,6 @@ use std::io;
 
 fn main() {
     do io::with_str_reader(~"") |rdr| {
-        match rdr.read_char() { '=' => { } _ => { fail!() } }
+        match rdr.read_char() { '=' => { } _ => { fail2!() } }
     }
 }

branches/snap-stage3/src/test/run-fail/issue-2272.rs

@@ -22,5 +22,5 @@ fn main() {
         },
         a: ~0
     };
-    fail!();
+    fail2!();
 }

branches/snap-stage3/src/test/run-fail/issue-2444.rs

@@ -15,7 +15,7 @@ use extra::arc;
 
 enum e<T> { e(arc::Arc<T>) }
 
-fn foo() -> e<int> {fail!();}
+fn foo() -> e<int> {fail2!();}
 
 fn main() {
    let _f = foo();

branches/snap-stage3/src/test/run-fail/issue-3029.rs

@@ -16,7 +16,7 @@
 fn main() {
     let mut x = ~[];
     let y = ~[3];
-    fail!("so long");
+    fail2!("so long");
     x.push_all_move(y);
     ~"good" + ~"bye";
 }

branches/snap-stage3/src/test/run-fail/issue-948.rs

@@ -16,5 +16,5 @@ struct Point { x: int, y: int }
 
 fn main() {
     let origin = Point {x: 0, y: 0};
-    let f: Point = Point {x: (fail!("beep boop")),.. origin};
+    let f: Point = Point {x: (fail2!("beep boop")),.. origin};
 }

branches/snap-stage3/src/test/run-fail/linked-failure2.rs

@@ -16,7 +16,7 @@
 use std::comm;
 use std::task;
 
-fn child() { fail!(); }
+fn child() { fail2!(); }
 
 fn main() {
     let (p, _c) = comm::stream::<()>();

branches/snap-stage3/src/test/run-fail/linked-failure3.rs

@@ -16,7 +16,7 @@
 use std::comm;
 use std::task;
 
-fn grandchild() { fail!("grandchild dies"); }
+fn grandchild() { fail2!("grandchild dies"); }
 
 fn child() {
     let (p, _c) = comm::stream::<int>();

branches/snap-stage3/src/test/run-fail/match-bot-fail.rs

@@ -17,6 +17,6 @@ fn foo(s: ~str) { }
 
 fn main() {
     let i =
-        match Some::<int>(3) { None::<int> => { fail!() } Some::<int>(_) => { fail!() } };
+        match Some::<int>(3) { None::<int> => { fail2!() } Some::<int>(_) => { fail2!() } };
     foo(i);
 }

branches/snap-stage3/src/test/run-fail/match-disc-bot.rs

@@ -9,6 +9,6 @@
 // except according to those terms.
 
 // error-pattern:quux
-fn f() -> ! { fail!("quux") }
+fn f() -> ! { fail2!("quux") }
 fn g() -> int { match f() { true => { 1 } false => { 0 } } }
 fn main() { g(); }

branches/snap-stage3/src/test/run-fail/match-wildcards.rs

@@ -11,10 +11,10 @@
 // error-pattern:squirrelcupcake
 fn cmp() -> int {
     match (Some('a'), None::<char>) {
-        (Some(_), _) => { fail!("squirrelcupcake"); }
-        (_, Some(_)) => { fail!(); }
-        _                    => { fail!("wat"); }
+        (Some(_), _) => { fail2!("squirrelcupcake"); }
+        (_, Some(_)) => { fail2!(); }
+        _                    => { fail2!("wat"); }
     }
 }
 
-fn main() { error!(cmp()); }
+fn main() { error2!("{}", cmp()); }

branches/snap-stage3/src/test/run-fail/morestack1.rs

@@ -14,7 +14,7 @@ fn getbig(i: int) {
     if i != 0 {
         getbig(i - 1);
     } else {
-        fail!();
+        fail2!();
     }
 }
 

branches/snap-stage3/src/test/run-fail/morestack2.rs

@@ -35,7 +35,7 @@ fn getbig_call_c_and_fail(i: int) {
     } else {
         unsafe {
             rustrt::rust_get_argc();
-            fail!();
+            fail2!();
         }
     }
 }

branches/snap-stage3/src/test/run-fail/morestack3.rs

@@ -22,7 +22,7 @@ fn getbig_and_fail(i: int) {
     if i != 0 {
         getbig_and_fail(i - 1);
     } else {
-        fail!();
+        fail2!();
     }
 }
 

branches/snap-stage3/src/test/run-fail/morestack4.rs

@@ -22,7 +22,7 @@ fn getbig_and_fail(i: int) {
     if i != 0 {
         getbig_and_fail(i - 1);
     } else {
-        fail!();
+        fail2!();
     }
 }
 

branches/snap-stage3/src/test/run-fail/result-get-fail.rs

@@ -13,5 +13,5 @@
 use std::result;
 
 fn main() {
-    error!(result::Err::<int,~str>(~"kitty").unwrap());
+    error2!("{:?}", result::Err::<int,~str>(~"kitty").unwrap());
 }

branches/snap-stage3/src/test/run-fail/rhs-type.rs

@@ -18,6 +18,6 @@
 struct T { t: ~str }
 
 fn main() {
-    let pth = fail!("bye");
+    let pth = fail2!("bye");
     let _rs: T = T {t: pth};
 }