From 02054ac8a1490211a5a6873fdefe186bd0758b7b Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sun, 29 Sep 2013 21:08:46 -0700
Subject: [PATCH] rfail: Remove usage of fmt!

---
 src/test/run-fail/args-fail.rs                      |  4 ++--
 src/test/run-fail/assert-macro-fmt.rs               |  2 +-
 src/test/run-fail/binop-fail-2.rs                   |  2 +-
 src/test/run-fail/binop-fail-3.rs                   |  2 +-
 src/test/run-fail/binop-fail.rs                     |  2 +-
 src/test/run-fail/bug-2470-bounds-check-overflow.rs | 10 +++++-----
 src/test/run-fail/bug-811.rs                        |  4 ++--
 src/test/run-fail/die-macro-expr.rs                 |  2 +-
 src/test/run-fail/die-macro-pure.rs                 |  2 +-
 src/test/run-fail/die-macro.rs                      |  2 +-
 src/test/run-fail/doublefail.rs                     |  4 ++--
 src/test/run-fail/explicit-fail-msg.rs              |  2 +-
 src/test/run-fail/explicit-fail.rs                  |  2 +-
 src/test/run-fail/expr-fn-fail.rs                   |  2 +-
 src/test/run-fail/expr-if-fail-fn.rs                |  2 +-
 src/test/run-fail/expr-if-fail.rs                   |  2 +-
 src/test/run-fail/expr-match-fail-fn.rs             |  2 +-
 src/test/run-fail/expr-match-fail.rs                |  2 +-
 src/test/run-fail/extern-fail.rs                    |  2 +-
 src/test/run-fail/fail-arg.rs                       |  4 ++--
 src/test/run-fail/fail-macro-explicit.rs            |  2 +-
 src/test/run-fail/fail-macro-fmt.rs                 |  2 +-
 src/test/run-fail/fail-macro-owned.rs               |  2 +-
 src/test/run-fail/fail-macro-static.rs              |  2 +-
 src/test/run-fail/fail-main.rs                      |  2 +-
 src/test/run-fail/fail-parens.rs                    |  4 ++--
 src/test/run-fail/fmt-fail.rs                       |  2 +-
 src/test/run-fail/for-each-loop-fail.rs             |  2 +-
 src/test/run-fail/if-check-fail.rs                  |  4 ++--
 src/test/run-fail/if-cond-bot.rs                    |  2 +-
 src/test/run-fail/issue-2156.rs                     |  2 +-
 src/test/run-fail/issue-2272.rs                     |  2 +-
 src/test/run-fail/issue-2444.rs                     |  2 +-
 src/test/run-fail/issue-3029.rs                     |  2 +-
 src/test/run-fail/issue-948.rs                      |  2 +-
 src/test/run-fail/linked-failure2.rs                |  2 +-
 src/test/run-fail/linked-failure3.rs                |  2 +-
 src/test/run-fail/match-bot-fail.rs                 |  2 +-
 src/test/run-fail/match-disc-bot.rs                 |  2 +-
 src/test/run-fail/match-wildcards.rs                |  8 ++++----
 src/test/run-fail/morestack1.rs                     |  2 +-
 src/test/run-fail/morestack2.rs                     |  2 +-
 src/test/run-fail/morestack3.rs                     |  2 +-
 src/test/run-fail/morestack4.rs                     |  2 +-
 src/test/run-fail/result-get-fail.rs                |  2 +-
 src/test/run-fail/rhs-type.rs                       |  2 +-
 src/test/run-fail/rt-set-exit-status-fail.rs        |  4 ++--
 src/test/run-fail/rt-set-exit-status-fail2.rs       |  4 ++--
 src/test/run-fail/rt-set-exit-status.rs             |  2 +-
 src/test/run-fail/run-unexported-tests.rs           |  2 +-
 src/test/run-fail/small-negative-indexing.rs        |  2 +-
 src/test/run-fail/spawnfail.rs                      |  2 +-
 src/test/run-fail/task-comm-recv-block.rs           |  4 ++--
 src/test/run-fail/tls-exit-status.rs                |  2 +-
 src/test/run-fail/unique-fail.rs                    |  2 +-
 src/test/run-fail/unwind-box-fn-unique.rs           |  6 +++---
 src/test/run-fail/unwind-box-res.rs                 |  4 ++--
 src/test/run-fail/unwind-box-str.rs                 |  4 ++--
 src/test/run-fail/unwind-box-trait.rs               |  4 ++--
 src/test/run-fail/unwind-box-unique-unique.rs       |  4 ++--
 src/test/run-fail/unwind-box-unique.rs              |  4 ++--
 src/test/run-fail/unwind-box-vec.rs                 |  4 ++--
 src/test/run-fail/unwind-box.rs                     |  2 +-
 src/test/run-fail/unwind-fail.rs                    |  2 +-
 src/test/run-fail/unwind-initializer-indirect.rs    |  2 +-
 src/test/run-fail/unwind-initializer.rs             |  2 +-
 src/test/run-fail/unwind-interleaved.rs             |  2 +-
 src/test/run-fail/unwind-iter.rs                    |  2 +-
 src/test/run-fail/unwind-iter2.rs                   |  2 +-
 src/test/run-fail/unwind-lambda.rs                  |  2 +-
 src/test/run-fail/unwind-match.rs                   |  2 +-
 src/test/run-fail/unwind-misc-1.rs                  |  2 +-
 src/test/run-fail/unwind-move.rs                    |  2 +-
 src/test/run-fail/unwind-nested.rs                  |  2 +-
 src/test/run-fail/unwind-partial-box.rs             |  2 +-
 src/test/run-fail/unwind-partial-unique.rs          |  2 +-
 src/test/run-fail/unwind-partial-vec.rs             |  2 +-
 src/test/run-fail/unwind-rec.rs                     |  2 +-
 src/test/run-fail/unwind-rec2.rs                    |  2 +-
 src/test/run-fail/unwind-resource-fail.rs           |  2 +-
 src/test/run-fail/unwind-resource-fail2.rs          |  4 ++--
 src/test/run-fail/unwind-resource-fail3.rs          |  2 +-
 src/test/run-fail/unwind-stacked.rs                 |  2 +-
 src/test/run-fail/unwind-tup.rs                     |  2 +-
 src/test/run-fail/unwind-tup2.rs                    |  2 +-
 src/test/run-fail/unwind-uninitialized.rs           |  2 +-
 src/test/run-fail/unwind-unique.rs                  |  2 +-
 src/test/run-fail/while-body-fails.rs               |  2 +-
 src/test/run-fail/while-fail.rs                     |  2 +-
 89 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/src/test/run-fail/args-fail.rs b/src/test/run-fail/args-fail.rs
index b803d7488b07..d936368cc33d 100644
--- a/src/test/run-fail/args-fail.rs
+++ b/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); }
diff --git a/src/test/run-fail/assert-macro-fmt.rs b/src/test/run-fail/assert-macro-fmt.rs
index 2159f68cc717..53a37c5d6844 100644
--- a/src/test/run-fail/assert-macro-fmt.rs
+++ b/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");
 }
diff --git a/src/test/run-fail/binop-fail-2.rs b/src/test/run-fail/binop-fail-2.rs
index a49f96fced51..1038d2025c78 100644
--- a/src/test/run-fail/binop-fail-2.rs
+++ b/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"); }
diff --git a/src/test/run-fail/binop-fail-3.rs b/src/test/run-fail/binop-fail-3.rs
index 150544f16af0..b46d5251e223 100644
--- a/src/test/run-fail/binop-fail-3.rs
+++ b/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(); }
diff --git a/src/test/run-fail/binop-fail.rs b/src/test/run-fail/binop-fail.rs
index a49f96fced51..1038d2025c78 100644
--- a/src/test/run-fail/binop-fail.rs
+++ b/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"); }
diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow.rs b/src/test/run-fail/bug-2470-bounds-check-overflow.rs
index 0fdaf31c5936..083ea5b8f190 100644
--- a/src/test/run-fail/bug-2470-bounds-check-overflow.rs
+++ b/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]);
     }
 }
diff --git a/src/test/run-fail/bug-811.rs b/src/test/run-fail/bug-811.rs
index 2a256b9a4e38..b41062043cfd 100644
--- a/src/test/run-fail/bug-811.rs
+++ b/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"); }
diff --git a/src/test/run-fail/die-macro-expr.rs b/src/test/run-fail/die-macro-expr.rs
index 8ff62d5a43d1..3310ffe909a7 100644
--- a/src/test/run-fail/die-macro-expr.rs
+++ b/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");
 }
diff --git a/src/test/run-fail/die-macro-pure.rs b/src/test/run-fail/die-macro-pure.rs
index bb62a7e8beff..6d0f5909c4de 100644
--- a/src/test/run-fail/die-macro-pure.rs
+++ b/src/test/run-fail/die-macro-pure.rs
@@ -1,7 +1,7 @@
 // error-pattern:test
 
 fn f() {
-    fail!("test");
+    fail2!("test");
 }
 
 fn main() {
diff --git a/src/test/run-fail/die-macro.rs b/src/test/run-fail/die-macro.rs
index 71cc7317e6ef..678ac6555804 100644
--- a/src/test/run-fail/die-macro.rs
+++ b/src/test/run-fail/die-macro.rs
@@ -1,5 +1,5 @@
 // error-pattern:test
 
 fn main() {
-    fail!("test");
+    fail2!("test");
 }
diff --git a/src/test/run-fail/doublefail.rs b/src/test/run-fail/doublefail.rs
index 1ceeee1b6ed1..ee59823e8ad2 100644
--- a/src/test/run-fail/doublefail.rs
+++ b/src/test/run-fail/doublefail.rs
@@ -12,6 +12,6 @@
 
 //error-pattern:One
 fn main() {
-    fail!("One");
-    fail!("Two");
+    fail2!("One");
+    fail2!("Two");
 }
diff --git a/src/test/run-fail/explicit-fail-msg.rs b/src/test/run-fail/explicit-fail-msg.rs
index ab8cea0a3051..c1d2e986f124 100644
--- a/src/test/run-fail/explicit-fail-msg.rs
+++ b/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");
 }
diff --git a/src/test/run-fail/explicit-fail.rs b/src/test/run-fail/explicit-fail.rs
index 8c204b66e365..78a407bbbd5f 100644
--- a/src/test/run-fail/explicit-fail.rs
+++ b/src/test/run-fail/explicit-fail.rs
@@ -12,4 +12,4 @@
 
 
 // error-pattern:explicit
-fn main() { fail!(); }
+fn main() { fail2!(); }
diff --git a/src/test/run-fail/expr-fn-fail.rs b/src/test/run-fail/expr-fn-fail.rs
index e645ea34df56..a8714fdbdc83 100644
--- a/src/test/run-fail/expr-fn-fail.rs
+++ b/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(); }
diff --git a/src/test/run-fail/expr-if-fail-fn.rs b/src/test/run-fail/expr-if-fail-fn.rs
index 99f798147f28..8ecc2cdf0f4f 100644
--- a/src/test/run-fail/expr-if-fail-fn.rs
+++ b/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; }
 
diff --git a/src/test/run-fail/expr-if-fail.rs b/src/test/run-fail/expr-if-fail.rs
index 73259e6e140f..50778f655604 100644
--- a/src/test/run-fail/expr-if-fail.rs
+++ b/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 }; }
diff --git a/src/test/run-fail/expr-match-fail-fn.rs b/src/test/run-fail/expr-match-fail-fn.rs
index 6476e57a35b8..98cc3c230a04 100644
--- a/src/test/run-fail/expr-match-fail-fn.rs
+++ b/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; }
 
diff --git a/src/test/run-fail/expr-match-fail.rs b/src/test/run-fail/expr-match-fail.rs
index 075f6f5b4b19..c8cab907d7d1 100644
--- a/src/test/run-fail/expr-match-fail.rs
+++ b/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!() } }; }
diff --git a/src/test/run-fail/extern-fail.rs b/src/test/run-fail/extern-fail.rs
index ce5ea56502cc..17059107c011 100644
--- a/src/test/run-fail/extern-fail.rs
+++ b/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!();
         };
     }
 }
diff --git a/src/test/run-fail/fail-arg.rs b/src/test/run-fail/fail-arg.rs
index 844bac9d3d03..29baa4b31704 100644
--- a/src/test/run-fail/fail-arg.rs
+++ b/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")); }
diff --git a/src/test/run-fail/fail-macro-explicit.rs b/src/test/run-fail/fail-macro-explicit.rs
index 13e3a6a31a8f..ca6abee03bfa 100644
--- a/src/test/run-fail/fail-macro-explicit.rs
+++ b/src/test/run-fail/fail-macro-explicit.rs
@@ -11,5 +11,5 @@
 // error-pattern:failed at 'explicit failure'
 
 fn main() {
-    fail!();
+    fail2!();
 }
diff --git a/src/test/run-fail/fail-macro-fmt.rs b/src/test/run-fail/fail-macro-fmt.rs
index 5fc51ac67458..90d9ff9b0ec8 100644
--- a/src/test/run-fail/fail-macro-fmt.rs
+++ b/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");
 }
diff --git a/src/test/run-fail/fail-macro-owned.rs b/src/test/run-fail/fail-macro-owned.rs
index e59f5bdcaa17..fa461fefb88c 100644
--- a/src/test/run-fail/fail-macro-owned.rs
+++ b/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");
 }
diff --git a/src/test/run-fail/fail-macro-static.rs b/src/test/run-fail/fail-macro-static.rs
index 688ca4ce7e57..f05a68a5fcb2 100644
--- a/src/test/run-fail/fail-macro-static.rs
+++ b/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");
 }
diff --git a/src/test/run-fail/fail-main.rs b/src/test/run-fail/fail-main.rs
index f007e03041c1..2691beed2725 100644
--- a/src/test/run-fail/fail-main.rs
+++ b/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"); }
diff --git a/src/test/run-fail/fail-parens.rs b/src/test/run-fail/fail-parens.rs
index 90a44e427593..79f46f47fb30 100644
--- a/src/test/run-fail/fail-parens.rs
+++ b/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!()) { () => {
         }
                      }
     }};
diff --git a/src/test/run-fail/fmt-fail.rs b/src/test/run-fail/fmt-fail.rs
index d34ca029023f..1c6298a6c8d2 100644
--- a/src/test/run-fail/fmt-fail.rs
+++ b/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); }
diff --git a/src/test/run-fail/for-each-loop-fail.rs b/src/test/run-fail/for-each-loop-fail.rs
index 3c9397fc07ff..032460d20796 100644
--- a/src/test/run-fail/for-each-loop-fail.rs
+++ b/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"); } }
diff --git a/src/test/run-fail/if-check-fail.rs b/src/test/run-fail/if-check-fail.rs
index f7d37d153297..e8a1cad53ad1 100644
--- a/src/test/run-fail/if-check-fail.rs
+++ b/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");
     }
 }
 
diff --git a/src/test/run-fail/if-cond-bot.rs b/src/test/run-fail/if-cond-bot.rs
index 9a36681da5f1..d596a11f1cbd 100644
--- a/src/test/run-fail/if-cond-bot.rs
+++ b/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") { } }
diff --git a/src/test/run-fail/issue-2156.rs b/src/test/run-fail/issue-2156.rs
index 863663334f8e..78422347f784 100644
--- a/src/test/run-fail/issue-2156.rs
+++ b/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!() } }
     }
 }
diff --git a/src/test/run-fail/issue-2272.rs b/src/test/run-fail/issue-2272.rs
index 5ce89bc18149..9b8ecca96a6f 100644
--- a/src/test/run-fail/issue-2272.rs
+++ b/src/test/run-fail/issue-2272.rs
@@ -22,5 +22,5 @@ fn main() {
         },
         a: ~0
     };
-    fail!();
+    fail2!();
 }
diff --git a/src/test/run-fail/issue-2444.rs b/src/test/run-fail/issue-2444.rs
index c1357988f7db..b15c54c7b6eb 100644
--- a/src/test/run-fail/issue-2444.rs
+++ b/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();
diff --git a/src/test/run-fail/issue-3029.rs b/src/test/run-fail/issue-3029.rs
index 44364007c067..5d20c49945e0 100644
--- a/src/test/run-fail/issue-3029.rs
+++ b/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";
 }
diff --git a/src/test/run-fail/issue-948.rs b/src/test/run-fail/issue-948.rs
index db954bc59466..39d741e5169e 100644
--- a/src/test/run-fail/issue-948.rs
+++ b/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};
 }
diff --git a/src/test/run-fail/linked-failure2.rs b/src/test/run-fail/linked-failure2.rs
index 52a67872d4cf..d99cfe40da43 100644
--- a/src/test/run-fail/linked-failure2.rs
+++ b/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::<()>();
diff --git a/src/test/run-fail/linked-failure3.rs b/src/test/run-fail/linked-failure3.rs
index f40eae20bc0b..fd330bba1c57 100644
--- a/src/test/run-fail/linked-failure3.rs
+++ b/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>();
diff --git a/src/test/run-fail/match-bot-fail.rs b/src/test/run-fail/match-bot-fail.rs
index a54422ef8f53..7b1d6bea499d 100644
--- a/src/test/run-fail/match-bot-fail.rs
+++ b/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);
 }
diff --git a/src/test/run-fail/match-disc-bot.rs b/src/test/run-fail/match-disc-bot.rs
index 13ccd118c618..9b38a381a58e 100644
--- a/src/test/run-fail/match-disc-bot.rs
+++ b/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(); }
diff --git a/src/test/run-fail/match-wildcards.rs b/src/test/run-fail/match-wildcards.rs
index 22613f45b3bc..535b3340a4d0 100644
--- a/src/test/run-fail/match-wildcards.rs
+++ b/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()); }
diff --git a/src/test/run-fail/morestack1.rs b/src/test/run-fail/morestack1.rs
index d3e3be6c2caa..35c19c47f528 100644
--- a/src/test/run-fail/morestack1.rs
+++ b/src/test/run-fail/morestack1.rs
@@ -14,7 +14,7 @@ fn getbig(i: int) {
     if i != 0 {
         getbig(i - 1);
     } else {
-        fail!();
+        fail2!();
     }
 }
 
diff --git a/src/test/run-fail/morestack2.rs b/src/test/run-fail/morestack2.rs
index 5ac309264003..9af45cebe687 100644
--- a/src/test/run-fail/morestack2.rs
+++ b/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!();
         }
     }
 }
diff --git a/src/test/run-fail/morestack3.rs b/src/test/run-fail/morestack3.rs
index e6f219710b37..fea915511613 100644
--- a/src/test/run-fail/morestack3.rs
+++ b/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!();
     }
 }
 
diff --git a/src/test/run-fail/morestack4.rs b/src/test/run-fail/morestack4.rs
index 02a65e91d044..a4df5e57923f 100644
--- a/src/test/run-fail/morestack4.rs
+++ b/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!();
     }
 }
 
diff --git a/src/test/run-fail/result-get-fail.rs b/src/test/run-fail/result-get-fail.rs
index 4f552bc8f421..c3f4250b0538 100644
--- a/src/test/run-fail/result-get-fail.rs
+++ b/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());
 }
diff --git a/src/test/run-fail/rhs-type.rs b/src/test/run-fail/rhs-type.rs
index ca267608025c..5e09536fb4d3 100644
--- a/src/test/run-fail/rhs-type.rs
+++ b/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};
 }
diff --git a/src/test/run-fail/rt-set-exit-status-fail.rs b/src/test/run-fail/rt-set-exit-status-fail.rs
index 6b5c2b554a4d..5c854825c28a 100644
--- a/src/test/run-fail/rt-set-exit-status-fail.rs
+++ b/src/test/run-fail/rt-set-exit-status-fail.rs
@@ -13,10 +13,10 @@
 use std::os;
 
 fn main() {
-    error!(~"whatever");
+    error2!("whatever");
     // Setting the exit status only works when the scheduler terminates
     // normally. In this case we're going to fail, so instead of of
     // returning 50 the process will return the typical rt failure code.
     os::set_exit_status(50);
-    fail!();
+    fail2!();
 }
diff --git a/src/test/run-fail/rt-set-exit-status-fail2.rs b/src/test/run-fail/rt-set-exit-status-fail2.rs
index 01f745850906..493420e3ee62 100644
--- a/src/test/run-fail/rt-set-exit-status-fail2.rs
+++ b/src/test/run-fail/rt-set-exit-status-fail2.rs
@@ -33,9 +33,9 @@ fn r(x:int) -> r {
 }
 
 fn main() {
-    error!(~"whatever");
+    error2!("whatever");
     do task::spawn {
       let _i = r(5);
     };
-    fail!();
+    fail2!();
 }
diff --git a/src/test/run-fail/rt-set-exit-status.rs b/src/test/run-fail/rt-set-exit-status.rs
index 4f71cdc67e9c..4dc1386d850d 100644
--- a/src/test/run-fail/rt-set-exit-status.rs
+++ b/src/test/run-fail/rt-set-exit-status.rs
@@ -13,7 +13,7 @@
 use std::os;
 
 fn main() {
-    error!(~"whatever");
+    error2!("whatever");
     // 101 is the code the runtime uses on task failure and the value
     // compiletest expects run-fail tests to return.
     os::set_exit_status(101);
diff --git a/src/test/run-fail/run-unexported-tests.rs b/src/test/run-fail/run-unexported-tests.rs
index e9d3c41faa6c..622e2e326e56 100644
--- a/src/test/run-fail/run-unexported-tests.rs
+++ b/src/test/run-fail/run-unexported-tests.rs
@@ -17,5 +17,5 @@ mod m {
     pub fn exported() { }
 
     #[test]
-    fn unexported() { fail!("runned an unexported test"); }
+    fn unexported() { fail2!("runned an unexported test"); }
 }
diff --git a/src/test/run-fail/small-negative-indexing.rs b/src/test/run-fail/small-negative-indexing.rs
index ee58f76fc99e..a016af24451a 100644
--- a/src/test/run-fail/small-negative-indexing.rs
+++ b/src/test/run-fail/small-negative-indexing.rs
@@ -15,5 +15,5 @@ use std::vec;
 fn main() {
     let v = vec::from_fn(1024u, {|n| n});
     // this should trip a bounds check
-    error!(v[-1i8]);
+    error2!("{:?}", v[-1i8]);
 }
diff --git a/src/test/run-fail/spawnfail.rs b/src/test/run-fail/spawnfail.rs
index 122ea901805b..dad8ead8d65a 100644
--- a/src/test/run-fail/spawnfail.rs
+++ b/src/test/run-fail/spawnfail.rs
@@ -17,7 +17,7 @@ use std::task;
 // We don't want to see any invalid reads
 fn main() {
     fn f() {
-        fail!();
+        fail2!();
     }
     task::spawn(|| f() );
 }
diff --git a/src/test/run-fail/task-comm-recv-block.rs b/src/test/run-fail/task-comm-recv-block.rs
index fb2d90e99cf1..840db545dec7 100644
--- a/src/test/run-fail/task-comm-recv-block.rs
+++ b/src/test/run-fail/task-comm-recv-block.rs
@@ -16,7 +16,7 @@ use std::task;
 
 fn goodfail() {
     task::deschedule();
-    fail!("goodfail");
+    fail2!("goodfail");
 }
 
 fn main() {
@@ -25,5 +25,5 @@ fn main() {
     // We shouldn't be able to get past this recv since there's no
     // message available
     let i: int = po.recv();
-    fail!("badfail");
+    fail2!("badfail");
 }
diff --git a/src/test/run-fail/tls-exit-status.rs b/src/test/run-fail/tls-exit-status.rs
index 1858ceb28364..419d8c1320f9 100644
--- a/src/test/run-fail/tls-exit-status.rs
+++ b/src/test/run-fail/tls-exit-status.rs
@@ -15,5 +15,5 @@ use std::os;
 
 fn main() {
     os::args();
-    fail!("please have a nonzero exit status");
+    fail2!("please have a nonzero exit status");
 }
diff --git a/src/test/run-fail/unique-fail.rs b/src/test/run-fail/unique-fail.rs
index 86fde5b7f978..d1d816f7f793 100644
--- a/src/test/run-fail/unique-fail.rs
+++ b/src/test/run-fail/unique-fail.rs
@@ -9,4 +9,4 @@
 // except according to those terms.
 
 // error-pattern: fail
-fn main() { ~fail!(); }
+fn main() { ~fail2!(); }
diff --git a/src/test/run-fail/unwind-box-fn-unique.rs b/src/test/run-fail/unwind-box-fn-unique.rs
index 38a72353a1e3..0050002a22e8 100644
--- a/src/test/run-fail/unwind-box-fn-unique.rs
+++ b/src/test/run-fail/unwind-box-fn-unique.rs
@@ -11,14 +11,14 @@
 // error-pattern:fail
 
 fn failfn() {
-    fail!();
+    fail2!();
 }
 
 fn main() {
     let y = ~0;
     let x: @~fn() = @(|| {
-        error!(y.clone());
+        error2!("{:?}", y.clone());
     });
     failfn();
-    error!(x);
+    error2!("{:?}", x);
 }
diff --git a/src/test/run-fail/unwind-box-res.rs b/src/test/run-fail/unwind-box-res.rs
index c8a3e77a18c4..02d2218f536d 100644
--- a/src/test/run-fail/unwind-box-res.rs
+++ b/src/test/run-fail/unwind-box-res.rs
@@ -13,7 +13,7 @@
 use std::cast;
 
 fn failfn() {
-    fail!();
+    fail2!();
 }
 
 struct r {
@@ -41,6 +41,6 @@ fn main() {
         cast::forget(i1);
         let x = @r(i1p);
         failfn();
-        error!(x);
+        error2!("{:?}", x);
     }
 }
diff --git a/src/test/run-fail/unwind-box-str.rs b/src/test/run-fail/unwind-box-str.rs
index 213220164f10..2086a23c6af7 100644
--- a/src/test/run-fail/unwind-box-str.rs
+++ b/src/test/run-fail/unwind-box-str.rs
@@ -11,11 +11,11 @@
 // error-pattern:fail
 
 fn failfn() {
-    fail!();
+    fail2!();
 }
 
 fn main() {
     let x = @~"hi";
     failfn();
-    error!(x);
+    error2!("{:?}", x);
 }
diff --git a/src/test/run-fail/unwind-box-trait.rs b/src/test/run-fail/unwind-box-trait.rs
index 2ed3b39a4457..b8534483fb52 100644
--- a/src/test/run-fail/unwind-box-trait.rs
+++ b/src/test/run-fail/unwind-box-trait.rs
@@ -11,7 +11,7 @@
 // error-pattern:fail
 
 fn failfn() {
-    fail!();
+    fail2!();
 }
 
 trait i {
@@ -25,5 +25,5 @@ impl i for ~int {
 fn main() {
     let x = @~0 as @i;
     failfn();
-    error!(x);
+    error2!("{:?}", x);
 }
diff --git a/src/test/run-fail/unwind-box-unique-unique.rs b/src/test/run-fail/unwind-box-unique-unique.rs
index 12b00f0c14b9..3abf5330e408 100644
--- a/src/test/run-fail/unwind-box-unique-unique.rs
+++ b/src/test/run-fail/unwind-box-unique-unique.rs
@@ -11,11 +11,11 @@
 // error-pattern:fail
 
 fn failfn() {
-    fail!();
+    fail2!();
 }
 
 fn main() {
     let x = @~~0;
     failfn();
-    error!(x);
+    error2!("{:?}", x);
 }
diff --git a/src/test/run-fail/unwind-box-unique.rs b/src/test/run-fail/unwind-box-unique.rs
index edc6ab9d984c..5b3bf74f89e2 100644
--- a/src/test/run-fail/unwind-box-unique.rs
+++ b/src/test/run-fail/unwind-box-unique.rs
@@ -11,11 +11,11 @@
 // error-pattern:fail
 
 fn failfn() {
-    fail!();
+    fail2!();
 }
 
 fn main() {
     let x = @~0;
     failfn();
-    error!(x);
+    error2!("{:?}", x);
 }
diff --git a/src/test/run-fail/unwind-box-vec.rs b/src/test/run-fail/unwind-box-vec.rs
index 0a579a8dbbfb..3b767839a0dd 100644
--- a/src/test/run-fail/unwind-box-vec.rs
+++ b/src/test/run-fail/unwind-box-vec.rs
@@ -11,11 +11,11 @@
 // error-pattern:fail
 
 fn failfn() {
-    fail!();
+    fail2!();
 }
 
 fn main() {
     let x = @~[0, 1, 2, 3, 4, 5];
     failfn();
-    error!(x);
+    error2!("{:?}", x);
 }
diff --git a/src/test/run-fail/unwind-box.rs b/src/test/run-fail/unwind-box.rs
index 21308945253b..0b144b6c1edd 100644
--- a/src/test/run-fail/unwind-box.rs
+++ b/src/test/run-fail/unwind-box.rs
@@ -11,7 +11,7 @@
 // error-pattern:fail
 
 fn failfn() {
-    fail!();
+    fail2!();
 }
 
 fn main() {
diff --git a/src/test/run-fail/unwind-fail.rs b/src/test/run-fail/unwind-fail.rs
index 4d4bc0d53eba..df6c2be860f7 100644
--- a/src/test/run-fail/unwind-fail.rs
+++ b/src/test/run-fail/unwind-fail.rs
@@ -12,5 +12,5 @@
 
 fn main() {
     @0;
-    fail!();
+    fail2!();
 }
diff --git a/src/test/run-fail/unwind-initializer-indirect.rs b/src/test/run-fail/unwind-initializer-indirect.rs
index fd1ab88ff964..8a71d1d34560 100644
--- a/src/test/run-fail/unwind-initializer-indirect.rs
+++ b/src/test/run-fail/unwind-initializer-indirect.rs
@@ -10,7 +10,7 @@
 
 // error-pattern:fail
 
-fn f() -> @int { fail!(); }
+fn f() -> @int { fail2!(); }
 
 fn main() {
     let _a: @int = f();
diff --git a/src/test/run-fail/unwind-initializer.rs b/src/test/run-fail/unwind-initializer.rs
index 0d1584f3dc8d..a4161ad424b1 100644
--- a/src/test/run-fail/unwind-initializer.rs
+++ b/src/test/run-fail/unwind-initializer.rs
@@ -12,6 +12,6 @@
 
 fn main() {
     let _a: @int = {
-        fail!();
+        fail2!();
     };
 }
diff --git a/src/test/run-fail/unwind-interleaved.rs b/src/test/run-fail/unwind-interleaved.rs
index 365204d5c9e4..cfd8d555c2e8 100644
--- a/src/test/run-fail/unwind-interleaved.rs
+++ b/src/test/run-fail/unwind-interleaved.rs
@@ -12,7 +12,7 @@
 
 fn a() { }
 
-fn b() { fail!(); }
+fn b() { fail2!(); }
 
 fn main() {
     let _x = ~[0];
diff --git a/src/test/run-fail/unwind-iter.rs b/src/test/run-fail/unwind-iter.rs
index 51c6cb3adf31..4c9125bde99c 100644
--- a/src/test/run-fail/unwind-iter.rs
+++ b/src/test/run-fail/unwind-iter.rs
@@ -14,7 +14,7 @@
 #[allow(unused_variable)];
 
 fn x(it: &fn(int)) {
-    fail!();
+    fail2!();
     it(0);
 }
 
diff --git a/src/test/run-fail/unwind-iter2.rs b/src/test/run-fail/unwind-iter2.rs
index 17936df6959f..11fbcfaff78c 100644
--- a/src/test/run-fail/unwind-iter2.rs
+++ b/src/test/run-fail/unwind-iter2.rs
@@ -16,5 +16,5 @@ fn x(it: &fn(int)) {
 }
 
 fn main() {
-    x(|_x| fail!() );
+    x(|_x| fail2!() );
 }
diff --git a/src/test/run-fail/unwind-lambda.rs b/src/test/run-fail/unwind-lambda.rs
index 65d9fce5ff5d..4857a38519c1 100644
--- a/src/test/run-fail/unwind-lambda.rs
+++ b/src/test/run-fail/unwind-lambda.rs
@@ -22,7 +22,7 @@ fn main() {
         let cheese = cheese.clone();
         let f: &fn() = || {
             let _chew = mush + cheese;
-            fail!("so yummy")
+            fail2!("so yummy")
         };
         f();
     });
diff --git a/src/test/run-fail/unwind-match.rs b/src/test/run-fail/unwind-match.rs
index a9761017c73f..c017ddc49f0f 100644
--- a/src/test/run-fail/unwind-match.rs
+++ b/src/test/run-fail/unwind-match.rs
@@ -15,7 +15,7 @@ fn test_box() {
 }
 fn test_str() {
   let res = match false { true => { ~"happy" },
-     _ => fail!("non-exhaustive match failure") };
+     _ => fail2!("non-exhaustive match failure") };
   assert_eq!(res, ~"happy");
 }
 fn main() {
diff --git a/src/test/run-fail/unwind-misc-1.rs b/src/test/run-fail/unwind-misc-1.rs
index d215927c7d03..dc5e5a3b9956 100644
--- a/src/test/run-fail/unwind-misc-1.rs
+++ b/src/test/run-fail/unwind-misc-1.rs
@@ -19,7 +19,7 @@ fn main() {
         arr.push(@~"key stuff");
         map.insert(arr.clone(), arr + &[@~"value stuff"]);
         if arr.len() == 5 {
-            fail!();
+            fail2!();
         }
     }
 }
diff --git a/src/test/run-fail/unwind-move.rs b/src/test/run-fail/unwind-move.rs
index 8f1b34d17cd9..626228cd2259 100644
--- a/src/test/run-fail/unwind-move.rs
+++ b/src/test/run-fail/unwind-move.rs
@@ -10,7 +10,7 @@
 
 // error-pattern:fail
 fn f(_a: @int) {
-    fail!();
+    fail2!();
 }
 
 fn main() {
diff --git a/src/test/run-fail/unwind-nested.rs b/src/test/run-fail/unwind-nested.rs
index f8a63be2e9ad..ae543c9a88c4 100644
--- a/src/test/run-fail/unwind-nested.rs
+++ b/src/test/run-fail/unwind-nested.rs
@@ -15,7 +15,7 @@ fn main() {
     {
         let _b = @0;
         {
-            fail!();
+            fail2!();
         }
     }
 }
diff --git a/src/test/run-fail/unwind-partial-box.rs b/src/test/run-fail/unwind-partial-box.rs
index 88f71a5ed7ce..933bd62bc0ca 100644
--- a/src/test/run-fail/unwind-partial-box.rs
+++ b/src/test/run-fail/unwind-partial-box.rs
@@ -10,7 +10,7 @@
 
 // error-pattern:fail
 
-fn f() -> ~[int] { fail!(); }
+fn f() -> ~[int] { fail2!(); }
 
 // Voodoo. In unwind-alt we had to do this to trigger the bug. Might
 // have been to do with memory allocation patterns.
diff --git a/src/test/run-fail/unwind-partial-unique.rs b/src/test/run-fail/unwind-partial-unique.rs
index e9bbbd46c03f..b627103485ca 100644
--- a/src/test/run-fail/unwind-partial-unique.rs
+++ b/src/test/run-fail/unwind-partial-unique.rs
@@ -10,7 +10,7 @@
 
 // error-pattern:fail
 
-fn f() -> ~[int] { fail!(); }
+fn f() -> ~[int] { fail2!(); }
 
 // Voodoo. In unwind-alt we had to do this to trigger the bug. Might
 // have been to do with memory allocation patterns.
diff --git a/src/test/run-fail/unwind-partial-vec.rs b/src/test/run-fail/unwind-partial-vec.rs
index 3d6d26937dba..348989659067 100644
--- a/src/test/run-fail/unwind-partial-vec.rs
+++ b/src/test/run-fail/unwind-partial-vec.rs
@@ -10,7 +10,7 @@
 
 // error-pattern:fail
 
-fn f() -> ~[int] { fail!(); }
+fn f() -> ~[int] { fail2!(); }
 
 // Voodoo. In unwind-alt we had to do this to trigger the bug. Might
 // have been to do with memory allocation patterns.
diff --git a/src/test/run-fail/unwind-rec.rs b/src/test/run-fail/unwind-rec.rs
index 016654500b4a..3858fe3923f1 100644
--- a/src/test/run-fail/unwind-rec.rs
+++ b/src/test/run-fail/unwind-rec.rs
@@ -11,7 +11,7 @@
 // error-pattern:fail
 
 fn build() -> ~[int] {
-    fail!();
+    fail2!();
 }
 
 struct Blk { node: ~[int] }
diff --git a/src/test/run-fail/unwind-rec2.rs b/src/test/run-fail/unwind-rec2.rs
index 49a35181a8b2..a5aaf46b4b2e 100644
--- a/src/test/run-fail/unwind-rec2.rs
+++ b/src/test/run-fail/unwind-rec2.rs
@@ -15,7 +15,7 @@ fn build1() -> ~[int] {
 }
 
 fn build2() -> ~[int] {
-    fail!();
+    fail2!();
 }
 
 struct Blk { node: ~[int], span: ~[int] }
diff --git a/src/test/run-fail/unwind-resource-fail.rs b/src/test/run-fail/unwind-resource-fail.rs
index 6526455b8e2e..5b9917979694 100644
--- a/src/test/run-fail/unwind-resource-fail.rs
+++ b/src/test/run-fail/unwind-resource-fail.rs
@@ -15,7 +15,7 @@ struct r {
 }
 
 impl Drop for r {
-    fn drop(&mut self) { fail!("squirrel") }
+    fn drop(&mut self) { fail2!("squirrel") }
 }
 
 fn r(i: int) -> r { r { i: i } }
diff --git a/src/test/run-fail/unwind-resource-fail2.rs b/src/test/run-fail/unwind-resource-fail2.rs
index 67e1d0e8f92a..652bf31dee40 100644
--- a/src/test/run-fail/unwind-resource-fail2.rs
+++ b/src/test/run-fail/unwind-resource-fail2.rs
@@ -16,7 +16,7 @@ struct r {
 }
 
 impl Drop for r {
-    fn drop(&mut self) { fail!("wombat") }
+    fn drop(&mut self) { fail2!("wombat") }
 }
 
 fn r(i: int) -> r { r { i: i } }
@@ -24,5 +24,5 @@ fn r(i: int) -> r { r { i: i } }
 fn main() {
     @0;
     let r = r(0);
-    fail!();
+    fail2!();
 }
diff --git a/src/test/run-fail/unwind-resource-fail3.rs b/src/test/run-fail/unwind-resource-fail3.rs
index 231f6e7b7d57..92b10cef3199 100644
--- a/src/test/run-fail/unwind-resource-fail3.rs
+++ b/src/test/run-fail/unwind-resource-fail3.rs
@@ -20,7 +20,7 @@ fn faily_box(i: @int) -> faily_box { faily_box { i: i } }
 #[unsafe_destructor]
 impl Drop for faily_box {
     fn drop(&mut self) {
-        fail!("quux");
+        fail2!("quux");
     }
 }
 
diff --git a/src/test/run-fail/unwind-stacked.rs b/src/test/run-fail/unwind-stacked.rs
index 8249807af74a..ab28cb8a9ee4 100644
--- a/src/test/run-fail/unwind-stacked.rs
+++ b/src/test/run-fail/unwind-stacked.rs
@@ -12,7 +12,7 @@
 
 fn f() {
     let _a = @0;
-    fail!();
+    fail2!();
 }
 
 fn g() {
diff --git a/src/test/run-fail/unwind-tup.rs b/src/test/run-fail/unwind-tup.rs
index 15fa3ceed535..efb69b9f9576 100644
--- a/src/test/run-fail/unwind-tup.rs
+++ b/src/test/run-fail/unwind-tup.rs
@@ -11,7 +11,7 @@
 // error-pattern:fail
 
 fn fold_local() -> @~[int]{
-    fail!();
+    fail2!();
 }
 
 fn main() {
diff --git a/src/test/run-fail/unwind-tup2.rs b/src/test/run-fail/unwind-tup2.rs
index 236ff8172207..20d394bafac8 100644
--- a/src/test/run-fail/unwind-tup2.rs
+++ b/src/test/run-fail/unwind-tup2.rs
@@ -15,7 +15,7 @@ fn fold_local() -> @~[int]{
 }
 
 fn fold_remote() -> @~[int]{
-    fail!();
+    fail2!();
 }
 
 fn main() {
diff --git a/src/test/run-fail/unwind-uninitialized.rs b/src/test/run-fail/unwind-uninitialized.rs
index d5a06ffb9036..d61a4927db8b 100644
--- a/src/test/run-fail/unwind-uninitialized.rs
+++ b/src/test/run-fail/unwind-uninitialized.rs
@@ -11,7 +11,7 @@
 // error-pattern:fail
 
 fn f() {
-    fail!();
+    fail2!();
 }
 
 fn main() {
diff --git a/src/test/run-fail/unwind-unique.rs b/src/test/run-fail/unwind-unique.rs
index 53b2a55602c2..9ede24d28c48 100644
--- a/src/test/run-fail/unwind-unique.rs
+++ b/src/test/run-fail/unwind-unique.rs
@@ -11,7 +11,7 @@
 // error-pattern:fail
 
 fn failfn() {
-    fail!();
+    fail2!();
 }
 
 fn main() {
diff --git a/src/test/run-fail/while-body-fails.rs b/src/test/run-fail/while-body-fails.rs
index 32e1425b28c8..c0a1033efe04 100644
--- a/src/test/run-fail/while-body-fails.rs
+++ b/src/test/run-fail/while-body-fails.rs
@@ -11,4 +11,4 @@
 #[allow(while_true)];
 
 // error-pattern:quux
-fn main() { let _x: int = { while true { fail!("quux"); } ; 8 } ; }
+fn main() { let _x: int = { while true { fail2!("quux"); } ; 8 } ; }
diff --git a/src/test/run-fail/while-fail.rs b/src/test/run-fail/while-fail.rs
index a0b437814fd8..e42cb5e778cf 100644
--- a/src/test/run-fail/while-fail.rs
+++ b/src/test/run-fail/while-fail.rs
@@ -12,5 +12,5 @@
 
 // error-pattern:giraffe
 fn main() {
-    fail!({ while true { fail!("giraffe") }; "clandestine" });
+    fail2!({ while true { fail2!("giraffe") }; "clandestine" });
 }