diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-10-21 13:08:31 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-10-22 08:09:56 -0700 |
| commit | daf5f5a4d10513ff42e79fa7ef8819b170f3a13d (patch) | |
| tree | 7a07a79c43e02debcc6bbb33d90a5e41b70119e6 /src/test | |
| parent | 15a6bdebab4e7b811b9a902e3f8ed225c59af06e (diff) | |
| download | rust-daf5f5a4d10513ff42e79fa7ef8819b170f3a13d.tar.gz rust-daf5f5a4d10513ff42e79fa7ef8819b170f3a13d.zip | |
Drop the '2' suffix from logging macros
Who doesn't like a massive renaming?
Diffstat (limited to 'src/test')
510 files changed, 1104 insertions, 1104 deletions
diff --git a/src/test/auxiliary/cci_class_4.rs b/src/test/auxiliary/cci_class_4.rs index 78f9d62087b..98e5c8c2b5b 100644 --- a/src/test/auxiliary/cci_class_4.rs +++ b/src/test/auxiliary/cci_class_4.rs @@ -21,11 +21,11 @@ pub mod kitties { pub fn eat(&mut self) -> bool { if self.how_hungry > 0 { - error2!("OM NOM NOM"); + error!("OM NOM NOM"); self.how_hungry -= 2; return true; } else { - error2!("Not hungry!"); + error!("Not hungry!"); return false; } } @@ -33,7 +33,7 @@ pub mod kitties { impl cat { pub fn meow(&mut self) { - error2!("Meow"); + error!("Meow"); self.meows += 1u; if self.meows % 5u == 0u { self.how_hungry += 1; diff --git a/src/test/auxiliary/cci_class_cast.rs b/src/test/auxiliary/cci_class_cast.rs index 906928d1b79..8fac4a3f322 100644 --- a/src/test/auxiliary/cci_class_cast.rs +++ b/src/test/auxiliary/cci_class_cast.rs @@ -21,7 +21,7 @@ pub mod kitty { impl cat { fn meow(&mut self) { - error2!("Meow"); + error!("Meow"); self.meows += 1u; if self.meows % 5u == 0u { self.how_hungry += 1; @@ -35,12 +35,12 @@ pub mod kitty { pub fn eat(&mut self) -> bool { if self.how_hungry > 0 { - error2!("OM NOM NOM"); + error!("OM NOM NOM"); self.how_hungry -= 2; return true; } else { - error2!("Not hungry!"); + error!("Not hungry!"); return false; } } diff --git a/src/test/auxiliary/cci_nested_lib.rs b/src/test/auxiliary/cci_nested_lib.rs index 626947306c7..350bd09826f 100644 --- a/src/test/auxiliary/cci_nested_lib.rs +++ b/src/test/auxiliary/cci_nested_lib.rs @@ -33,7 +33,7 @@ pub fn alist_get<A:Clone + 'static, return entry.value.clone(); } } - fail2!(); + fail!(); } #[inline] diff --git a/src/test/auxiliary/extern-crosscrate-source.rs b/src/test/auxiliary/extern-crosscrate-source.rs index ecc094a6121..0f762039746 100644 --- a/src/test/auxiliary/extern-crosscrate-source.rs +++ b/src/test/auxiliary/extern-crosscrate-source.rs @@ -28,7 +28,7 @@ pub mod rustrt { #[fixed_stack_segment] #[inline(never)] pub fn fact(n: uint) -> uint { unsafe { - info2!("n = {}", n); + info!("n = {}", n); rustrt::rust_dbg_call(cb, n) } } diff --git a/src/test/auxiliary/issue2378a.rs b/src/test/auxiliary/issue2378a.rs index 20b3a3280ec..ea14229cc48 100644 --- a/src/test/auxiliary/issue2378a.rs +++ b/src/test/auxiliary/issue2378a.rs @@ -17,7 +17,7 @@ impl <T:Clone> Index<uint,T> for maybe<T> { fn index(&self, _idx: &uint) -> T { match self { &just(ref t) => (*t).clone(), - ¬hing => { fail2!(); } + ¬hing => { fail!(); } } } } diff --git a/src/test/auxiliary/issue_2723_a.rs b/src/test/auxiliary/issue_2723_a.rs index 384f69c736c..b3fa8e73cc2 100644 --- a/src/test/auxiliary/issue_2723_a.rs +++ b/src/test/auxiliary/issue_2723_a.rs @@ -9,5 +9,5 @@ // except according to those terms. pub unsafe fn f(xs: ~[int]) { - xs.map(|_x| { unsafe fn q() { fail2!(); } }); + xs.map(|_x| { unsafe fn q() { fail!(); } }); } diff --git a/src/test/auxiliary/logging_right_crate.rs b/src/test/auxiliary/logging_right_crate.rs index 84bf6f0240f..4fc7de9f7d2 100644 --- a/src/test/auxiliary/logging_right_crate.rs +++ b/src/test/auxiliary/logging_right_crate.rs @@ -9,6 +9,6 @@ // except according to those terms. pub fn foo<T>() { - fn death() -> int { fail2!() } - debug2!("{:?}", (||{ death() })()); + fn death() -> int { fail!() } + debug!("{:?}", (||{ death() })()); } diff --git a/src/test/auxiliary/static-methods-crate.rs b/src/test/auxiliary/static-methods-crate.rs index ef173d52bc4..6978b9209d8 100644 --- a/src/test/auxiliary/static-methods-crate.rs +++ b/src/test/auxiliary/static-methods-crate.rs @@ -38,6 +38,6 @@ impl read for bool { pub fn read<T:read>(s: ~str) -> T { match read::readMaybe(s) { Some(x) => x, - _ => fail2!("read failed!") + _ => fail!("read failed!") } } diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs index 6ce289620fb..f549f747ef7 100644 --- a/src/test/bench/core-std.rs +++ b/src/test/bench/core-std.rs @@ -138,7 +138,7 @@ fn is_utf8_ascii() { for _ in range(0u, 20000) { v.push('b' as u8); if !str::is_utf8(v) { - fail2!("is_utf8 failed"); + fail!("is_utf8 failed"); } } } @@ -149,7 +149,7 @@ fn is_utf8_multibyte() { for _ in range(0u, 5000) { v.push_all(s.as_bytes()); if !str::is_utf8(v) { - fail2!("is_utf8 failed"); + fail!("is_utf8 failed"); } } } diff --git a/src/test/bench/core-uint-to-str.rs b/src/test/bench/core-uint-to-str.rs index ef6610cd93a..aec0bfb1e65 100644 --- a/src/test/bench/core-uint-to-str.rs +++ b/src/test/bench/core-uint-to-str.rs @@ -25,6 +25,6 @@ fn main() { for i in range(0u, n) { let x = i.to_str(); - info2!("{}", x); + info!("{}", x); } } diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs index ff2eb575ec5..97479fc133a 100644 --- a/src/test/bench/msgsend-pipes-shared.rs +++ b/src/test/bench/msgsend-pipes-shared.rs @@ -42,7 +42,7 @@ fn server(requests: &Port<request>, responses: &Chan<uint>) { match requests.try_recv() { Some(get_count) => { responses.send(count.clone()); } Some(bytes(b)) => { - //error2!("server: received {:?} bytes", b); + //error!("server: received {:?} bytes", b); count += b; } None => { done = true; } @@ -50,7 +50,7 @@ fn server(requests: &Port<request>, responses: &Chan<uint>) { } } responses.send(count); - //error2!("server exiting"); + //error!("server exiting"); } fn run(args: &[~str]) { @@ -70,10 +70,10 @@ fn run(args: &[~str]) { worker_results.push(builder.future_result()); do builder.spawn { for _ in range(0u, size / workers) { - //error2!("worker {:?}: sending {:?} bytes", i, num_bytes); + //error!("worker {:?}: sending {:?} bytes", i, num_bytes); to_child.send(bytes(num_bytes)); } - //error2!("worker {:?} exiting", i); + //error!("worker {:?} exiting", i); } } do task::spawn || { @@ -84,7 +84,7 @@ fn run(args: &[~str]) { r.recv(); } - //error2!("sending stop message"); + //error!("sending stop message"); to_child.send(stop); move_out(to_child); let result = from_child.recv(); @@ -107,6 +107,6 @@ fn main() { args.clone() }; - info2!("{:?}", args); + info!("{:?}", args); run(args); } diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs index 4ce9fb493eb..584a8b8befc 100644 --- a/src/test/bench/msgsend-pipes.rs +++ b/src/test/bench/msgsend-pipes.rs @@ -37,7 +37,7 @@ fn server(requests: &Port<request>, responses: &Chan<uint>) { match requests.try_recv() { Some(get_count) => { responses.send(count.clone()); } Some(bytes(b)) => { - //error2!("server: received {:?} bytes", b); + //error!("server: received {:?} bytes", b); count += b; } None => { done = true; } @@ -45,7 +45,7 @@ fn server(requests: &Port<request>, responses: &Chan<uint>) { } } responses.send(count); - //error2!("server exiting"); + //error!("server exiting"); } fn run(args: &[~str]) { @@ -64,10 +64,10 @@ fn run(args: &[~str]) { worker_results.push(builder.future_result()); do builder.spawn { for _ in range(0u, size / workers) { - //error2!("worker {:?}: sending {:?} bytes", i, num_bytes); + //error!("worker {:?}: sending {:?} bytes", i, num_bytes); to_child.send(bytes(num_bytes)); } - //error2!("worker {:?} exiting", i); + //error!("worker {:?} exiting", i); }; } do task::spawn || { @@ -78,7 +78,7 @@ fn run(args: &[~str]) { r.recv(); } - //error2!("sending stop message"); + //error!("sending stop message"); to_child.send(stop); move_out(to_child); let result = from_child.recv(); @@ -101,6 +101,6 @@ fn main() { args.clone() }; - info2!("{:?}", args); + info!("{:?}", args); run(args); } diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout-chameneos-redux.rs index 1fa48755663..96e87788b70 100644 --- a/src/test/bench/shootout-chameneos-redux.rs +++ b/src/test/bench/shootout-chameneos-redux.rs @@ -66,7 +66,7 @@ fn show_digit(nn: uint) -> ~str { 7 => {~"seven"} 8 => {~"eight"} 9 => {~"nine"} - _ => {fail2!("expected digits from 0 to 9...")} + _ => {fail!("expected digits from 0 to 9...")} } } diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index b4f6e7e4b71..88b3cfdff42 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -66,7 +66,7 @@ fn parse_opts(argv: ~[~str]) -> Config { Ok(ref m) => { return Config {stress: m.opt_present("stress")} } - Err(_) => { fail2!(); } + Err(_) => { fail!(); } } } @@ -76,7 +76,7 @@ fn stress_task(id: int) { let n = 15; assert_eq!(fib(n), fib(n)); i += 1; - error2!("{}: Completed {} iterations", id, i); + error!("{}: Completed {} iterations", id, i); } } diff --git a/src/test/bench/shootout-threadring.rs b/src/test/bench/shootout-threadring.rs index 0c0c5226dce..5e096816306 100644 --- a/src/test/bench/shootout-threadring.rs +++ b/src/test/bench/shootout-threadring.rs @@ -44,7 +44,7 @@ fn roundtrip(id: int, n_tasks: int, p: &Port<int>, ch: &Chan<int>) { return; } token => { - info2!("thread: {} got token: {}", id, token); + info!("thread: {} got token: {}", id, token); ch.send(token - 1); if token <= n_tasks { return; diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs index 91d9c9656af..a4e32b4c074 100644 --- a/src/test/bench/sudoku.rs +++ b/src/test/bench/sudoku.rs @@ -79,7 +79,7 @@ impl Sudoku { g[row][col] = from_str::<uint>(comps[2]).unwrap() as u8; } else { - fail2!("Invalid sudoku file"); + fail!("Invalid sudoku file"); } } return Sudoku::new(g) @@ -117,7 +117,7 @@ impl Sudoku { ptr = ptr + 1u; } else { // no: redo this field aft recoloring pred; unless there is none - if ptr == 0u { fail2!("No solution found for this sudoku"); } + if ptr == 0u { fail!("No solution found for this sudoku"); } ptr = ptr - 1u; } } diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/task-perf-alloc-unwind.rs index 639cbd05cbf..7ee0c3e13ce 100644 --- a/src/test/bench/task-perf-alloc-unwind.rs +++ b/src/test/bench/task-perf-alloc-unwind.rs @@ -31,11 +31,11 @@ fn main() { fn run(repeat: int, depth: int) { for _ in range(0, repeat) { - info2!("starting {:.4f}", precise_time_s()); + info!("starting {:.4f}", precise_time_s()); do task::try { recurse_or_fail(depth, None) }; - info2!("stopping {:.4f}", precise_time_s()); + info!("stopping {:.4f}", precise_time_s()); } } @@ -68,8 +68,8 @@ fn r(l: @nillist) -> r { fn recurse_or_fail(depth: int, st: Option<State>) { if depth == 0 { - info2!("unwinding {:.4f}", precise_time_s()); - fail2!(); + info!("unwinding {:.4f}", precise_time_s()); + fail!(); } else { let depth = depth - 1; diff --git a/src/test/bench/task-perf-jargon-metal-smoke.rs b/src/test/bench/task-perf-jargon-metal-smoke.rs index ac028686f08..0827f7d3447 100644 --- a/src/test/bench/task-perf-jargon-metal-smoke.rs +++ b/src/test/bench/task-perf-jargon-metal-smoke.rs @@ -54,6 +54,6 @@ fn main() { let (p,c) = comm::stream(); child_generation(from_str::<uint>(args[1]).unwrap(), c); if p.try_recv().is_none() { - fail2!("it happened when we slumbered"); + fail!("it happened when we slumbered"); } } diff --git a/src/test/bench/task-perf-linked-failure.rs b/src/test/bench/task-perf-linked-failure.rs index 3b64cb38c7e..5484a3965b3 100644 --- a/src/test/bench/task-perf-linked-failure.rs +++ b/src/test/bench/task-perf-linked-failure.rs @@ -43,13 +43,13 @@ fn grandchild_group(num_tasks: uint) { p.recv(); // block forever } } - error2!("Grandchild group getting started"); + error!("Grandchild group getting started"); for _ in range(0, num_tasks) { // Make sure all above children are fully spawned; i.e., enlisted in // their ancestor groups. po.recv(); } - error2!("Grandchild group ready to go."); + error!("Grandchild group ready to go."); // Master grandchild task exits early. } @@ -58,7 +58,7 @@ fn spawn_supervised_blocking(myname: &str, f: ~fn()) { let res = builder.future_result(); builder.supervised(); builder.spawn(f); - error2!("{} group waiting", myname); + error!("{} group waiting", myname); let x = res.recv(); assert_eq!(x, task::Success); } @@ -84,11 +84,11 @@ fn main() { grandchild_group(num_tasks); } // When grandchild group is ready to go, make the middle group exit. - error2!("Middle group wakes up and exits"); + error!("Middle group wakes up and exits"); } // Grandparent group waits for middle group to be gone, then fails - error2!("Grandparent group wakes up and fails"); - fail2!(); + error!("Grandparent group wakes up and fails"); + fail!(); }; assert!(x.is_err()); } diff --git a/src/test/compile-fail/asm-in-bad-modifier.rs b/src/test/compile-fail/asm-in-bad-modifier.rs index 87d03290b46..4e934d98801 100644 --- a/src/test/compile-fail/asm-in-bad-modifier.rs +++ b/src/test/compile-fail/asm-in-bad-modifier.rs @@ -11,7 +11,7 @@ // xfail-fast #[feature] doesn't work with check-fast #[feature(asm)]; -fn foo(x: int) { info2!("{}", x); } +fn foo(x: int) { info!("{}", x); } #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")] diff --git a/src/test/compile-fail/asm-out-assign-imm.rs b/src/test/compile-fail/asm-out-assign-imm.rs index 629d8082f44..599ab76e61c 100644 --- a/src/test/compile-fail/asm-out-assign-imm.rs +++ b/src/test/compile-fail/asm-out-assign-imm.rs @@ -11,7 +11,7 @@ // xfail-fast #[feature] doesn't work with check-fast #[feature(asm)]; -fn foo(x: int) { info2!("{}", x); } +fn foo(x: int) { info!("{}", x); } #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")] diff --git a/src/test/compile-fail/asm-out-no-modifier.rs b/src/test/compile-fail/asm-out-no-modifier.rs index 80237f331bc..b520c27c80e 100644 --- a/src/test/compile-fail/asm-out-no-modifier.rs +++ b/src/test/compile-fail/asm-out-no-modifier.rs @@ -11,7 +11,7 @@ // xfail-fast #[feature] doesn't work with check-fast #[feature(asm)]; -fn foo(x: int) { info2!("{}", x); } +fn foo(x: int) { info!("{}", x); } #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")] diff --git a/src/test/compile-fail/asm-out-read-uninit.rs b/src/test/compile-fail/asm-out-read-uninit.rs index ce3bbcebec2..f49624295b1 100644 --- a/src/test/compile-fail/asm-out-read-uninit.rs +++ b/src/test/compile-fail/asm-out-read-uninit.rs @@ -11,7 +11,7 @@ // xfail-fast #[feature] doesn't work with check-fast #[feature(asm)]; -fn foo(x: int) { info2!("{}", x); } +fn foo(x: int) { info!("{}", x); } #[cfg(target_arch = "x86")] #[cfg(target_arch = "x86_64")] diff --git a/src/test/compile-fail/assign-imm-local-twice.rs b/src/test/compile-fail/assign-imm-local-twice.rs index f60b67cf842..e11b47a1b58 100644 --- a/src/test/compile-fail/assign-imm-local-twice.rs +++ b/src/test/compile-fail/assign-imm-local-twice.rs @@ -11,9 +11,9 @@ fn test() { let v: int; v = 1; //~ NOTE prior assignment occurs here - info2!("v={}", v); + info!("v={}", v); v = 2; //~ ERROR re-assignment of immutable variable - info2!("v={}", v); + info!("v={}", v); } fn main() { diff --git a/src/test/compile-fail/assign-to-method.rs b/src/test/compile-fail/assign-to-method.rs index 32f27f64f54..f300bd51b24 100644 --- a/src/test/compile-fail/assign-to-method.rs +++ b/src/test/compile-fail/assign-to-method.rs @@ -27,5 +27,5 @@ fn cat(in_x : uint, in_y : int) -> cat { fn main() { let nyan : cat = cat(52u, 99); - nyan.speak = || info2!("meow"); //~ ERROR attempted to take value of method + nyan.speak = || info!("meow"); //~ ERROR attempted to take value of method } diff --git a/src/test/compile-fail/autoderef-full-lval.rs b/src/test/compile-fail/autoderef-full-lval.rs index ae911b54107..b8af09e308b 100644 --- a/src/test/compile-fail/autoderef-full-lval.rs +++ b/src/test/compile-fail/autoderef-full-lval.rs @@ -21,11 +21,11 @@ fn main() { let a: clam = clam{x: @1, y: @2}; let b: clam = clam{x: @10, y: @20}; let z: int = a.x + b.y; //~ ERROR binary operation + cannot be applied to type `@int` - info2!("{:?}", z); + info!("{:?}", z); assert_eq!(z, 21); let forty: fish = fish{a: @40}; let two: fish = fish{a: @2}; let answer: int = forty.a + two.a; //~ ERROR binary operation + cannot be applied to type `@int` - info2!("{:?}", answer); + info!("{:?}", answer); assert_eq!(answer, 42); } diff --git a/src/test/compile-fail/bad-bang-ann.rs b/src/test/compile-fail/bad-bang-ann.rs index a9e9ed64d9a..2ffb5dd2906 100644 --- a/src/test/compile-fail/bad-bang-ann.rs +++ b/src/test/compile-fail/bad-bang-ann.rs @@ -12,7 +12,7 @@ // Tests that a function with a ! annotation always actually fails fn bad_bang(i: uint) -> ! { - if i < 0u { } else { fail2!(); } + if i < 0u { } else { fail!(); } //~^ ERROR expected `!` but found `()` } diff --git a/src/test/compile-fail/bad-const-type.rs b/src/test/compile-fail/bad-const-type.rs index 095a85ab21e..08ced2b002d 100644 --- a/src/test/compile-fail/bad-const-type.rs +++ b/src/test/compile-fail/bad-const-type.rs @@ -11,4 +11,4 @@ // error-pattern:expected `~str` but found `int` static i: ~str = 10i; -fn main() { info2!("{:?}", i); } +fn main() { info!("{:?}", i); } diff --git a/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-1.rs b/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-1.rs index 262248f9dc3..3d1cca46085 100644 --- a/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-1.rs +++ b/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-1.rs @@ -12,7 +12,7 @@ struct X { x: () } impl Drop for X { fn drop(&mut self) { - error2!("destructor runs"); + error!("destructor runs"); } } @@ -20,6 +20,6 @@ fn main() { let x = Some(X { x: () }); match x { Some(ref _y @ _z) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern - None => fail2!() + None => fail!() } } diff --git a/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-2.rs b/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-2.rs index bf665e6fb60..a1803a621a5 100644 --- a/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-2.rs +++ b/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-2.rs @@ -12,7 +12,7 @@ struct X { x: (), } impl Drop for X { fn drop(&mut self) { - error2!("destructor runs"); + error!("destructor runs"); } } @@ -20,6 +20,6 @@ fn main() { let x = Some((X { x: () }, X { x: () })); match x { Some((ref _y, _z)) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern - None => fail2!() + None => fail!() } } diff --git a/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-3.rs b/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-3.rs index fcb9dbb300c..34a9c0b8fc2 100644 --- a/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-3.rs +++ b/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-3.rs @@ -12,7 +12,7 @@ struct X { x: (), } impl Drop for X { fn drop(&mut self) { - error2!("destructor runs"); + error!("destructor runs"); } } @@ -22,6 +22,6 @@ fn main() { let x = some2(X { x: () }, X { x: () }); match x { some2(ref _y, _z) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern - none2 => fail2!() + none2 => fail!() } } diff --git a/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-4.rs b/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-4.rs index 19076181c51..2aa3379993b 100644 --- a/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-4.rs +++ b/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-4.rs @@ -12,7 +12,7 @@ struct X { x: (), } impl Drop for X { fn drop(&mut self) { - error2!("destructor runs"); + error!("destructor runs"); } } @@ -20,6 +20,6 @@ fn main() { let x = Some((X { x: () }, X { x: () })); match x { Some((_y, ref _z)) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern - None => fail2!() + None => fail!() } } diff --git a/src/test/compile-fail/bind-by-move-no-guards.rs b/src/test/compile-fail/bind-by-move-no-guards.rs index 5c0274b03d0..348781d7497 100644 --- a/src/test/compile-fail/bind-by-move-no-guards.rs +++ b/src/test/compile-fail/bind-by-move-no-guards.rs @@ -15,8 +15,8 @@ fn main() { let x = Some(p); c.send(false); match x { - Some(z) if z.recv() => { fail2!() }, //~ ERROR cannot bind by-move into a pattern guard + Some(z) if z.recv() => { fail!() }, //~ ERROR cannot bind by-move into a pattern guard Some(z) => { assert!(!z.recv()); }, - None => fail2!() + None => fail!() } } diff --git a/src/test/compile-fail/bind-by-move-no-sub-bindings.rs b/src/test/compile-fail/bind-by-move-no-sub-bindings.rs index 9b7cc41e5c8..7143ce0252b 100644 --- a/src/test/compile-fail/bind-by-move-no-sub-bindings.rs +++ b/src/test/compile-fail/bind-by-move-no-sub-bindings.rs @@ -12,7 +12,7 @@ struct X { x: (), } impl Drop for X { fn drop(&mut self) { - error2!("destructor runs"); + error!("destructor runs"); } } @@ -20,6 +20,6 @@ fn main() { let x = Some(X { x: () }); match x { Some(_y @ ref _z) => { }, //~ ERROR cannot bind by-move with sub-bindings - None => fail2!() + None => fail!() } } diff --git a/src/test/compile-fail/block-arg-as-stmt-with-value.rs b/src/test/compile-fail/block-arg-as-stmt-with-value.rs index 71a0b8b7a8e..7637ebdc80d 100644 --- a/src/test/compile-fail/block-arg-as-stmt-with-value.rs +++ b/src/test/compile-fail/block-arg-as-stmt-with-value.rs @@ -17,6 +17,6 @@ fn compute1() -> f64 { fn main() { let x = compute1(); - info2!("{:?}", x); + info!("{:?}", x); assert_eq!(x, -4f64); } diff --git a/src/test/compile-fail/block-coerce-no.rs b/src/test/compile-fail/block-coerce-no.rs index 379b71f7411..71afba18bb1 100644 --- a/src/test/compile-fail/block-coerce-no.rs +++ b/src/test/compile-fail/block-coerce-no.rs @@ -21,6 +21,6 @@ fn coerce(b: &fn()) -> extern fn() { fn main() { let i = 8; - let f = coerce(|| error2!("{:?}", i) ); + let f = coerce(|| error!("{:?}", i) ); f(); } diff --git a/src/test/compile-fail/bogus-tag.rs b/src/test/compile-fail/bogus-tag.rs index c14989fcbbb..63d12b72cc6 100644 --- a/src/test/compile-fail/bogus-tag.rs +++ b/src/test/compile-fail/bogus-tag.rs @@ -17,7 +17,7 @@ enum color { rgb(int, int, int), rgba(int, int, int, int), } fn main() { let red: color = rgb(255, 0, 0); match red { - rgb(r, g, b) => { info2!("rgb"); } - hsl(h, s, l) => { info2!("hsl"); } + rgb(r, g, b) => { info!("rgb"); } + hsl(h, s, l) => { info!("hsl"); } } } diff --git a/src/test/compile-fail/borrowck-anon-fields-variant.rs b/src/test/compile-fail/borrowck-anon-fields-variant.rs index ce3aff59d7a..da0a9323d2c 100644 --- a/src/test/compile-fail/borrowck-anon-fields-variant.rs +++ b/src/test/compile-fail/borrowck-anon-fields-variant.rs @@ -10,12 +10,12 @@ fn distinct_variant() { let a = match y { Y(ref mut a, _) => a, - X => fail2!() + X => fail!() }; let b = match y { Y(_, ref mut b) => b, - X => fail2!() + X => fail!() }; *a += 1; @@ -27,12 +27,12 @@ fn same_variant() { let a = match y { Y(ref mut a, _) => a, - X => fail2!() + X => fail!() }; let b = match y { Y(ref mut b, _) => b, //~ ERROR cannot borrow - X => fail2!() + X => fail!() }; *a += 1; diff --git a/src/test/compile-fail/borrowck-assign-comp-idx.rs b/src/test/compile-fail/borrowck-assign-comp-idx.rs index 8c4d681d983..81e16b6b615 100644 --- a/src/test/compile-fail/borrowck-assign-comp-idx.rs +++ b/src/test/compile-fail/borrowck-assign-comp-idx.rs @@ -21,7 +21,7 @@ fn a() { p[0] = 5; //~ ERROR cannot assign - info2!("{}", *q); + info!("{}", *q); } fn borrow(_x: &[int], _f: &fn()) {} diff --git a/src/test/compile-fail/borrowck-autoref-3261.rs b/src/test/compile-fail/borrowck-autoref-3261.rs index 487a16c1836..4bbd1b0decf 100644 --- a/src/test/compile-fail/borrowck-autoref-3261.rs +++ b/src/test/compile-fail/borrowck-autoref-3261.rs @@ -24,7 +24,7 @@ fn main() { x = X(Left((0,0))); //~ ERROR cannot assign to `x` (*f)() }, - _ => fail2!() + _ => fail!() } } } diff --git a/src/test/compile-fail/borrowck-borrow-from-owned-ptr.rs b/src/test/compile-fail/borrowck-borrow-from-owned-ptr.rs index c7cb9ce27f2..1051c5829ec 100644 --- a/src/test/compile-fail/borrowck-borrow-from-owned-ptr.rs +++ b/src/test/compile-fail/borrowck-borrow-from-owned-ptr.rs @@ -18,7 +18,7 @@ struct Bar { int2: int, } -fn make_foo() -> ~Foo { fail2!() } +fn make_foo() -> ~Foo { fail!() } fn borrow_same_field_twice_mut_mut() { let mut foo = make_foo(); diff --git a/src/test/compile-fail/borrowck-borrow-from-stack-variable.rs b/src/test/compile-fail/borrowck-borrow-from-stack-variable.rs index d01fd86f288..cdcf50c906e 100644 --- a/src/test/compile-fail/borrowck-borrow-from-stack-variable.rs +++ b/src/test/compile-fail/borrowck-borrow-from-stack-variable.rs @@ -18,7 +18,7 @@ struct Bar { int2: int, } -fn make_foo() -> Foo { fail2!() } +fn make_foo() -> Foo { fail!() } fn borrow_same_field_twice_mut_mut() { let mut foo = make_foo(); diff --git a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs b/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs index 918e06fad07..cc196a6f7cf 100644 --- a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs +++ b/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs @@ -16,7 +16,7 @@ struct defer<'self> { impl<'self> Drop for defer<'self> { fn drop(&mut self) { unsafe { - error2!("{:?}", self.x); + error!("{:?}", self.x); } } } diff --git a/src/test/compile-fail/borrowck-lend-flow-if.rs b/src/test/compile-fail/borrowck-lend-flow-if.rs index 1058211a6e4..563f63b98be 100644 --- a/src/test/compile-fail/borrowck-lend-flow-if.rs +++ b/src/test/compile-fail/borrowck-lend-flow-if.rs @@ -16,9 +16,9 @@ fn borrow(_v: &int) {} fn borrow_mut(_v: &mut int) {} -fn cond() -> bool { fail2!() } -fn for_func(_f: &fn() -> bool) { fail2!() } -fn produce<T>() -> T { fail2!(); } +fn cond() -> bool { fail!() } +fn for_func(_f: &fn() -> bool) { fail!() } +fn produce<T>() -> T { fail!(); } fn inc(v: &mut ~int) { *v = ~(**v + 1); diff --git a/src/test/compile-fail/borrowck-lend-flow-loop.rs b/src/test/compile-fail/borrowck-lend-flow-loop.rs index 99112985be6..9286340f6c9 100644 --- a/src/test/compile-fail/borrowck-lend-flow-loop.rs +++ b/src/test/compile-fail/borrowck-lend-flow-loop.rs @@ -16,8 +16,8 @@ fn borrow(_v: &int) {} fn borrow_mut(_v: &mut int) {} -fn cond() -> bool { fail2!() } -fn produce<T>() -> T { fail2!(); } +fn cond() -> bool { fail!() } +fn produce<T>() -> T { fail!(); } fn inc(v: &mut ~int) { *v = ~(**v + 1); diff --git a/src/test/compile-fail/borrowck-lend-flow-match.rs b/src/test/compile-fail/borrowck-lend-flow-match.rs index b6a30da46f8..d5c5597e57f 100644 --- a/src/test/compile-fail/borrowck-lend-flow-match.rs +++ b/src/test/compile-fail/borrowck-lend-flow-match.rs @@ -13,7 +13,7 @@ #[allow(unused_variable)]; #[allow(dead_assignment)]; -fn cond() -> bool { fail2!() } +fn cond() -> bool { fail!() } fn link<'a>(v: &'a uint, w: &mut &'a uint) -> bool { *w = v; true } fn separate_arms() { diff --git a/src/test/compile-fail/borrowck-lend-flow.rs b/src/test/compile-fail/borrowck-lend-flow.rs index c51d6117e5c..ea840a28b4e 100644 --- a/src/test/compile-fail/borrowck-lend-flow.rs +++ b/src/test/compile-fail/borrowck-lend-flow.rs @@ -16,9 +16,9 @@ fn borrow(_v: &int) {} fn borrow_mut(_v: &mut int) {} -fn cond() -> bool { fail2!() } -fn for_func(_f: &fn() -> bool) { fail2!() } -fn produce<T>() -> T { fail2!(); } +fn cond() -> bool { fail!() } +fn for_func(_f: &fn() -> bool) { fail!() } +fn produce<T>() -> T { fail!(); } fn inc(v: &mut ~int) { *v = ~(**v + 1); diff --git a/src/test/compile-fail/borrowck-loan-blocks-move-cc.rs b/src/test/compile-fail/borrowck-loan-blocks-move-cc.rs index 32dfa59927f..0284f234d9a 100644 --- a/src/test/compile-fail/borrowck-loan-blocks-move-cc.rs +++ b/src/test/compile-fail/borrowck-loan-blocks-move-cc.rs @@ -18,14 +18,14 @@ fn box_imm() { let v = ~3; let _w = &v; do task::spawn { - info2!("v={}", *v); + info!("v={}", *v); //~^ ERROR cannot move `v` into closure } let v = ~3; let _w = &v; task::spawn(|| { - info2!("v={}", *v); + info!("v={}", *v); //~^ ERROR cannot move }); } diff --git a/src/test/compile-fail/borrowck-loan-local-as-both-mut-and-imm.rs b/src/test/compile-fail/borrowck-loan-local-as-both-mut-and-imm.rs index 9d9dd5b1ad8..e2136c82313 100644 --- a/src/test/compile-fail/borrowck-loan-local-as-both-mut-and-imm.rs +++ b/src/test/compile-fail/borrowck-loan-local-as-both-mut-and-imm.rs @@ -16,7 +16,7 @@ use std::either::{Either, Left, Right}; *x = Right(1.0); *z } - _ => fail2!() + _ => fail!() } } diff --git a/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs b/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs index 145aaa405a6..4b6a2eca1af 100644 --- a/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs +++ b/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs @@ -23,7 +23,7 @@ pub fn main() { } } let z = tail[0].clone(); - info2!("{:?}", z); + info!("{:?}", z); } _ => { unreachable!(); diff --git a/src/test/compile-fail/borrowck-mut-addr-of-imm-var.rs b/src/test/compile-fail/borrowck-mut-addr-of-imm-var.rs index 56e047e5bc5..cab2a5565f4 100644 --- a/src/test/compile-fail/borrowck-mut-addr-of-imm-var.rs +++ b/src/test/compile-fail/borrowck-mut-addr-of-imm-var.rs @@ -12,5 +12,5 @@ fn main() { let x: int = 3; let y: &mut int = &mut x; //~ ERROR cannot borrow *y = 5; - info2!("{:?}", *y); + info!("{:?}", *y); } diff --git a/src/test/compile-fail/borrowck-ref-into-rvalue.rs b/src/test/compile-fail/borrowck-ref-into-rvalue.rs index bd0b4afe730..cb56e929754 100644 --- a/src/test/compile-fail/borrowck-ref-into-rvalue.rs +++ b/src/test/compile-fail/borrowck-ref-into-rvalue.rs @@ -14,7 +14,7 @@ fn main() { Some(ref m) => { //~ ERROR borrowed value does not live long enough msg = m; }, - None => { fail2!() } + None => { fail!() } } println(*msg); } diff --git a/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs b/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs index 53e69fc1611..ca20d68e4cd 100644 --- a/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs +++ b/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs @@ -2,7 +2,7 @@ fn a() -> &[int] { let vec = ~[1, 2, 3, 4]; let tail = match vec { [_, ..tail] => tail, //~ ERROR does not live long enough - _ => fail2!("a") + _ => fail!("a") }; tail } @@ -11,7 +11,7 @@ fn b() -> &[int] { let vec = ~[1, 2, 3, 4]; let init = match vec { [..init, _] => init, //~ ERROR does not live long enough - _ => fail2!("b") + _ => fail!("b") }; init } @@ -20,7 +20,7 @@ fn c() -> &[int] { let vec = ~[1, 2, 3, 4]; let slice = match vec { [_, ..slice, _] => slice, //~ ERROR does not live long enough - _ => fail2!("c") + _ => fail!("c") }; slice } diff --git a/src/test/compile-fail/borrowck-vec-pattern-nesting.rs b/src/test/compile-fail/borrowck-vec-pattern-nesting.rs index b31e49bceb5..02ba1b9d2ff 100644 --- a/src/test/compile-fail/borrowck-vec-pattern-nesting.rs +++ b/src/test/compile-fail/borrowck-vec-pattern-nesting.rs @@ -4,7 +4,7 @@ fn a() { [~ref _a] => { vec[0] = ~4; //~ ERROR cannot assign to `(*vec)[]` because it is borrowed } - _ => fail2!("foo") + _ => fail!("foo") } } diff --git a/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs b/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs index e0c2d08e413..e542238d035 100644 --- a/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs +++ b/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs @@ -2,7 +2,7 @@ fn a() -> &int { let vec = ~[1, 2, 3, 4]; let tail = match vec { [_a, ..tail] => &tail[0], //~ ERROR borrowed value does not live long enough - _ => fail2!("foo") + _ => fail!("foo") }; tail } diff --git a/src/test/compile-fail/class-cast-to-trait.rs b/src/test/compile-fail/class-cast-to-trait.rs index 6f483b82d81..0d1582bf857 100644 --- a/src/test/compile-fail/class-cast-to-trait.rs +++ b/src/test/compile-fail/class-cast-to-trait.rs @@ -22,12 +22,12 @@ struct cat { impl cat { pub fn eat(&self) -> bool { if self.how_hungry > 0 { - error2!("OM NOM NOM"); + error!("OM NOM NOM"); self.how_hungry -= 2; return true; } else { - error2!("Not hungry!"); + error!("Not hungry!"); return false; } } @@ -40,7 +40,7 @@ impl noisy for cat { impl cat { fn meow(&self) { - error2!("Meow"); + error!("Meow"); self.meows += 1; if self.meows % 5 == 0 { self.how_hungry += 1; diff --git a/src/test/compile-fail/class-missing-self.rs b/src/test/compile-fail/class-missing-self.rs index 101f96ce0b4..c27c27b5942 100644 --- a/src/test/compile-fail/class-missing-self.rs +++ b/src/test/compile-fail/class-missing-self.rs @@ -15,7 +15,7 @@ struct cat { impl cat { fn sleep(&self) { loop{} } fn meow(&self) { - error2!("Meow"); + error!("Meow"); meows += 1u; //~ ERROR unresolved name sleep(); //~ ERROR unresolved name } diff --git a/src/test/compile-fail/closure-that-fails.rs b/src/test/compile-fail/closure-that-fails.rs index 6663cff9b56..aad0e8bcbb6 100644 --- a/src/test/compile-fail/closure-that-fails.rs +++ b/src/test/compile-fail/closure-that-fails.rs @@ -2,6 +2,6 @@ fn foo(f: &fn() -> !) {} fn main() { // Type inference didn't use to be able to handle this: - foo(|| fail2!()); + foo(|| fail!()); foo(|| 22); //~ ERROR mismatched types } diff --git a/src/test/compile-fail/copy-a-resource.rs b/src/test/compile-fail/copy-a-resource.rs index 771f2b2dfb6..7e928e190a3 100644 --- a/src/test/compile-fail/copy-a-resource.rs +++ b/src/test/compile-fail/copy-a-resource.rs @@ -26,5 +26,5 @@ fn main() { let x = foo(10); let _y = x.clone(); //~^ ERROR does not implement any method in scope - error2!("{:?}", x); + error!("{:?}", x); } diff --git a/src/test/compile-fail/deref-non-pointer.rs b/src/test/compile-fail/deref-non-pointer.rs index 86c56f7ae81..7b1b0f6243a 100644 --- a/src/test/compile-fail/deref-non-pointer.rs +++ b/src/test/compile-fail/deref-non-pointer.rs @@ -10,6 +10,6 @@ fn main() { match *1 { //~ ERROR: cannot be dereferenced - _ => { fail2!(); } + _ => { fail!(); } } } diff --git a/src/test/compile-fail/disallowed-deconstructing-destructing-struct-let.rs b/src/test/compile-fail/disallowed-deconstructing-destructing-struct-let.rs index aac6cd118b2..945c3d62952 100644 --- a/src/test/compile-fail/disallowed-deconstructing-destructing-struct-let.rs +++ b/src/test/compile-fail/disallowed-deconstructing-destructing-struct-let.rs @@ -14,7 +14,7 @@ struct X { impl Drop for X { fn drop(&mut self) { - error2!("value: {}", self.x); + error!("value: {}", self.x); } } @@ -26,5 +26,5 @@ fn unwrap(x: X) -> ~str { fn main() { let x = X { x: ~"hello" }; let y = unwrap(x); - error2!("contents: {}", y); + error!("contents: {}", y); } diff --git a/src/test/compile-fail/disallowed-deconstructing-destructing-struct-match.rs b/src/test/compile-fail/disallowed-deconstructing-destructing-struct-match.rs index e14900c4bb4..0432920c1a6 100644 --- a/src/test/compile-fail/disallowed-deconstructing-destructing-struct-match.rs +++ b/src/test/compile-fail/disallowed-deconstructing-destructing-struct-match.rs @@ -14,7 +14,7 @@ struct X { impl Drop for X { fn drop(&mut self) { - error2!("value: {}", self.x); + error!("value: {}", self.x); } } @@ -22,7 +22,7 @@ fn main() { let x = X { x: ~"hello" }; match x { - X { x: y } => error2!("contents: {}", y) + X { x: y } => error!("contents: {}", y) //~^ ERROR cannot move out of type `X`, which defines the `Drop` trait } } diff --git a/src/test/compile-fail/does-nothing.rs b/src/test/compile-fail/does-nothing.rs index dc32e8e1022..9d2b68ddb81 100644 --- a/src/test/compile-fail/does-nothing.rs +++ b/src/test/compile-fail/does-nothing.rs @@ -1,2 +1,2 @@ // error-pattern: unresolved name `this_does_nothing_what_the`. -fn main() { info2!("doing"); this_does_nothing_what_the; info2!("boing"); } +fn main() { info!("doing"); this_does_nothing_what_the; info!("boing"); } diff --git a/src/test/compile-fail/export2.rs b/src/test/compile-fail/export2.rs index 3fdd4000b1b..22762eb4a7e 100644 --- a/src/test/compile-fail/export2.rs +++ b/src/test/compile-fail/export2.rs @@ -15,7 +15,7 @@ mod foo { } mod bar { - fn x() { info2!("x"); } + fn x() { info!("x"); } pub fn y() { } } diff --git a/src/test/compile-fail/fail-expr.rs b/src/test/compile-fail/fail-expr.rs index 4dce462bd41..98270bdc583 100644 --- a/src/test/compile-fail/fail-expr.rs +++ b/src/test/compile-fail/fail-expr.rs @@ -10,4 +10,4 @@ // error-pattern:failed to find an implementation of trait std::sys::FailWithCause for int -fn main() { fail2!(5); } +fn main() { fail!(5); } diff --git a/src/test/compile-fail/fail-simple.rs b/src/test/compile-fail/fail-simple.rs index bcede4483c7..7def16770a7 100644 --- a/src/test/compile-fail/fail-simple.rs +++ b/src/test/compile-fail/fail-simple.rs @@ -12,5 +12,5 @@ // error-pattern:unexpected token fn main() { - fail2!(@); + fail!(@); } diff --git a/src/test/compile-fail/fail-type-err.rs b/src/test/compile-fail/fail-type-err.rs index 341f60eeedf..b6755249bcf 100644 --- a/src/test/compile-fail/fail-type-err.rs +++ b/src/test/compile-fail/fail-type-err.rs @@ -9,4 +9,4 @@ // except according to those terms. // error-pattern:failed to find an implementation of trait std::sys::FailWithCause for ~[int] -fn main() { fail2!(~[0i]); } +fn main() { fail!(~[0i]); } diff --git a/src/test/compile-fail/if-without-else-result.rs b/src/test/compile-fail/if-without-else-result.rs index c5fb22c6821..dcda6afa6ca 100644 --- a/src/test/compile-fail/if-without-else-result.rs +++ b/src/test/compile-fail/if-without-else-result.rs @@ -12,5 +12,5 @@ fn main() { let a = if true { true }; - info2!("{:?}", a); + info!("{:?}", a); } diff --git a/src/test/compile-fail/import-glob-0.rs b/src/test/compile-fail/import-glob-0.rs index 233826bcc7d..124d4631601 100644 --- a/src/test/compile-fail/import-glob-0.rs +++ b/src/test/compile-fail/import-glob-0.rs @@ -15,10 +15,10 @@ use module_of_many_things::*; mod module_of_many_things { - pub fn f1() { info2!("f1"); } - pub fn f2() { info2!("f2"); } - fn f3() { info2!("f3"); } - pub fn f4() { info2!("f4"); } + pub fn f1() { info!("f1"); } + pub fn f2() { info!("f2"); } + fn f3() { info!("f3"); } + pub fn f4() { info!("f4"); } } diff --git a/src/test/compile-fail/import-glob-circular.rs b/src/test/compile-fail/import-glob-circular.rs index 23b449fe061..ae5a0f04e2c 100644 --- a/src/test/compile-fail/import-glob-circular.rs +++ b/src/test/compile-fail/import-glob-circular.rs @@ -14,13 +14,13 @@ mod circ1 { pub use circ2::f2; - pub fn f1() { info2!("f1"); } + pub fn f1() { info!("f1"); } pub fn common() -> uint { return 0u; } } mod circ2 { pub use circ1::f1; - pub fn f2() { info2!("f2"); } + pub fn f2() { info!("f2"); } pub fn common() -> uint { return 1u; } } diff --git a/src/test/compile-fail/import.rs b/src/test/compile-fail/import.rs index 129a4aece8f..5177dc4e475 100644 --- a/src/test/compile-fail/import.rs +++ b/src/test/compile-fail/import.rs @@ -12,6 +12,6 @@ use zed::bar; use zed::baz; mod zed { - pub fn bar() { info2!("bar"); } + pub fn bar() { info!("bar"); } } fn main(args: ~[str]) { bar(); } diff --git a/src/test/compile-fail/import2.rs b/src/test/compile-fail/import2.rs index 8cebbdbc176..e67a79130b1 100644 --- a/src/test/compile-fail/import2.rs +++ b/src/test/compile-fail/import2.rs @@ -13,6 +13,6 @@ use baz::zed::bar; //~ ERROR unresolved import mod baz {} mod zed { - pub fn bar() { info2!("bar3"); } + pub fn bar() { info!("bar3"); } } fn main(args: ~[str]) { bar(); } diff --git a/src/test/compile-fail/import3.rs b/src/test/compile-fail/import3.rs index f05a90acc9d..7a7f4f20aea 100644 --- a/src/test/compile-fail/import3.rs +++ b/src/test/compile-fail/import3.rs @@ -11,4 +11,4 @@ // error-pattern: unresolved use main::bar; -fn main(args: ~[str]) { info2!("foo"); } +fn main(args: ~[str]) { info!("foo"); } diff --git a/src/test/compile-fail/import4.rs b/src/test/compile-fail/import4.rs index bcc93407ec1..087842d78c7 100644 --- a/src/test/compile-fail/import4.rs +++ b/src/test/compile-fail/import4.rs @@ -13,4 +13,4 @@ mod a { pub use b::foo; } mod b { pub use a::foo; } -fn main(args: ~[str]) { info2!("loop"); } +fn main(args: ~[str]) { info!("loop"); } diff --git a/src/test/compile-fail/issue-1448-2.rs b/src/test/compile-fail/issue-1448-2.rs index bf419db3954..e2ca7641500 100644 --- a/src/test/compile-fail/issue-1448-2.rs +++ b/src/test/compile-fail/issue-1448-2.rs @@ -13,5 +13,5 @@ fn foo(a: uint) -> uint { a } fn main() { - info2!("{:u}", foo(10i)); //~ ERROR mismatched types + info!("{:u}", foo(10i)); //~ ERROR mismatched types } diff --git a/src/test/compile-fail/issue-1476.rs b/src/test/compile-fail/issue-1476.rs index 5e1a69227e5..ed2e75c4fa6 100644 --- a/src/test/compile-fail/issue-1476.rs +++ b/src/test/compile-fail/issue-1476.rs @@ -9,5 +9,5 @@ // except according to those terms. fn main() { - error2!("{:?}", x); //~ ERROR unresolved name `x`. + error!("{:?}", x); //~ ERROR unresolved name `x`. } diff --git a/src/test/compile-fail/issue-2149.rs b/src/test/compile-fail/issue-2149.rs index 1e427ceb4b7..3da01c6fb01 100644 --- a/src/test/compile-fail/issue-2149.rs +++ b/src/test/compile-fail/issue-2149.rs @@ -14,7 +14,7 @@ trait vec_monad<A> { impl<A> vec_monad<A> for ~[A] { fn bind<B>(&self, f: &fn(A) -> ~[B]) { - let mut r = fail2!(); + let mut r = fail!(); for elt in self.iter() { r = r + f(*elt); } //~^ ERROR the type of this value must be known } diff --git a/src/test/compile-fail/issue-2150.rs b/src/test/compile-fail/issue-2150.rs index 1c4df25f353..64344ab4277 100644 --- a/src/test/compile-fail/issue-2150.rs +++ b/src/test/compile-fail/issue-2150.rs @@ -13,7 +13,7 @@ fn fail_len(v: ~[int]) -> uint { let mut i = 3; - fail2!(); + fail!(); for x in v.iter() { i += 1u; } //~^ ERROR: unreachable statement return i; diff --git a/src/test/compile-fail/issue-2151.rs b/src/test/compile-fail/issue-2151.rs index db02bb5e55b..5559ba344ed 100644 --- a/src/test/compile-fail/issue-2151.rs +++ b/src/test/compile-fail/issue-2151.rs @@ -9,6 +9,6 @@ // except according to those terms. fn main() { - let x = fail2!(); + let x = fail!(); x.clone(); //~ ERROR the type of this value must be known in this context } diff --git a/src/test/compile-fail/issue-2281-part1.rs b/src/test/compile-fail/issue-2281-part1.rs index b9b26e12b40..7896d91443d 100644 --- a/src/test/compile-fail/issue-2281-part1.rs +++ b/src/test/compile-fail/issue-2281-part1.rs @@ -10,4 +10,4 @@ // error-pattern: unresolved name `foobar`. -fn main(args: ~[str]) { info2!("{:?}", foobar); } +fn main(args: ~[str]) { info!("{:?}", foobar); } diff --git a/src/test/compile-fail/issue-2330.rs b/src/test/compile-fail/issue-2330.rs index c8f835ccdc9..6152e82294d 100644 --- a/src/test/compile-fail/issue-2330.rs +++ b/src/test/compile-fail/issue-2330.rs @@ -16,7 +16,7 @@ trait channel<T> { // `chan` is not a trait, it's an enum impl chan for int { //~ ERROR chan is not a trait - fn send(&self, v: int) { fail2!() } + fn send(&self, v: int) { fail!() } } fn main() { diff --git a/src/test/compile-fail/issue-2370-2.rs b/src/test/compile-fail/issue-2370-2.rs index 247ef3d751f..dc4530d586e 100644 --- a/src/test/compile-fail/issue-2370-2.rs +++ b/src/test/compile-fail/issue-2370-2.rs @@ -15,5 +15,5 @@ struct cat { fn main() { let kitty : cat = cat { x: () }; - error2!("{:?}", *kitty); + error!("{:?}", *kitty); } diff --git a/src/test/compile-fail/issue-2370.rs b/src/test/compile-fail/issue-2370.rs index 5754b4bb472..656088a00b7 100644 --- a/src/test/compile-fail/issue-2370.rs +++ b/src/test/compile-fail/issue-2370.rs @@ -15,5 +15,5 @@ struct cat { fn main() { let nyan = cat { foo: () }; - error2!("{:?}", *nyan); + error!("{:?}", *nyan); } diff --git a/src/test/compile-fail/issue-2611-4.rs b/src/test/compile-fail/issue-2611-4.rs index 77f07a9d793..c62c2874525 100644 --- a/src/test/compile-fail/issue-2611-4.rs +++ b/src/test/compile-fail/issue-2611-4.rs @@ -20,7 +20,7 @@ struct E { } impl A for E { - fn b<F:Freeze,G>(_x: F) -> F { fail2!() } //~ ERROR type parameter 0 requires `Freeze` + fn b<F:Freeze,G>(_x: F) -> F { fail!() } //~ ERROR type parameter 0 requires `Freeze` } fn main() {} diff --git a/src/test/compile-fail/issue-2611-5.rs b/src/test/compile-fail/issue-2611-5.rs index 7dc6dd6a852..9b8346da5c5 100644 --- a/src/test/compile-fail/issue-2611-5.rs +++ b/src/test/compile-fail/issue-2611-5.rs @@ -21,7 +21,7 @@ struct E { impl A for E { // n.b. The error message is awful -- see #3404 - fn b<F:Clone,G>(&self, _x: G) -> G { fail2!() } //~ ERROR method `b` has an incompatible type + fn b<F:Clone,G>(&self, _x: G) -> G { fail!() } //~ ERROR method `b` has an incompatible type } fn main() {} diff --git a/src/test/compile-fail/issue-2823.rs b/src/test/compile-fail/issue-2823.rs index 49bc3b9ba6c..790a5fac183 100644 --- a/src/test/compile-fail/issue-2823.rs +++ b/src/test/compile-fail/issue-2823.rs @@ -14,7 +14,7 @@ struct C { impl Drop for C { fn drop(&mut self) { - error2!("dropping: {:?}", self.x); + error!("dropping: {:?}", self.x); } } diff --git a/src/test/compile-fail/issue-3021.rs b/src/test/compile-fail/issue-3021.rs index f8e355360d7..56ade814db0 100644 --- a/src/test/compile-fail/issue-3021.rs +++ b/src/test/compile-fail/issue-3021.rs @@ -25,7 +25,7 @@ fn siphash(k0 : u64) -> SipHash { //~^ ERROR unresolved name `k0`. } } - fail2!(); + fail!(); } fn main() {} diff --git a/src/test/compile-fail/issue-3038.rs b/src/test/compile-fail/issue-3038.rs index 3ab44b66748..d0c7a07859e 100644 --- a/src/test/compile-fail/issue-3038.rs +++ b/src/test/compile-fail/issue-3038.rs @@ -19,13 +19,13 @@ fn main() { let _z = match g(1, 2) { - g(x, x) => { info2!("{:?}", x + x); } + g(x, x) => { info!("{:?}", x + x); } //~^ ERROR Identifier `x` is bound more than once in the same pattern }; let _z = match i(l(1, 2), m(3, 4)) { i(l(x, _), m(_, x)) //~ ERROR Identifier `x` is bound more than once in the same pattern - => { error2!("{:?}", x + x); } + => { error!("{:?}", x + x); } }; let _z = match (1, 2) { diff --git a/src/test/compile-fail/issue-3099.rs b/src/test/compile-fail/issue-3099.rs index d65001f2b04..bb220091a13 100644 --- a/src/test/compile-fail/issue-3099.rs +++ b/src/test/compile-fail/issue-3099.rs @@ -17,5 +17,5 @@ fn a(x: ~str, y: ~str) -> ~str { //~ ERROR duplicate definition of value `a` } fn main() { - info2!("Result: "); + info!("Result: "); } diff --git a/src/test/compile-fail/issue-3521-2.rs b/src/test/compile-fail/issue-3521-2.rs index 7c56064c299..db07d9a94e8 100644 --- a/src/test/compile-fail/issue-3521-2.rs +++ b/src/test/compile-fail/issue-3521-2.rs @@ -13,5 +13,5 @@ fn main() { static y: int = foo + 1; //~ ERROR: attempt to use a non-constant value in a constant - error2!("{}", y); + error!("{}", y); } diff --git a/src/test/compile-fail/issue-3521.rs b/src/test/compile-fail/issue-3521.rs index aa82ade449d..94ca74d2b6a 100644 --- a/src/test/compile-fail/issue-3521.rs +++ b/src/test/compile-fail/issue-3521.rs @@ -15,5 +15,5 @@ fn main() { Bar = foo //~ ERROR attempt to use a non-constant value in a constant } - error2!("{:?}", Bar); + error!("{:?}", Bar); } diff --git a/src/test/compile-fail/issue-3601.rs b/src/test/compile-fail/issue-3601.rs index 4718c5b88a6..c37c5a3e5af 100644 --- a/src/test/compile-fail/issue-3601.rs +++ b/src/test/compile-fail/issue-3601.rs @@ -37,6 +37,6 @@ fn main() { ~Element(ed) => match ed.kind { //~ ERROR non-exhaustive patterns ~HTMLImageElement(ref d) if d.image.is_some() => { true } }, - _ => fail2!("WAT") //~ ERROR unreachable pattern + _ => fail!("WAT") //~ ERROR unreachable pattern }; } diff --git a/src/test/compile-fail/issue-3668.rs b/src/test/compile-fail/issue-3668.rs index b6bfe79800f..77e2e4f21e8 100644 --- a/src/test/compile-fail/issue-3668.rs +++ b/src/test/compile-fail/issue-3668.rs @@ -16,7 +16,7 @@ trait PTrait { impl PTrait for P { fn getChildOption(&self) -> Option<@P> { static childVal: @P = self.child.get(); //~ ERROR attempt to use a non-constant value in a constant - fail2!(); + fail!(); } } diff --git a/src/test/compile-fail/issue-6458-1.rs b/src/test/compile-fail/issue-6458-1.rs index 77ff58e7427..a54f05ec348 100644 --- a/src/test/compile-fail/issue-6458-1.rs +++ b/src/test/compile-fail/issue-6458-1.rs @@ -9,4 +9,4 @@ // except according to those terms. fn foo<T>(t: T) {} -fn main() { foo(fail2!()) } //~ ERROR cannot determine a type for this expression: unconstrained type +fn main() { foo(fail!()) } //~ ERROR cannot determine a type for this expression: unconstrained type diff --git a/src/test/compile-fail/lint-unused-unsafe.rs b/src/test/compile-fail/lint-unused-unsafe.rs index 9deb7d6fba4..6f0c2f1de1a 100644 --- a/src/test/compile-fail/lint-unused-unsafe.rs +++ b/src/test/compile-fail/lint-unused-unsafe.rs @@ -19,7 +19,7 @@ mod foo { } } -fn callback<T>(_f: &fn() -> T) -> T { fail2!() } +fn callback<T>(_f: &fn() -> T) -> T { fail!() } unsafe fn unsf() {} fn bad1() { unsafe {} } //~ ERROR: unnecessary `unsafe` block @@ -49,7 +49,7 @@ fn good2() { sure that when purity is inherited that the source of the unsafe-ness is tracked correctly */ unsafe { - unsafe fn what() -> ~[~str] { fail2!() } + unsafe fn what() -> ~[~str] { fail!() } do callback { what(); diff --git a/src/test/compile-fail/liveness-and-init.rs b/src/test/compile-fail/liveness-and-init.rs index 71d063130bf..134390d0b59 100644 --- a/src/test/compile-fail/liveness-and-init.rs +++ b/src/test/compile-fail/liveness-and-init.rs @@ -11,6 +11,6 @@ fn main() { let i: int; - info2!("{}", false && { i = 5; true }); - info2!("{}", i); //~ ERROR use of possibly uninitialized variable: `i` + info!("{}", false && { i = 5; true }); + info!("{}", i); //~ ERROR use of possibly uninitialized variable: `i` } diff --git a/src/test/compile-fail/liveness-bad-bang-2.rs b/src/test/compile-fail/liveness-bad-bang-2.rs index 87cd83d8aea..5399127fcb6 100644 --- a/src/test/compile-fail/liveness-bad-bang-2.rs +++ b/src/test/compile-fail/liveness-bad-bang-2.rs @@ -12,6 +12,6 @@ // Tests that a function with a ! annotation always actually fails // error-pattern: some control paths may return -fn bad_bang(i: uint) -> ! { info2!("{}", 3); } +fn bad_bang(i: uint) -> ! { info!("{}", 3); } fn main() { bad_bang(5u); } diff --git a/src/test/compile-fail/liveness-block-unint.rs b/src/test/compile-fail/liveness-block-unint.rs index 9438aa0e52e..98b6cabb6ff 100644 --- a/src/test/compile-fail/liveness-block-unint.rs +++ b/src/test/compile-fail/liveness-block-unint.rs @@ -12,6 +12,6 @@ fn force(f: &fn()) { f(); } fn main() { let x: int; force(|| { - info2!("{}", x); //~ ERROR capture of possibly uninitialized variable: `x` + info!("{}", x); //~ ERROR capture of possibly uninitialized variable: `x` }); } diff --git a/src/test/compile-fail/liveness-break-uninit-2.rs b/src/test/compile-fail/liveness-break-uninit-2.rs index 37a91338d8d..accb9076974 100644 --- a/src/test/compile-fail/liveness-break-uninit-2.rs +++ b/src/test/compile-fail/liveness-break-uninit-2.rs @@ -16,9 +16,9 @@ fn foo() -> int { x = 0; } - info2!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` + info!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` return 17; } -fn main() { info2!("{}", foo()); } +fn main() { info!("{}", foo()); } diff --git a/src/test/compile-fail/liveness-break-uninit.rs b/src/test/compile-fail/liveness-break-uninit.rs index 5aae93df0dc..d49e79d2c64 100644 --- a/src/test/compile-fail/liveness-break-uninit.rs +++ b/src/test/compile-fail/liveness-break-uninit.rs @@ -16,9 +16,9 @@ fn foo() -> int { x = 0; } - info2!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` + info!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` return 17; } -fn main() { info2!("{}", foo()); } +fn main() { info!("{}", foo()); } diff --git a/src/test/compile-fail/liveness-closure-require-ret.rs b/src/test/compile-fail/liveness-closure-require-ret.rs index 69aa47bd567..8f9941e6688 100644 --- a/src/test/compile-fail/liveness-closure-require-ret.rs +++ b/src/test/compile-fail/liveness-closure-require-ret.rs @@ -9,4 +9,4 @@ // except according to those terms. fn force(f: &fn() -> int) -> int { f() } -fn main() { info2!("{:?}", force(|| {})); } //~ ERROR mismatched types +fn main() { info!("{:?}", force(|| {})); } //~ ERROR mismatched types diff --git a/src/test/compile-fail/liveness-if-no-else.rs b/src/test/compile-fail/liveness-if-no-else.rs index a0436d98416..8dc590b47f0 100644 --- a/src/test/compile-fail/liveness-if-no-else.rs +++ b/src/test/compile-fail/liveness-if-no-else.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn foo(x: int) { info2!("{}", x); } +fn foo(x: int) { info!("{}", x); } fn main() { let x: int; if 1 > 2 { x = 10; } diff --git a/src/test/compile-fail/liveness-if-with-else.rs b/src/test/compile-fail/liveness-if-with-else.rs index cf13f7117ee..55fb8222634 100644 --- a/src/test/compile-fail/liveness-if-with-else.rs +++ b/src/test/compile-fail/liveness-if-with-else.rs @@ -8,12 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn foo(x: int) { info2!("{:?}", x); } +fn foo(x: int) { info!("{:?}", x); } fn main() { let x: int; if 1 > 2 { - info2!("whoops"); + info!("whoops"); } else { x = 10; } diff --git a/src/test/compile-fail/liveness-init-in-fn-expr.rs b/src/test/compile-fail/liveness-init-in-fn-expr.rs index db8afdf45ae..13816313884 100644 --- a/src/test/compile-fail/liveness-init-in-fn-expr.rs +++ b/src/test/compile-fail/liveness-init-in-fn-expr.rs @@ -13,5 +13,5 @@ fn main() { let i: int; i //~ ERROR use of possibly uninitialized variable: `i` }; - error2!("{:?}", f()); + error!("{:?}", f()); } diff --git a/src/test/compile-fail/liveness-move-in-loop.rs b/src/test/compile-fail/liveness-move-in-loop.rs index 769de1e7ef3..6ba7d57ef88 100644 --- a/src/test/compile-fail/liveness-move-in-loop.rs +++ b/src/test/compile-fail/liveness-move-in-loop.rs @@ -12,7 +12,7 @@ fn main() { let y: ~int = ~42; let mut x: ~int; loop { - info2!("{:?}", y); + info!("{:?}", y); loop { loop { loop { diff --git a/src/test/compile-fail/liveness-move-in-while.rs b/src/test/compile-fail/liveness-move-in-while.rs index 752c6c9f1b7..ad0cdc5451f 100644 --- a/src/test/compile-fail/liveness-move-in-while.rs +++ b/src/test/compile-fail/liveness-move-in-while.rs @@ -13,7 +13,7 @@ fn main() { let y: ~int = ~42; let mut x: ~int; loop { - info2!("{:?}", y); //~ ERROR use of moved value: `y` + info!("{:?}", y); //~ ERROR use of moved value: `y` while true { while true { while true { x = y; x.clone(); } } } //~^ ERROR use of moved value: `y` } diff --git a/src/test/compile-fail/liveness-or-init.rs b/src/test/compile-fail/liveness-or-init.rs index 9ab7a64e8bd..f878afce969 100644 --- a/src/test/compile-fail/liveness-or-init.rs +++ b/src/test/compile-fail/liveness-or-init.rs @@ -11,6 +11,6 @@ fn main() { let i: int; - info2!("{}", false || { i = 5; true }); - info2!("{}", i); //~ ERROR use of possibly uninitialized variable: `i` + info!("{}", false || { i = 5; true }); + info!("{}", i); //~ ERROR use of possibly uninitialized variable: `i` } diff --git a/src/test/compile-fail/liveness-uninit.rs b/src/test/compile-fail/liveness-uninit.rs index 439aff342bc..a6ce736c89b 100644 --- a/src/test/compile-fail/liveness-uninit.rs +++ b/src/test/compile-fail/liveness-uninit.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn foo(x: int) { info2!("{}", x); } +fn foo(x: int) { info!("{}", x); } fn main() { let x: int; diff --git a/src/test/compile-fail/liveness-use-after-move.rs b/src/test/compile-fail/liveness-use-after-move.rs index 8ef3c5494ae..83b8d79756f 100644 --- a/src/test/compile-fail/liveness-use-after-move.rs +++ b/src/test/compile-fail/liveness-use-after-move.rs @@ -11,6 +11,6 @@ fn main() { let x = ~5; let y = x; - info2!("{:?}", *x); //~ ERROR use of moved value: `x` + info!("{:?}", *x); //~ ERROR use of moved value: `x` y.clone(); } diff --git a/src/test/compile-fail/liveness-use-after-send.rs b/src/test/compile-fail/liveness-use-after-send.rs index 4f2d84ad13b..7bc277c2eac 100644 --- a/src/test/compile-fail/liveness-use-after-send.rs +++ b/src/test/compile-fail/liveness-use-after-send.rs @@ -9,9 +9,9 @@ // except according to those terms. fn send<T:Send>(ch: _chan<T>, data: T) { - info2!("{:?}", ch); - info2!("{:?}", data); - fail2!(); + info!("{:?}", ch); + info!("{:?}", data); + fail!(); } struct _chan<T>(int); @@ -20,7 +20,7 @@ struct _chan<T>(int); // message after the send deinitializes it fn test00_start(ch: _chan<~int>, message: ~int, _count: ~int) { send(ch, message); - info2!("{:?}", message); //~ ERROR use of moved value: `message` + info!("{:?}", message); //~ ERROR use of moved value: `message` } -fn main() { fail2!(); } +fn main() { fail!(); } diff --git a/src/test/compile-fail/liveness-while-break.rs b/src/test/compile-fail/liveness-while-break.rs index 02d8656baff..e5d4b6ef48c 100644 --- a/src/test/compile-fail/liveness-while-break.rs +++ b/src/test/compile-fail/liveness-while-break.rs @@ -14,7 +14,7 @@ fn test(cond: bool) { v = 3; break; } - info2!("{}", v); //~ ERROR use of possibly uninitialized variable: `v` + info!("{}", v); //~ ERROR use of possibly uninitialized variable: `v` } fn main() { diff --git a/src/test/compile-fail/match-join.rs b/src/test/compile-fail/match-join.rs index 5d9ae958ce0..8155a2fbda3 100644 --- a/src/test/compile-fail/match-join.rs +++ b/src/test/compile-fail/match-join.rs @@ -11,11 +11,11 @@ // a good test that we merge paths correctly in the presence of a // variable that's used before it's declared -fn my_fail() -> ! { fail2!(); } +fn my_fail() -> ! { fail!(); } fn main() { match true { false => { my_fail(); } true => { } } - info2!("{:?}", x); //~ ERROR unresolved name `x`. + info!("{:?}", x); //~ ERROR unresolved name `x`. let x: int; } diff --git a/src/test/compile-fail/moves-based-on-type-exprs.rs b/src/test/compile-fail/moves-based-on-type-exprs.rs index 6531ae03584..fec0f89adba 100644 --- a/src/test/compile-fail/moves-based-on-type-exprs.rs +++ b/src/test/compile-fail/moves-based-on-type-exprs.rs @@ -2,7 +2,7 @@ // they occur as part of various kinds of expressions. struct Foo<A> { f: A } -fn guard(_s: ~str) -> bool {fail2!()} +fn guard(_s: ~str) -> bool {fail!()} fn touch<A>(_a: &A) {} fn f10() { diff --git a/src/test/compile-fail/moves-based-on-type-match-bindings.rs b/src/test/compile-fail/moves-based-on-type-match-bindings.rs index 4893c8b7197..42944a206b3 100644 --- a/src/test/compile-fail/moves-based-on-type-match-bindings.rs +++ b/src/test/compile-fail/moves-based-on-type-match-bindings.rs @@ -3,7 +3,7 @@ // terms of the binding, not the discriminant. struct Foo<A> { f: A } -fn guard(_s: ~str) -> bool {fail2!()} +fn guard(_s: ~str) -> bool {fail!()} fn touch<A>(_a: &A) {} fn f10() { diff --git a/src/test/compile-fail/moves-based-on-type-no-recursive-stack-closure.rs b/src/test/compile-fail/moves-based-on-type-no-recursive-stack-closure.rs index d1eae1ae613..2762140be37 100644 --- a/src/test/compile-fail/moves-based-on-type-no-recursive-stack-closure.rs +++ b/src/test/compile-fail/moves-based-on-type-no-recursive-stack-closure.rs @@ -30,7 +30,7 @@ fn innocent_looking_victim() { (f.c)(f, true); println!("{:?}", msg); }, - None => fail2!("oops"), + None => fail!("oops"), } } } diff --git a/src/test/compile-fail/no-capture-arc.rs b/src/test/compile-fail/no-capture-arc.rs index 90a68d796f3..65e0c07b358 100644 --- a/src/test/compile-fail/no-capture-arc.rs +++ b/src/test/compile-fail/no-capture-arc.rs @@ -26,5 +26,5 @@ fn main() { assert_eq!((arc_v.get())[2], 3); - info2!("{:?}", arc_v); + info!("{:?}", arc_v); } diff --git a/src/test/compile-fail/no-reuse-move-arc.rs b/src/test/compile-fail/no-reuse-move-arc.rs index 9eca1329824..3cd048040c6 100644 --- a/src/test/compile-fail/no-reuse-move-arc.rs +++ b/src/test/compile-fail/no-reuse-move-arc.rs @@ -24,5 +24,5 @@ fn main() { assert_eq!((arc_v.get())[2], 3); //~ ERROR use of moved value: `arc_v` - info2!("{:?}", arc_v); //~ ERROR use of moved value: `arc_v` + info!("{:?}", arc_v); //~ ERROR use of moved value: `arc_v` } diff --git a/src/test/compile-fail/no-send-res-ports.rs b/src/test/compile-fail/no-send-res-ports.rs index f6d1aceab64..e0ce486cbd6 100644 --- a/src/test/compile-fail/no-send-res-ports.rs +++ b/src/test/compile-fail/no-send-res-ports.rs @@ -33,6 +33,6 @@ fn main() { do task::spawn { let y = x.take(); //~ ERROR does not fulfill `Send` - error2!("{:?}", y); + error!("{:?}", y); } } diff --git a/src/test/compile-fail/non-exhaustive-match-nested.rs b/src/test/compile-fail/non-exhaustive-match-nested.rs index f5660fd3510..b87b3c5245a 100644 --- a/src/test/compile-fail/non-exhaustive-match-nested.rs +++ b/src/test/compile-fail/non-exhaustive-match-nested.rs @@ -16,7 +16,7 @@ enum u { c, d } fn main() { let x = a(c); match x { - a(d) => { fail2!("hello"); } - b => { fail2!("goodbye"); } + a(d) => { fail!("hello"); } + b => { fail!("goodbye"); } } } diff --git a/src/test/compile-fail/noncopyable-class.rs b/src/test/compile-fail/noncopyable-class.rs index 199bdaa397a..e57ac5726fb 100644 --- a/src/test/compile-fail/noncopyable-class.rs +++ b/src/test/compile-fail/noncopyable-class.rs @@ -39,5 +39,5 @@ fn foo(i:int) -> foo { fn main() { let x = foo(10); let _y = x.clone(); //~ ERROR does not implement any method in scope - error2!("{:?}", x); + error!("{:?}", x); } diff --git a/src/test/compile-fail/nonscalar-cast.rs b/src/test/compile-fail/nonscalar-cast.rs index 45efa892989..5c7a85a0323 100644 --- a/src/test/compile-fail/nonscalar-cast.rs +++ b/src/test/compile-fail/nonscalar-cast.rs @@ -15,5 +15,5 @@ struct foo { } fn main() { - info2!("{:?}", foo{ x: 1 } as int); + info!("{:?}", foo{ x: 1 } as int); } diff --git a/src/test/compile-fail/not-enough-arguments.rs b/src/test/compile-fail/not-enough-arguments.rs index a53736580d9..57eca3666ef 100644 --- a/src/test/compile-fail/not-enough-arguments.rs +++ b/src/test/compile-fail/not-enough-arguments.rs @@ -13,7 +13,7 @@ // unrelated errors. fn foo(a: int, b: int, c: int, d:int) { - fail2!(); + fail!(); } fn main() { diff --git a/src/test/compile-fail/oversized-literal.rs b/src/test/compile-fail/oversized-literal.rs index 5b5cab25e04..2e4ba8855bd 100644 --- a/src/test/compile-fail/oversized-literal.rs +++ b/src/test/compile-fail/oversized-literal.rs @@ -10,4 +10,4 @@ // error-pattern:literal out of range -fn main() { info2!("{}", 300u8); } +fn main() { info!("{}", 300u8); } diff --git a/src/test/compile-fail/packed-struct-generic-transmute.rs b/src/test/compile-fail/packed-struct-generic-transmute.rs index 0a5bc4ad8bb..991a4ed9e09 100644 --- a/src/test/compile-fail/packed-struct-generic-transmute.rs +++ b/src/test/compile-fail/packed-struct-generic-transmute.rs @@ -32,6 +32,6 @@ fn main() { let foo = Foo { bar: [1u8, 2, 3, 4, 5], baz: 10i32 }; unsafe { let oof: Oof<[u8, .. 5], i32> = cast::transmute(foo); - info2!("{:?}", oof); + info!("{:?}", oof); } } diff --git a/src/test/compile-fail/packed-struct-transmute.rs b/src/test/compile-fail/packed-struct-transmute.rs index 79978dedb56..58c5aabba12 100644 --- a/src/test/compile-fail/packed-struct-transmute.rs +++ b/src/test/compile-fail/packed-struct-transmute.rs @@ -32,6 +32,6 @@ fn main() { let foo = Foo { bar: 1, baz: 10 }; unsafe { let oof: Oof = cast::transmute(foo); - info2!("{:?}", oof); + info!("{:?}", oof); } } diff --git a/src/test/compile-fail/pattern-tyvar-2.rs b/src/test/compile-fail/pattern-tyvar-2.rs index 216280b34e9..537d095d2d7 100644 --- a/src/test/compile-fail/pattern-tyvar-2.rs +++ b/src/test/compile-fail/pattern-tyvar-2.rs @@ -15,6 +15,6 @@ extern mod extra; enum bar { t1((), Option<~[int]>), t2, } // n.b. my change changes this error message, but I think it's right -- tjc -fn foo(t: bar) -> int { match t { t1(_, Some(x)) => { return x * 3; } _ => { fail2!(); } } } //~ ERROR binary operation * cannot be applied to +fn foo(t: bar) -> int { match t { t1(_, Some(x)) => { return x * 3; } _ => { fail!(); } } } //~ ERROR binary operation * cannot be applied to fn main() { } diff --git a/src/test/compile-fail/pattern-tyvar.rs b/src/test/compile-fail/pattern-tyvar.rs index 67a4bacbe9a..b81e4ea92d0 100644 --- a/src/test/compile-fail/pattern-tyvar.rs +++ b/src/test/compile-fail/pattern-tyvar.rs @@ -18,9 +18,9 @@ enum bar { t1((), Option<~[int]>), t2, } fn foo(t: bar) { match t { t1(_, Some::<int>(x)) => { - info2!("{:?}", x); + info!("{:?}", x); } - _ => { fail2!(); } + _ => { fail!(); } } } diff --git a/src/test/compile-fail/pinned-deep-copy.rs b/src/test/compile-fail/pinned-deep-copy.rs index 8baba6cccc1..69ed3ea545e 100644 --- a/src/test/compile-fail/pinned-deep-copy.rs +++ b/src/test/compile-fail/pinned-deep-copy.rs @@ -37,7 +37,7 @@ fn main() { // Can't do this copy let x = ~~~A {y: r(i)}; let _z = x.clone(); //~ ERROR failed to find an implementation - info2!("{:?}", x); + info!("{:?}", x); } - error2!("{:?}", *i); + error!("{:?}", *i); } diff --git a/src/test/compile-fail/regions-addr-of-self.rs b/src/test/compile-fail/regions-addr-of-self.rs index 1904f082617..3a480a7e963 100644 --- a/src/test/compile-fail/regions-addr-of-self.rs +++ b/src/test/compile-fail/regions-addr-of-self.rs @@ -33,5 +33,5 @@ fn dog() -> dog { fn main() { let mut d = dog(); d.chase_cat(); - info2!("cats_chased: {}", d.cats_chased); + info!("cats_chased: {}", d.cats_chased); } diff --git a/src/test/compile-fail/regions-fn-subtyping.rs b/src/test/compile-fail/regions-fn-subtyping.rs index 10107f64158..5928d31a668 100644 --- a/src/test/compile-fail/regions-fn-subtyping.rs +++ b/src/test/compile-fail/regions-fn-subtyping.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn of<T>() -> &fn(T) { fail2!(); } -fn subtype<T>(x: &fn(T)) { fail2!(); } +fn of<T>() -> &fn(T) { fail!(); } +fn subtype<T>(x: &fn(T)) { fail!(); } fn test_fn<'x,'y,'z,T>(_x: &'x T, _y: &'y T, _z: &'z T) { // Here, x, y, and z are free. Other letters diff --git a/src/test/compile-fail/regions-free-region-ordering-callee.rs b/src/test/compile-fail/regions-free-region-ordering-callee.rs index 872491adaac..66ab4b77054 100644 --- a/src/test/compile-fail/regions-free-region-ordering-callee.rs +++ b/src/test/compile-fail/regions-free-region-ordering-callee.rs @@ -27,7 +27,7 @@ fn ordering3<'a, 'b>(x: &'a uint, y: &'b uint) -> &'a &'b uint { // Do not infer an ordering from the return value. let z: &'b uint = &*x; //~^ ERROR cannot infer an appropriate lifetime due to conflicting requirements - fail2!(); + fail!(); } fn ordering4<'a, 'b>(a: &'a uint, b: &'b uint, x: &fn(&'a &'b uint)) { diff --git a/src/test/compile-fail/regions-freevar.rs b/src/test/compile-fail/regions-freevar.rs index 06e91ddcf56..251be912359 100644 --- a/src/test/compile-fail/regions-freevar.rs +++ b/src/test/compile-fail/regions-freevar.rs @@ -13,6 +13,6 @@ fn wants_static_fn(_x: &'static fn()) {} fn main() { let i = 3; do wants_static_fn { //~ ERROR cannot infer an appropriate lifetime due to conflicting requirements - info2!("i={}", i); + info!("i={}", i); } } diff --git a/src/test/compile-fail/regions-ret-borrowed-1.rs b/src/test/compile-fail/regions-ret-borrowed-1.rs index 885d50b7efc..df7831e9050 100644 --- a/src/test/compile-fail/regions-ret-borrowed-1.rs +++ b/src/test/compile-fail/regions-ret-borrowed-1.rs @@ -24,5 +24,5 @@ fn return_it<'a>() -> &'a int { fn main() { let x = return_it(); - info2!("foo={}", *x); + info!("foo={}", *x); } diff --git a/src/test/compile-fail/regions-ret-borrowed.rs b/src/test/compile-fail/regions-ret-borrowed.rs index 5dea40f4ac7..c2e48053260 100644 --- a/src/test/compile-fail/regions-ret-borrowed.rs +++ b/src/test/compile-fail/regions-ret-borrowed.rs @@ -27,5 +27,5 @@ fn return_it() -> &int { fn main() { let x = return_it(); - info2!("foo={}", *x); + info!("foo={}", *x); } diff --git a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs index ce6d12a2265..ebd3320d901 100644 --- a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs +++ b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs @@ -16,7 +16,7 @@ extern mod std; fn last<T>(v: ~[&T]) -> std::option::Option<T> { - fail2!(); + fail!(); } fn main() { diff --git a/src/test/compile-fail/tag-type-args.rs b/src/test/compile-fail/tag-type-args.rs index a88435bff6e..f2ef1d19525 100644 --- a/src/test/compile-fail/tag-type-args.rs +++ b/src/test/compile-fail/tag-type-args.rs @@ -14,4 +14,4 @@ enum quux<T> { bar } fn foo(c: quux) { assert!((false)); } -fn main() { fail2!(); } +fn main() { fail!(); } diff --git a/src/test/compile-fail/unique-pinned-nocopy.rs b/src/test/compile-fail/unique-pinned-nocopy.rs index 8882bd1e268..bf62247e7e7 100644 --- a/src/test/compile-fail/unique-pinned-nocopy.rs +++ b/src/test/compile-fail/unique-pinned-nocopy.rs @@ -19,5 +19,5 @@ impl Drop for r { fn main() { let i = ~r { b: true }; let _j = i.clone(); //~ ERROR failed to find an implementation - info2!("{:?}", i); + info!("{:?}", i); } diff --git a/src/test/compile-fail/unique-vec-res.rs b/src/test/compile-fail/unique-vec-res.rs index 4bc181cbdfa..dd9d2e067c6 100644 --- a/src/test/compile-fail/unique-vec-res.rs +++ b/src/test/compile-fail/unique-vec-res.rs @@ -31,6 +31,6 @@ fn main() { let r2 = ~[~r { i: i2 }]; f(r1.clone(), r2.clone()); //~^ ERROR failed to find an implementation of - info2!("{:?}", (r2, *i1)); - info2!("{:?}", (r1, *i2)); + info!("{:?}", (r2, *i1)); + info!("{:?}", (r1, *i2)); } diff --git a/src/test/compile-fail/unsupported-cast.rs b/src/test/compile-fail/unsupported-cast.rs index d9a5302aedc..dc3895d0190 100644 --- a/src/test/compile-fail/unsupported-cast.rs +++ b/src/test/compile-fail/unsupported-cast.rs @@ -13,5 +13,5 @@ use std::libc; fn main() { - info2!("{:?}", 1.0 as *libc::FILE); // Can't cast float to foreign. + info!("{:?}", 1.0 as *libc::FILE); // Can't cast float to foreign. } diff --git a/src/test/compile-fail/vec-field.rs b/src/test/compile-fail/vec-field.rs index 38bba1efea5..d97c32a64a4 100644 --- a/src/test/compile-fail/vec-field.rs +++ b/src/test/compile-fail/vec-field.rs @@ -13,7 +13,7 @@ fn f() { let v = ~[1i]; - info2!("{}", v.some_field_name); //type error + info!("{}", v.some_field_name); //type error } fn main() { } diff --git a/src/test/compile-fail/vec-res-add.rs b/src/test/compile-fail/vec-res-add.rs index 48db83bd92f..3545392d5d9 100644 --- a/src/test/compile-fail/vec-res-add.rs +++ b/src/test/compile-fail/vec-res-add.rs @@ -25,5 +25,5 @@ fn main() { let i = ~[r(0)]; let j = ~[r(1)]; let k = i + j; - info2!("{}", j); + info!("{}", j); } diff --git a/src/test/pretty/issue-929.rs b/src/test/pretty/issue-929.rs index a82a8ec41c7..636fac82b6b 100644 --- a/src/test/pretty/issue-929.rs +++ b/src/test/pretty/issue-929.rs @@ -8,6 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn f() { if (1 == fail2!()) { } else { } } +fn f() { if (1 == fail!()) { } else { } } fn main() { } diff --git a/src/test/run-fail/args-fail.rs b/src/test/run-fail/args-fail.rs index d936368cc33..b803d7488b0 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) { fail2!("moop"); } +fn f(_a: int, _b: int, _c: @int) { fail!("moop"); } -fn main() { f(1, fail2!("meep"), @42); } +fn main() { f(1, fail!("meep"), @42); } diff --git a/src/test/run-fail/binop-fail-2.rs b/src/test/run-fail/binop-fail-2.rs index 1038d2025c7..ef2a4e5335f 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) -> ! { error2!("{}", s); fail2!("quux"); } +fn my_err(s: ~str) -> ! { error!("{}", s); fail!("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 b46d5251e22..150544f16af 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() -> ! { fail2!("quux"); } +fn foo() -> ! { fail!("quux"); } fn main() { foo() == foo(); } diff --git a/src/test/run-fail/binop-fail.rs b/src/test/run-fail/binop-fail.rs index 1038d2025c7..ef2a4e5335f 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) -> ! { error2!("{}", s); fail2!("quux"); } +fn my_err(s: ~str) -> ! { error!("{}", s); fail!("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 17b4c83788c..36f05a0a73c 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 / mem::size_of::<uint>(); - error2!("ov1 base = 0x{:x}", base); - error2!("ov1 idx = 0x{:x}", idx); - error2!("ov1 sizeof::<uint>() = 0x{:x}", mem::size_of::<uint>()); - error2!("ov1 idx * sizeof::<uint>() = 0x{:x}", + error!("ov1 base = 0x{:x}", base); + error!("ov1 idx = 0x{:x}", idx); + error!("ov1 sizeof::<uint>() = 0x{:x}", mem::size_of::<uint>()); + error!("ov1 idx * sizeof::<uint>() = 0x{:x}", idx * mem::size_of::<uint>()); // This should fail. - error2!("ov1 0x{:x}", x[idx]); + error!("ov1 0x{:x}", x[idx]); } } diff --git a/src/test/run-fail/bug-811.rs b/src/test/run-fail/bug-811.rs index b41062043cf..2a256b9a4e3 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) { fail2!(); } +fn send<T:Send>(_ch: chan_t<T>, _data: T) { fail!(); } -fn main() { fail2!("quux"); } +fn main() { fail!("quux"); } diff --git a/src/test/run-fail/die-macro-expr.rs b/src/test/run-fail/die-macro-expr.rs index 3310ffe909a..8ff62d5a43d 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 = fail2!("test"); + let _i: int = fail!("test"); } diff --git a/src/test/run-fail/die-macro-pure.rs b/src/test/run-fail/die-macro-pure.rs index 6d0f5909c4d..bb62a7e8bef 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() { - fail2!("test"); + fail!("test"); } fn main() { diff --git a/src/test/run-fail/die-macro.rs b/src/test/run-fail/die-macro.rs index 678ac655580..71cc7317e6e 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() { - fail2!("test"); + fail!("test"); } diff --git a/src/test/run-fail/doublefail.rs b/src/test/run-fail/doublefail.rs index ee59823e8ad..1ceeee1b6ed 100644 --- a/src/test/run-fail/doublefail.rs +++ b/src/test/run-fail/doublefail.rs @@ -12,6 +12,6 @@ //error-pattern:One fn main() { - fail2!("One"); - fail2!("Two"); + fail!("One"); + fail!("Two"); } diff --git a/src/test/run-fail/explicit-fail-msg.rs b/src/test/run-fail/explicit-fail-msg.rs index c1d2e986f12..ab8cea0a305 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; } - fail2!(~"woooo" + "o"); + fail!(~"woooo" + "o"); } diff --git a/src/test/run-fail/explicit-fail.rs b/src/test/run-fail/explicit-fail.rs index 78a407bbbd5..8c204b66e36 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() { fail2!(); } +fn main() { fail!(); } diff --git a/src/test/run-fail/expr-fn-fail.rs b/src/test/run-fail/expr-fn-fail.rs index a8714fdbdc8..e645ea34df5 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() -> ! { fail2!() } +fn f() -> ! { fail!() } 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 8ecc2cdf0f4..99f798147f2 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() -> ! { fail2!() } +fn f() -> ! { fail!() } 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 50778f65560..73259e6e140 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 { fail2!() } else { 10 }; } +fn main() { let _x = if false { 0 } else if true { fail!() } 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 98cc3c230a0..6476e57a35b 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() -> ! { fail2!() } +fn f() -> ! { fail!() } 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 c8cab907d7d..075f6f5b4b1 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 => { fail2!() } }; } +fn main() { let _x = match true { false => { 0 } true => { fail!() } }; } diff --git a/src/test/run-fail/extern-fail.rs b/src/test/run-fail/extern-fail.rs index 17059107c01..ce5ea56502c 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); - fail2!(); + fail!(); }; } } diff --git a/src/test/run-fail/fail-arg.rs b/src/test/run-fail/fail-arg.rs index 29baa4b3170..705b7f4028c 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) { info2!("{}", a); } +fn f(a: int) { info!("{}", a); } -fn main() { f(fail2!("woe")); } +fn main() { f(fail!("woe")); } diff --git a/src/test/run-fail/fail-macro-explicit.rs b/src/test/run-fail/fail-macro-explicit.rs index ca6abee03bf..13e3a6a31a8 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() { - fail2!(); + fail!(); } diff --git a/src/test/run-fail/fail-macro-fmt.rs b/src/test/run-fail/fail-macro-fmt.rs index 90d9ff9b0ec..e97d2dbe985 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() { - fail2!("test-fail-fmt {} {}", 42, "rust"); + fail!("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 fa461fefb88..e59f5bdcaa1 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() { - fail2!("test-fail-owned"); + fail!("test-fail-owned"); } diff --git a/src/test/run-fail/fail-macro-static.rs b/src/test/run-fail/fail-macro-static.rs index f05a68a5fcb..688ca4ce7e5 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() { - fail2!("test-fail-static"); + fail!("test-fail-static"); } diff --git a/src/test/run-fail/fail-main.rs b/src/test/run-fail/fail-main.rs index 2691beed272..f007e03041c 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() { fail2!("moop"); } +fn main() { fail!("moop"); } diff --git a/src/test/run-fail/fail-parens.rs b/src/test/run-fail/fail-parens.rs index 79f46f47fb3..90a44e42759 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 (fail2!("oops")) { if (fail2!()) { - match (fail2!()) { () => { + while (fail!("oops")) { if (fail!()) { + match (fail!()) { () => { } } }}; diff --git a/src/test/run-fail/fail-task-name-none.rs b/src/test/run-fail/fail-task-name-none.rs index 5d4de9ea43c..542ccfb0aea 100644 --- a/src/test/run-fail/fail-task-name-none.rs +++ b/src/test/run-fail/fail-task-name-none.rs @@ -12,6 +12,6 @@ fn main() { do spawn { - fail2!("test"); + fail!("test"); } } diff --git a/src/test/run-fail/fail-task-name-owned.rs b/src/test/run-fail/fail-task-name-owned.rs index f00f18cf5c2..ff3596df142 100644 --- a/src/test/run-fail/fail-task-name-owned.rs +++ b/src/test/run-fail/fail-task-name-owned.rs @@ -14,6 +14,6 @@ fn main() { let mut t = ::std::task::task(); t.name(~"owned name"); do t.spawn { - fail2!("test"); + fail!("test"); } } diff --git a/src/test/run-fail/fail-task-name-send-str.rs b/src/test/run-fail/fail-task-name-send-str.rs index e44f78094ff..96fe82fa5ca 100644 --- a/src/test/run-fail/fail-task-name-send-str.rs +++ b/src/test/run-fail/fail-task-name-send-str.rs @@ -14,6 +14,6 @@ fn main() { let mut t = ::std::task::task(); t.name("send name".to_send_str()); do t.spawn { - fail2!("test"); + fail!("test"); } } diff --git a/src/test/run-fail/fail-task-name-static.rs b/src/test/run-fail/fail-task-name-static.rs index 0b502d8a35e..a20dbe42c6d 100644 --- a/src/test/run-fail/fail-task-name-static.rs +++ b/src/test/run-fail/fail-task-name-static.rs @@ -14,6 +14,6 @@ fn main() { let mut t = ::std::task::task(); t.name("static name"); do t.spawn { - fail2!("test"); + fail!("test"); } } diff --git a/src/test/run-fail/fmt-fail.rs b/src/test/run-fail/fmt-fail.rs index 1c6298a6c8d..3bc9014a74c 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"; fail2!("{}", str_var); } +fn main() { let str_var: ~str = ~"meh"; fail!("{}", 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 032460d2079..3c9397fc07f 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) { fail2!("moop"); } } +fn main() { for _ in range(0u, 10u) { fail!("moop"); } } diff --git a/src/test/run-fail/if-check-fail.rs b/src/test/run-fail/if-check-fail.rs index e8a1cad53ad..d9e64fecfd4 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) { - info2!("{}", x); + info!("{}", x); } else { - fail2!("Number is odd"); + fail!("Number is odd"); } } diff --git a/src/test/run-fail/if-cond-bot.rs b/src/test/run-fail/if-cond-bot.rs index d596a11f1cb..97c4279b188 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) -> ! { error2!("{}", s); fail2!("quux"); } +fn my_err(s: ~str) -> ! { error!("{}", s); fail!("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 78422347f78..863663334f8 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() { '=' => { } _ => { fail2!() } } + match rdr.read_char() { '=' => { } _ => { fail!() } } } } diff --git a/src/test/run-fail/issue-2272.rs b/src/test/run-fail/issue-2272.rs index 9b8ecca96a6..5ce89bc1814 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 }; - fail2!(); + fail!(); } diff --git a/src/test/run-fail/issue-2444.rs b/src/test/run-fail/issue-2444.rs index b15c54c7b6e..c1357988f7d 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> {fail2!();} +fn foo() -> e<int> {fail!();} fn main() { let _f = foo(); diff --git a/src/test/run-fail/issue-3029.rs b/src/test/run-fail/issue-3029.rs index 5d20c49945e..44364007c06 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]; - fail2!("so long"); + fail!("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 39d741e5169..db954bc5946 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: (fail2!("beep boop")),.. origin}; + let f: Point = Point {x: (fail!("beep boop")),.. origin}; } diff --git a/src/test/run-fail/linked-failure2.rs b/src/test/run-fail/linked-failure2.rs index d99cfe40da4..52a67872d4c 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() { fail2!(); } +fn child() { fail!(); } 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 fd330bba1c5..f40eae20bc0 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() { fail2!("grandchild dies"); } +fn grandchild() { fail!("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 7b1d6bea499..a54422ef8f5 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> => { fail2!() } Some::<int>(_) => { fail2!() } }; + match Some::<int>(3) { None::<int> => { fail!() } Some::<int>(_) => { fail!() } }; foo(i); } diff --git a/src/test/run-fail/match-disc-bot.rs b/src/test/run-fail/match-disc-bot.rs index 9b38a381a58..13ccd118c61 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() -> ! { fail2!("quux") } +fn f() -> ! { fail!("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 535b3340a4d..0d1aebc82e9 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(_), _) => { fail2!("squirrelcupcake"); } - (_, Some(_)) => { fail2!(); } - _ => { fail2!("wat"); } + (Some(_), _) => { fail!("squirrelcupcake"); } + (_, Some(_)) => { fail!(); } + _ => { fail!("wat"); } } } -fn main() { error2!("{}", cmp()); } +fn main() { error!("{}", cmp()); } diff --git a/src/test/run-fail/morestack1.rs b/src/test/run-fail/morestack1.rs index 35c19c47f52..d3e3be6c2ca 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 { - fail2!(); + fail!(); } } diff --git a/src/test/run-fail/morestack2.rs b/src/test/run-fail/morestack2.rs index 9af45cebe68..5ac30926400 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(); - fail2!(); + fail!(); } } } diff --git a/src/test/run-fail/morestack3.rs b/src/test/run-fail/morestack3.rs index fea91551161..e6f219710b3 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 { - fail2!(); + fail!(); } } diff --git a/src/test/run-fail/morestack4.rs b/src/test/run-fail/morestack4.rs index a4df5e57923..02a65e91d04 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 { - fail2!(); + fail!(); } } diff --git a/src/test/run-fail/result-get-fail.rs b/src/test/run-fail/result-get-fail.rs index c3f4250b053..81eed9267ab 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() { - error2!("{:?}", result::Err::<int,~str>(~"kitty").unwrap()); + error!("{:?}", 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 5e09536fb4d..ca267608025 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 = fail2!("bye"); + let pth = fail!("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 5c854825c28..52399c09188 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() { - error2!("whatever"); + error!("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); - fail2!(); + fail!(); } 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 493420e3ee6..ea70bb0eab9 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() { - error2!("whatever"); + error!("whatever"); do task::spawn { let _i = r(5); }; - fail2!(); + fail!(); } diff --git a/src/test/run-fail/rt-set-exit-status.rs b/src/test/run-fail/rt-set-exit-status.rs index 4dc1386d850..915e9010b3e 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() { - error2!("whatever"); + error!("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 622e2e326e5..e9d3c41faa6 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() { fail2!("runned an unexported test"); } + fn unexported() { fail!("runned an unexported test"); } } diff --git a/src/test/run-fail/spawnfail.rs b/src/test/run-fail/spawnfail.rs index dad8ead8d65..122ea901805 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() { - fail2!(); + fail!(); } 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 840db545dec..fb2d90e99cf 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(); - fail2!("goodfail"); + fail!("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(); - fail2!("badfail"); + fail!("badfail"); } diff --git a/src/test/run-fail/tls-exit-status.rs b/src/test/run-fail/tls-exit-status.rs index 419d8c1320f..1858ceb2836 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(); - fail2!("please have a nonzero exit status"); + fail!("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 d1d816f7f79..86fde5b7f97 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() { ~fail2!(); } +fn main() { ~fail!(); } diff --git a/src/test/run-fail/unwind-box-fn-unique.rs b/src/test/run-fail/unwind-box-fn-unique.rs index 0050002a22e..30b54b3dfcc 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() { - fail2!(); + fail!(); } fn main() { let y = ~0; let x: @~fn() = @(|| { - error2!("{:?}", y.clone()); + error!("{:?}", y.clone()); }); failfn(); - error2!("{:?}", x); + error!("{:?}", x); } diff --git a/src/test/run-fail/unwind-box-res.rs b/src/test/run-fail/unwind-box-res.rs index 02d2218f536..f0d6e1c1882 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() { - fail2!(); + fail!(); } struct r { @@ -41,6 +41,6 @@ fn main() { cast::forget(i1); let x = @r(i1p); failfn(); - error2!("{:?}", x); + error!("{:?}", x); } } diff --git a/src/test/run-fail/unwind-box-str.rs b/src/test/run-fail/unwind-box-str.rs index 2086a23c6af..a30f2bfab0a 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() { - fail2!(); + fail!(); } fn main() { let x = @~"hi"; failfn(); - error2!("{:?}", x); + error!("{:?}", x); } diff --git a/src/test/run-fail/unwind-box-trait.rs b/src/test/run-fail/unwind-box-trait.rs index b8534483fb5..66dac6a98a9 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() { - fail2!(); + fail!(); } trait i { @@ -25,5 +25,5 @@ impl i for ~int { fn main() { let x = @~0 as @i; failfn(); - error2!("{:?}", x); + error!("{:?}", x); } diff --git a/src/test/run-fail/unwind-box-unique-unique.rs b/src/test/run-fail/unwind-box-unique-unique.rs index 3abf5330e40..fc8e3a793d2 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() { - fail2!(); + fail!(); } fn main() { let x = @~~0; failfn(); - error2!("{:?}", x); + error!("{:?}", x); } diff --git a/src/test/run-fail/unwind-box-unique.rs b/src/test/run-fail/unwind-box-unique.rs index 5b3bf74f89e..15925dc475e 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() { - fail2!(); + fail!(); } fn main() { let x = @~0; failfn(); - error2!("{:?}", x); + error!("{:?}", x); } diff --git a/src/test/run-fail/unwind-box-vec.rs b/src/test/run-fail/unwind-box-vec.rs index 3b767839a0d..18b4cebaa33 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() { - fail2!(); + fail!(); } fn main() { let x = @~[0, 1, 2, 3, 4, 5]; failfn(); - error2!("{:?}", x); + error!("{:?}", x); } diff --git a/src/test/run-fail/unwind-box.rs b/src/test/run-fail/unwind-box.rs index 0b144b6c1ed..21308945253 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() { - fail2!(); + fail!(); } fn main() { diff --git a/src/test/run-fail/unwind-fail.rs b/src/test/run-fail/unwind-fail.rs index df6c2be860f..4d4bc0d53eb 100644 --- a/src/test/run-fail/unwind-fail.rs +++ b/src/test/run-fail/unwind-fail.rs @@ -12,5 +12,5 @@ fn main() { @0; - fail2!(); + fail!(); } diff --git a/src/test/run-fail/unwind-initializer-indirect.rs b/src/test/run-fail/unwind-initializer-indirect.rs index 8a71d1d3456..fd1ab88ff96 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 { fail2!(); } +fn f() -> @int { fail!(); } 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 a4161ad424b..0d1584f3dc8 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 = { - fail2!(); + fail!(); }; } diff --git a/src/test/run-fail/unwind-interleaved.rs b/src/test/run-fail/unwind-interleaved.rs index cfd8d555c2e..365204d5c9e 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() { fail2!(); } +fn b() { fail!(); } fn main() { let _x = ~[0]; diff --git a/src/test/run-fail/unwind-iter.rs b/src/test/run-fail/unwind-iter.rs index 4c9125bde99..51c6cb3adf3 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)) { - fail2!(); + fail!(); it(0); } diff --git a/src/test/run-fail/unwind-iter2.rs b/src/test/run-fail/unwind-iter2.rs index 11fbcfaff78..17936df6959 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| fail2!() ); + x(|_x| fail!() ); } diff --git a/src/test/run-fail/unwind-lambda.rs b/src/test/run-fail/unwind-lambda.rs index 4857a38519c..65d9fce5ff5 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; - fail2!("so yummy") + fail!("so yummy") }; f(); }); diff --git a/src/test/run-fail/unwind-match.rs b/src/test/run-fail/unwind-match.rs index c017ddc49f0..a9761017c73 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" }, - _ => fail2!("non-exhaustive match failure") }; + _ => fail!("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 dc5e5a3b995..d215927c7d0 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 { - fail2!(); + fail!(); } } } diff --git a/src/test/run-fail/unwind-move.rs b/src/test/run-fail/unwind-move.rs index 626228cd225..8f1b34d17cd 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) { - fail2!(); + fail!(); } fn main() { diff --git a/src/test/run-fail/unwind-nested.rs b/src/test/run-fail/unwind-nested.rs index ae543c9a88c..f8a63be2e9a 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; { - fail2!(); + fail!(); } } } diff --git a/src/test/run-fail/unwind-partial-box.rs b/src/test/run-fail/unwind-partial-box.rs index 933bd62bc0c..88f71a5ed7c 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] { fail2!(); } +fn f() -> ~[int] { fail!(); } // 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 b627103485c..e9bbbd46c03 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] { fail2!(); } +fn f() -> ~[int] { fail!(); } // 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 34898965906..3d6d26937db 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] { fail2!(); } +fn f() -> ~[int] { fail!(); } // 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 3858fe3923f..016654500b4 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] { - fail2!(); + fail!(); } struct Blk { node: ~[int] } diff --git a/src/test/run-fail/unwind-rec2.rs b/src/test/run-fail/unwind-rec2.rs index a5aaf46b4b2..49a35181a8b 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] { - fail2!(); + fail!(); } 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 5b991797969..6526455b8e2 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) { fail2!("squirrel") } + fn drop(&mut self) { fail!("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 652bf31dee4..67e1d0e8f92 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) { fail2!("wombat") } + fn drop(&mut self) { fail!("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); - fail2!(); + fail!(); } diff --git a/src/test/run-fail/unwind-resource-fail3.rs b/src/test/run-fail/unwind-resource-fail3.rs index 92b10cef319..231f6e7b7d5 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) { - fail2!("quux"); + fail!("quux"); } } diff --git a/src/test/run-fail/unwind-stacked.rs b/src/test/run-fail/unwind-stacked.rs index ab28cb8a9ee..8249807af74 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; - fail2!(); + fail!(); } fn g() { diff --git a/src/test/run-fail/unwind-tup.rs b/src/test/run-fail/unwind-tup.rs index efb69b9f957..15fa3ceed53 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]{ - fail2!(); + fail!(); } fn main() { diff --git a/src/test/run-fail/unwind-tup2.rs b/src/test/run-fail/unwind-tup2.rs index 20d394bafac..236ff817220 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]{ - fail2!(); + fail!(); } fn main() { diff --git a/src/test/run-fail/unwind-uninitialized.rs b/src/test/run-fail/unwind-uninitialized.rs index d61a4927db8..d5a06ffb903 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() { - fail2!(); + fail!(); } fn main() { diff --git a/src/test/run-fail/unwind-unique.rs b/src/test/run-fail/unwind-unique.rs index 9ede24d28c4..53b2a55602c 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() { - fail2!(); + fail!(); } fn main() { diff --git a/src/test/run-fail/while-body-fails.rs b/src/test/run-fail/while-body-fails.rs index c0a1033efe0..32e1425b28c 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 { fail2!("quux"); } ; 8 } ; } +fn main() { let _x: int = { while true { fail!("quux"); } ; 8 } ; } diff --git a/src/test/run-fail/while-fail.rs b/src/test/run-fail/while-fail.rs index e42cb5e778c..a0b437814fd 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() { - fail2!({ while true { fail2!("giraffe") }; "clandestine" }); + fail!({ while true { fail!("giraffe") }; "clandestine" }); } diff --git a/src/test/run-pass/alignment-gep-tup-like-1.rs b/src/test/run-pass/alignment-gep-tup-like-1.rs index 873eb66e52e..f1bc4e9a87f 100644 --- a/src/test/run-pass/alignment-gep-tup-like-1.rs +++ b/src/test/run-pass/alignment-gep-tup-like-1.rs @@ -36,7 +36,7 @@ fn f<A:Clone + 'static>(a: A, b: u16) -> @Invokable<A> { pub fn main() { let (a, b) = f(22_u64, 44u16).f(); - info2!("a={:?} b={:?}", a, b); + info!("a={:?} b={:?}", a, b); assert_eq!(a, 22u64); assert_eq!(b, 44u16); } diff --git a/src/test/run-pass/alignment-gep-tup-like-2.rs b/src/test/run-pass/alignment-gep-tup-like-2.rs index 7c43385ed61..5491baf3526 100644 --- a/src/test/run-pass/alignment-gep-tup-like-2.rs +++ b/src/test/run-pass/alignment-gep-tup-like-2.rs @@ -55,7 +55,7 @@ pub fn main() { let z = f(~x, y); make_cycle(z); let (a, b) = z.f(); - info2!("a={} b={}", *a as uint, b as uint); + info!("a={} b={}", *a as uint, b as uint); assert_eq!(*a, x); assert_eq!(b, y); } diff --git a/src/test/run-pass/arith-0.rs b/src/test/run-pass/arith-0.rs index 9944241836b..5cbd0da23cf 100644 --- a/src/test/run-pass/arith-0.rs +++ b/src/test/run-pass/arith-0.rs @@ -12,6 +12,6 @@ pub fn main() { let a: int = 10; - info2!("{}", a); + info!("{}", a); assert_eq!(a * (a - 1), 90); } diff --git a/src/test/run-pass/arith-1.rs b/src/test/run-pass/arith-1.rs index db8f0eac4f6..0b3492784c8 100644 --- a/src/test/run-pass/arith-1.rs +++ b/src/test/run-pass/arith-1.rs @@ -28,6 +28,6 @@ pub fn main() { assert_eq!(i32_b << 1, i32_b << 1); assert_eq!(i32_b >> 1, i32_b >> 1); assert_eq!(i32_b & i32_b << 1, 0); - info2!("{}", i32_b | i32_b << 1); + info!("{}", i32_b | i32_b << 1); assert_eq!(i32_b | i32_b << 1, 0x30303030); } diff --git a/src/test/run-pass/attr-main-2.rs b/src/test/run-pass/attr-main-2.rs index 6078698ebd6..741f7006633 100644 --- a/src/test/run-pass/attr-main-2.rs +++ b/src/test/run-pass/attr-main-2.rs @@ -11,7 +11,7 @@ // xfail-fast pub fn main() { - fail2!() + fail!() } #[main] diff --git a/src/test/run-pass/auto-instantiate.rs b/src/test/run-pass/auto-instantiate.rs index d8399848e09..b7e3de478a4 100644 --- a/src/test/run-pass/auto-instantiate.rs +++ b/src/test/run-pass/auto-instantiate.rs @@ -19,6 +19,6 @@ struct Triple { x: int, y: int, z: int } fn f<T,U>(x: T, y: U) -> Pair<T, U> { return Pair {a: x, b: y}; } pub fn main() { - info2!("{:?}", f(Triple {x: 3, y: 4, z: 5}, 4).a.x); - info2!("{:?}", f(5, 6).a); + info!("{:?}", f(Triple {x: 3, y: 4, z: 5}, 4).a.x); + info!("{:?}", f(5, 6).a); } diff --git a/src/test/run-pass/binary-minus-without-space.rs b/src/test/run-pass/binary-minus-without-space.rs index f312cdae8bd..78edf3e112e 100644 --- a/src/test/run-pass/binary-minus-without-space.rs +++ b/src/test/run-pass/binary-minus-without-space.rs @@ -11,6 +11,6 @@ // Check that issue #954 stays fixed pub fn main() { - match -1 { -1 => {}, _ => fail2!("wat") } + match -1 { -1 => {}, _ => fail!("wat") } assert_eq!(1-1, 0); } diff --git a/src/test/run-pass/bind-by-move.rs b/src/test/run-pass/bind-by-move.rs index ad5573889dd..a7a4aa9885e 100644 --- a/src/test/run-pass/bind-by-move.rs +++ b/src/test/run-pass/bind-by-move.rs @@ -18,6 +18,6 @@ pub fn main() { let x = Some(p); match x { Some(z) => { dispose(z); }, - None => fail2!() + None => fail!() } } diff --git a/src/test/run-pass/binops.rs b/src/test/run-pass/binops.rs index 10a7355c91d..2fe39dc624c 100644 --- a/src/test/run-pass/binops.rs +++ b/src/test/run-pass/binops.rs @@ -81,7 +81,7 @@ fn test_class() { let mut r = p(1, 2); unsafe { - error2!("q = {:x}, r = {:x}", + error!("q = {:x}, r = {:x}", (::std::cast::transmute::<*p, uint>(&q)), (::std::cast::transmute::<*p, uint>(&r))); } diff --git a/src/test/run-pass/bitwise.rs b/src/test/run-pass/bitwise.rs index b99067419b0..169b3848c63 100644 --- a/src/test/run-pass/bitwise.rs +++ b/src/test/run-pass/bitwise.rs @@ -27,8 +27,8 @@ fn general() { a ^= b; b ^= a; a = a ^ b; - info2!("{}", a); - info2!("{}", b); + info!("{}", a); + info!("{}", b); assert_eq!(b, 1); assert_eq!(a, 2); assert_eq!(!0xf0 & 0xff, 0xf); diff --git a/src/test/run-pass/block-arg.rs b/src/test/run-pass/block-arg.rs index c296a37a17c..0608285db1e 100644 --- a/src/test/run-pass/block-arg.rs +++ b/src/test/run-pass/block-arg.rs @@ -14,7 +14,7 @@ pub fn main() { // Statement form does not require parentheses: for i in v.iter() { - info2!("{:?}", *i); + info!("{:?}", *i); } // Usable at all: @@ -35,14 +35,14 @@ pub fn main() { assert!(false); } match do v.iter().all |e| { e.is_negative() } { - true => { fail2!("incorrect answer."); } + true => { fail!("incorrect answer."); } false => { } } match 3 { _ if do v.iter().any |e| { e.is_negative() } => { } _ => { - fail2!("wrong answer."); + fail!("wrong answer."); } } diff --git a/src/test/run-pass/block-explicit-types.rs b/src/test/run-pass/block-explicit-types.rs index 1931ec589ac..379fced1d33 100644 --- a/src/test/run-pass/block-explicit-types.rs +++ b/src/test/run-pass/block-explicit-types.rs @@ -10,5 +10,5 @@ pub fn main() { fn as_buf<T>(s: ~str, f: &fn(~str) -> T) -> T { f(s) } - as_buf(~"foo", |foo: ~str| -> () error2!("{}", foo) ); + as_buf(~"foo", |foo: ~str| -> () error!("{}", foo) ); } diff --git a/src/test/run-pass/block-iter-1.rs b/src/test/run-pass/block-iter-1.rs index 806ed035d5a..a977eb40992 100644 --- a/src/test/run-pass/block-iter-1.rs +++ b/src/test/run-pass/block-iter-1.rs @@ -20,6 +20,6 @@ pub fn main() { odds += 1; } }); - error2!("{:?}", odds); + error!("{:?}", odds); assert_eq!(odds, 4); } diff --git a/src/test/run-pass/block-iter-2.rs b/src/test/run-pass/block-iter-2.rs index c84033e5bde..e5ea54c2a3e 100644 --- a/src/test/run-pass/block-iter-2.rs +++ b/src/test/run-pass/block-iter-2.rs @@ -20,6 +20,6 @@ pub fn main() { sum += *i * *j; }); }); - error2!("{:?}", sum); + error!("{:?}", sum); assert_eq!(sum, 225); } diff --git a/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs b/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs index 2c4d007cb1a..1490d679049 100644 --- a/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs +++ b/src/test/run-pass/borrowck-macro-interaction-issue-6304.rs @@ -21,11 +21,11 @@ impl Foo { ); match s { ~Bar2(id, rest) => declare!(id, self.elaborate_stm(rest)), - _ => fail2!() + _ => fail!() } } - fn check_id(&mut self, s: int) { fail2!() } + fn check_id(&mut self, s: int) { fail!() } } pub fn main() { } diff --git a/src/test/run-pass/borrowck-mut-uniq.rs b/src/test/run-pass/borrowck-mut-uniq.rs index 8ff326ed870..9057ebf7983 100644 --- a/src/test/run-pass/borrowck-mut-uniq.rs +++ b/src/test/run-pass/borrowck-mut-uniq.rs @@ -31,9 +31,9 @@ pub fn main() { add_int(ints, 44); do iter_ints(ints) |i| { - error2!("int = {}", *i); + error!("int = {}", *i); true }; - error2!("ints={:?}", ints); + error!("ints={:?}", ints); } diff --git a/src/test/run-pass/borrowck-preserve-box-in-discr.rs b/src/test/run-pass/borrowck-preserve-box-in-discr.rs index 4be38df939b..c155563d8d0 100644 --- a/src/test/run-pass/borrowck-preserve-box-in-discr.rs +++ b/src/test/run-pass/borrowck-preserve-box-in-discr.rs @@ -23,7 +23,7 @@ pub fn main() { x = @F {f: ~4}; - info2!("ptr::to_unsafe_ptr(*b_x) = {:x}", + info!("ptr::to_unsafe_ptr(*b_x) = {:x}", ptr::to_unsafe_ptr(&(**b_x)) as uint); assert_eq!(**b_x, 3); assert!(ptr::to_unsafe_ptr(&(*x.f)) != ptr::to_unsafe_ptr(&(**b_x))); diff --git a/src/test/run-pass/borrowck-preserve-box-in-field.rs b/src/test/run-pass/borrowck-preserve-box-in-field.rs index ddc1d618697..214753c009c 100644 --- a/src/test/run-pass/borrowck-preserve-box-in-field.rs +++ b/src/test/run-pass/borrowck-preserve-box-in-field.rs @@ -28,7 +28,7 @@ pub fn main() { assert_eq!(ptr::to_unsafe_ptr(&(*x.f)), ptr::to_unsafe_ptr(&(*b_x))); x = @F {f: ~4}; - info2!("ptr::to_unsafe_ptr(*b_x) = {:x}", + info!("ptr::to_unsafe_ptr(*b_x) = {:x}", ptr::to_unsafe_ptr(&(*b_x)) as uint); assert_eq!(*b_x, 3); assert!(ptr::to_unsafe_ptr(&(*x.f)) != ptr::to_unsafe_ptr(&(*b_x))); diff --git a/src/test/run-pass/borrowck-preserve-box-in-pat.rs b/src/test/run-pass/borrowck-preserve-box-in-pat.rs index dc389ed1bc8..fd5f8c0868c 100644 --- a/src/test/run-pass/borrowck-preserve-box-in-pat.rs +++ b/src/test/run-pass/borrowck-preserve-box-in-pat.rs @@ -23,7 +23,7 @@ pub fn main() { *x = @F {f: ~4}; - info2!("ptr::to_unsafe_ptr(*b_x) = {:x}", + info!("ptr::to_unsafe_ptr(*b_x) = {:x}", ptr::to_unsafe_ptr(&(**b_x)) as uint); assert_eq!(**b_x, 3); assert!(ptr::to_unsafe_ptr(&(*x.f)) != ptr::to_unsafe_ptr(&(**b_x))); diff --git a/src/test/run-pass/borrowck-preserve-box-in-uniq.rs b/src/test/run-pass/borrowck-preserve-box-in-uniq.rs index 139466bf40a..239dd4c6dc4 100644 --- a/src/test/run-pass/borrowck-preserve-box-in-uniq.rs +++ b/src/test/run-pass/borrowck-preserve-box-in-uniq.rs @@ -28,7 +28,7 @@ pub fn main() { assert_eq!(ptr::to_unsafe_ptr(&(*x.f)), ptr::to_unsafe_ptr(&(*b_x))); *x = @F{f: ~4}; - info2!("ptr::to_unsafe_ptr(*b_x) = {:x}", + info!("ptr::to_unsafe_ptr(*b_x) = {:x}", ptr::to_unsafe_ptr(&(*b_x)) as uint); assert_eq!(*b_x, 3); assert!(ptr::to_unsafe_ptr(&(*x.f)) != ptr::to_unsafe_ptr(&(*b_x))); diff --git a/src/test/run-pass/borrowck-preserve-box.rs b/src/test/run-pass/borrowck-preserve-box.rs index f852f36d633..8a97e8f1b5c 100644 --- a/src/test/run-pass/borrowck-preserve-box.rs +++ b/src/test/run-pass/borrowck-preserve-box.rs @@ -26,7 +26,7 @@ pub fn main() { assert_eq!(ptr::to_unsafe_ptr(&(*x)), ptr::to_unsafe_ptr(&(*b_x))); x = @22; - info2!("ptr::to_unsafe_ptr(*b_x) = {:x}", + info!("ptr::to_unsafe_ptr(*b_x) = {:x}", ptr::to_unsafe_ptr(&(*b_x)) as uint); assert_eq!(*b_x, 3); assert!(ptr::to_unsafe_ptr(&(*x)) != ptr::to_unsafe_ptr(&(*b_x))); diff --git a/src/test/run-pass/borrowck-preserve-cond-box.rs b/src/test/run-pass/borrowck-preserve-cond-box.rs index b9428daf152..055a924cf04 100644 --- a/src/test/run-pass/borrowck-preserve-cond-box.rs +++ b/src/test/run-pass/borrowck-preserve-cond-box.rs @@ -25,13 +25,13 @@ fn testfn(cond: bool) { exp = 4; } - info2!("*r = {}, exp = {}", *r, exp); + info!("*r = {}, exp = {}", *r, exp); assert_eq!(*r, exp); x = @5; y = @6; - info2!("*r = {}, exp = {}", *r, exp); + info!("*r = {}, exp = {}", *r, exp); assert_eq!(*r, exp); assert_eq!(x, @5); assert_eq!(y, @6); diff --git a/src/test/run-pass/borrowck-preserve-expl-deref.rs b/src/test/run-pass/borrowck-preserve-expl-deref.rs index fec85757493..a0010d36190 100644 --- a/src/test/run-pass/borrowck-preserve-expl-deref.rs +++ b/src/test/run-pass/borrowck-preserve-expl-deref.rs @@ -28,7 +28,7 @@ pub fn main() { assert_eq!(ptr::to_unsafe_ptr(&(*x.f)), ptr::to_unsafe_ptr(&(*b_x))); x = @F {f: ~4}; - info2!("ptr::to_unsafe_ptr(*b_x) = {:x}", + info!("ptr::to_unsafe_ptr(*b_x) = {:x}", ptr::to_unsafe_ptr(&(*b_x)) as uint); assert_eq!(*b_x, 3); assert!(ptr::to_unsafe_ptr(&(*x.f)) != ptr::to_unsafe_ptr(&(*b_x))); diff --git a/src/test/run-pass/borrowck-unary-move-2.rs b/src/test/run-pass/borrowck-unary-move-2.rs index 6d16fd838f8..87d42943fac 100644 --- a/src/test/run-pass/borrowck-unary-move-2.rs +++ b/src/test/run-pass/borrowck-unary-move-2.rs @@ -14,7 +14,7 @@ struct noncopyable { impl Drop for noncopyable { fn drop(&mut self) { - error2!("dropped"); + error!("dropped"); } } diff --git a/src/test/run-pass/box-inside-if.rs b/src/test/run-pass/box-inside-if.rs index 249e9a47164..ea2b7d58a11 100644 --- a/src/test/run-pass/box-inside-if.rs +++ b/src/test/run-pass/box-inside-if.rs @@ -19,7 +19,7 @@ fn is_odd(_n: int) -> bool { return true; } fn length_is_even(_vs: @int) -> bool { return true; } fn foo(_acc: int, n: int) { - if is_odd(n) && length_is_even(some_box(1)) { error2!("bloop"); } + if is_odd(n) && length_is_even(some_box(1)) { error!("bloop"); } } pub fn main() { foo(67, 5); } diff --git a/src/test/run-pass/box-inside-if2.rs b/src/test/run-pass/box-inside-if2.rs index a4563c33331..53b46847060 100644 --- a/src/test/run-pass/box-inside-if2.rs +++ b/src/test/run-pass/box-inside-if2.rs @@ -19,7 +19,7 @@ fn is_odd(_n: int) -> bool { return true; } fn length_is_even(_vs: @int) -> bool { return true; } fn foo(_acc: int, n: int) { - if is_odd(n) || length_is_even(some_box(1)) { error2!("bloop"); } + if is_odd(n) || length_is_even(some_box(1)) { error!("bloop"); } } pub fn main() { foo(67, 5); } diff --git a/src/test/run-pass/box-unbox.rs b/src/test/run-pass/box-unbox.rs index f5d522470d3..2e92395d549 100644 --- a/src/test/run-pass/box-unbox.rs +++ b/src/test/run-pass/box-unbox.rs @@ -17,6 +17,6 @@ fn unbox<T:Clone>(b: Box<T>) -> T { return (*b.c).clone(); } pub fn main() { let foo: int = 17; let bfoo: Box<int> = Box {c: @foo}; - info2!("see what's in our box"); + info!("see what's in our box"); assert_eq!(unbox::<int>(bfoo), foo); } diff --git a/src/test/run-pass/boxed-class-type-substitution.rs b/src/test/run-pass/boxed-class-type-substitution.rs index e9be0904d4e..81bd3b6c139 100644 --- a/src/test/run-pass/boxed-class-type-substitution.rs +++ b/src/test/run-pass/boxed-class-type-substitution.rs @@ -15,7 +15,7 @@ struct Tree<T> { parent: Option<T> } -fn empty<T>() -> Tree<T> { fail2!() } +fn empty<T>() -> Tree<T> { fail!() } struct Box { tree: Tree<@Box> diff --git a/src/test/run-pass/cast-region-to-uint.rs b/src/test/run-pass/cast-region-to-uint.rs index 69ca1584c12..2a3f79e8245 100644 --- a/src/test/run-pass/cast-region-to-uint.rs +++ b/src/test/run-pass/cast-region-to-uint.rs @@ -12,5 +12,5 @@ use std::borrow; pub fn main() { let x = 3; - info2!("&x={:x}", borrow::to_uint(&x)); + info!("&x={:x}", borrow::to_uint(&x)); } diff --git a/src/test/run-pass/cci_borrow.rs b/src/test/run-pass/cci_borrow.rs index 3db000accec..fe57d6b3fec 100644 --- a/src/test/run-pass/cci_borrow.rs +++ b/src/test/run-pass/cci_borrow.rs @@ -17,6 +17,6 @@ use cci_borrow_lib::foo; pub fn main() { let p = @22u; let r = foo(p); - info2!("r={}", r); + info!("r={}", r); assert_eq!(r, 22u); } diff --git a/src/test/run-pass/class-attributes-1.rs b/src/test/run-pass/class-attributes-1.rs index 3e7cae395d4..97b3eda5eff 100644 --- a/src/test/run-pass/class-attributes-1.rs +++ b/src/test/run-pass/class-attributes-1.rs @@ -16,7 +16,7 @@ struct cat { impl Drop for cat { #[cat_dropper] - fn drop(&mut self) { error2!("{} landed on hir feet" , self . name); } + fn drop(&mut self) { error!("{} landed on hir feet" , self . name); } } diff --git a/src/test/run-pass/class-attributes-2.rs b/src/test/run-pass/class-attributes-2.rs index 0a3f1539333..fa498e90503 100644 --- a/src/test/run-pass/class-attributes-2.rs +++ b/src/test/run-pass/class-attributes-2.rs @@ -18,7 +18,7 @@ impl Drop for cat { Actually, cats don't always land on their feet when you drop them. */ fn drop(&mut self) { - error2!("{} landed on hir feet", self.name); + error!("{} landed on hir feet", self.name); } } diff --git a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs index bdba6a4c6c6..52ba1359541 100644 --- a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs +++ b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs @@ -16,7 +16,7 @@ use cci_class_cast::kitty::cat; fn print_out(thing: @ToStr, expected: ~str) { let actual = thing.to_str(); - info2!("{}", actual); + info!("{}", actual); assert_eq!(actual, expected); } diff --git a/src/test/run-pass/class-cast-to-trait-multiple-types.rs b/src/test/run-pass/class-cast-to-trait-multiple-types.rs index 3828fbd4395..a259ee8ffde 100644 --- a/src/test/run-pass/class-cast-to-trait-multiple-types.rs +++ b/src/test/run-pass/class-cast-to-trait-multiple-types.rs @@ -20,7 +20,7 @@ struct dog { impl dog { fn bark(&self) -> int { - info2!("Woof {} {}", *self.barks, *self.volume); + info!("Woof {} {}", *self.barks, *self.volume); *self.barks += 1u; if *self.barks % 3u == 0u { *self.volume += 1; @@ -28,7 +28,7 @@ impl dog { if *self.barks % 10u == 0u { *self.volume -= 2; } - info2!("Grrr {} {}", *self.barks, *self.volume); + info!("Grrr {} {}", *self.barks, *self.volume); *self.volume } } @@ -62,7 +62,7 @@ impl cat { impl cat { fn meow(&self) -> uint { - info2!("Meow"); + info!("Meow"); *self.meows += 1u; if *self.meows % 5u == 0u { *self.how_hungry += 1; diff --git a/src/test/run-pass/class-cast-to-trait.rs b/src/test/run-pass/class-cast-to-trait.rs index 69a94e09d5f..737253a956f 100644 --- a/src/test/run-pass/class-cast-to-trait.rs +++ b/src/test/run-pass/class-cast-to-trait.rs @@ -25,12 +25,12 @@ impl noisy for cat { impl cat { pub fn eat(&mut self) -> bool { if self.how_hungry > 0 { - error2!("OM NOM NOM"); + error!("OM NOM NOM"); self.how_hungry -= 2; return true; } else { - error2!("Not hungry!"); + error!("Not hungry!"); return false; } } @@ -38,7 +38,7 @@ impl cat { impl cat { fn meow(&mut self) { - error2!("Meow"); + error!("Meow"); self.meows += 1u; if self.meows % 5u == 0u { self.how_hungry += 1; diff --git a/src/test/run-pass/class-impl-very-parameterized-trait.rs b/src/test/run-pass/class-impl-very-parameterized-trait.rs index baa82dbb2de..918547a3a2b 100644 --- a/src/test/run-pass/class-impl-very-parameterized-trait.rs +++ b/src/test/run-pass/class-impl-very-parameterized-trait.rs @@ -38,11 +38,11 @@ impl<T> cat<T> { pub fn eat(&mut self) -> bool { if self.how_hungry > 0 { - error2!("OM NOM NOM"); + error!("OM NOM NOM"); self.how_hungry -= 2; return true; } else { - error2!("Not hungry!"); + error!("Not hungry!"); return false; } } @@ -75,7 +75,7 @@ impl<T> MutableMap<int, T> for cat<T> { true } - fn find_mut<'a>(&'a mut self, _k: &int) -> Option<&'a mut T> { fail2!() } + fn find_mut<'a>(&'a mut self, _k: &int) -> Option<&'a mut T> { fail!() } fn remove(&mut self, k: &int) -> bool { if self.find(k).is_some() { @@ -85,16 +85,16 @@ impl<T> MutableMap<int, T> for cat<T> { } } - fn pop(&mut self, _k: &int) -> Option<T> { fail2!() } + fn pop(&mut self, _k: &int) -> Option<T> { fail!() } - fn swap(&mut self, _k: int, _v: T) -> Option<T> { fail2!() } + fn swap(&mut self, _k: int, _v: T) -> Option<T> { fail!() } } impl<T> cat<T> { pub fn get<'a>(&'a self, k: &int) -> &'a T { match self.find(k) { Some(v) => { v } - None => { fail2!("epic fail"); } + None => { fail!("epic fail"); } } } @@ -106,7 +106,7 @@ impl<T> cat<T> { impl<T> cat<T> { fn meow(&mut self) { self.meows += 1; - error2!("Meow {}", self.meows); + error!("Meow {}", self.meows); if self.meows % 5 == 0 { self.how_hungry += 1; } diff --git a/src/test/run-pass/class-implement-trait-cross-crate.rs b/src/test/run-pass/class-implement-trait-cross-crate.rs index d6477d2d5a5..88051e18c30 100644 --- a/src/test/run-pass/class-implement-trait-cross-crate.rs +++ b/src/test/run-pass/class-implement-trait-cross-crate.rs @@ -23,12 +23,12 @@ struct cat { impl cat { pub fn eat(&mut self) -> bool { if self.how_hungry > 0 { - error2!("OM NOM NOM"); + error!("OM NOM NOM"); self.how_hungry -= 2; return true; } else { - error2!("Not hungry!"); + error!("Not hungry!"); return false; } } @@ -40,7 +40,7 @@ impl noisy for cat { impl cat { fn meow(&mut self) { - error2!("Meow"); + error!("Meow"); self.meows += 1u; if self.meows % 5u == 0u { self.how_hungry += 1; diff --git a/src/test/run-pass/class-implement-traits.rs b/src/test/run-pass/class-implement-traits.rs index 1433b5a8024..433d7f7a22f 100644 --- a/src/test/run-pass/class-implement-traits.rs +++ b/src/test/run-pass/class-implement-traits.rs @@ -24,7 +24,7 @@ struct cat { impl cat { fn meow(&mut self) { - error2!("Meow"); + error!("Meow"); self.meows += 1u; if self.meows % 5u == 0u { self.how_hungry += 1; @@ -35,11 +35,11 @@ impl cat { impl cat { pub fn eat(&mut self) -> bool { if self.how_hungry > 0 { - error2!("OM NOM NOM"); + error!("OM NOM NOM"); self.how_hungry -= 2; return true; } else { - error2!("Not hungry!"); + error!("Not hungry!"); return false; } } diff --git a/src/test/run-pass/class-separate-impl.rs b/src/test/run-pass/class-separate-impl.rs index 5ef0569cf10..e16aa706049 100644 --- a/src/test/run-pass/class-separate-impl.rs +++ b/src/test/run-pass/class-separate-impl.rs @@ -21,12 +21,12 @@ impl cat { pub fn eat(&mut self) -> bool { if self.how_hungry > 0 { - error2!("OM NOM NOM"); + error!("OM NOM NOM"); self.how_hungry -= 2; return true; } else { - error2!("Not hungry!"); + error!("Not hungry!"); return false; } } @@ -34,7 +34,7 @@ impl cat { impl cat { fn meow(&mut self) { - error2!("Meow"); + error!("Meow"); self.meows += 1u; if self.meows % 5u == 0u { self.how_hungry += 1; @@ -58,7 +58,7 @@ impl ToStr for cat { fn print_out(thing: @ToStr, expected: ~str) { let actual = thing.to_str(); - info2!("{}", actual); + info!("{}", actual); assert_eq!(actual, expected); } diff --git a/src/test/run-pass/classes.rs b/src/test/run-pass/classes.rs index 14acd1c9115..e5220b15520 100644 --- a/src/test/run-pass/classes.rs +++ b/src/test/run-pass/classes.rs @@ -20,11 +20,11 @@ impl cat { pub fn eat(&mut self) -> bool { if self.how_hungry > 0 { - error2!("OM NOM NOM"); + error!("OM NOM NOM"); self.how_hungry -= 2; return true; } else { - error2!("Not hungry!"); + error!("Not hungry!"); return false; } } @@ -32,7 +32,7 @@ impl cat { impl cat { fn meow(&mut self) { - error2!("Meow"); + error!("Meow"); self.meows += 1u; if self.meows % 5u == 0u { self.how_hungry += 1; diff --git a/src/test/run-pass/cleanup-copy-mode.rs b/src/test/run-pass/cleanup-copy-mode.rs index 6381a402cfd..70f70430bb9 100644 --- a/src/test/run-pass/cleanup-copy-mode.rs +++ b/src/test/run-pass/cleanup-copy-mode.rs @@ -11,7 +11,7 @@ use std::task; fn adder(x: @int, y: @int) -> int { return *x + *y; } -fn failer() -> @int { fail2!(); } +fn failer() -> @int { fail!(); } pub fn main() { assert!(task::try(|| { adder(@2, failer()); () diff --git a/src/test/run-pass/close-over-big-then-small-data.rs b/src/test/run-pass/close-over-big-then-small-data.rs index 4b6b3cca334..40d8cda9c41 100644 --- a/src/test/run-pass/close-over-big-then-small-data.rs +++ b/src/test/run-pass/close-over-big-then-small-data.rs @@ -40,7 +40,7 @@ fn f<A:Clone + 'static>(a: A, b: u16) -> @Invokable<A> { pub fn main() { let (a, b) = f(22_u64, 44u16).f(); - info2!("a={:?} b={:?}", a, b); + info!("a={:?} b={:?}", a, b); assert_eq!(a, 22u64); assert_eq!(b, 44u16); } diff --git a/src/test/run-pass/comm.rs b/src/test/run-pass/comm.rs index 63c1f4ed3d6..a41f1fa42cd 100644 --- a/src/test/run-pass/comm.rs +++ b/src/test/run-pass/comm.rs @@ -15,13 +15,13 @@ pub fn main() { let (p, ch) = stream(); let _t = task::spawn(|| child(&ch) ); let y = p.recv(); - error2!("received"); - error2!("{:?}", y); + error!("received"); + error!("{:?}", y); assert_eq!(y, 10); } fn child(c: &Chan<int>) { - error2!("sending"); + error!("sending"); c.send(10); - error2!("value sent"); + error!("value sent"); } diff --git a/src/test/run-pass/complex.rs b/src/test/run-pass/complex.rs index f395c6b7151..11599f6b1e3 100644 --- a/src/test/run-pass/complex.rs +++ b/src/test/run-pass/complex.rs @@ -37,7 +37,7 @@ fn foo(x: int) -> int { pub fn main() { let x: int = 2 + 2; - info2!("{}", x); - info2!("hello, world"); - info2!("{}", 10); + info!("{}", x); + info!("hello, world"); + info!("{}", 10); } diff --git a/src/test/run-pass/conditional-debug-macro-off.rs b/src/test/run-pass/conditional-debug-macro-off.rs index 17062757286..1648b198999 100644 --- a/src/test/run-pass/conditional-debug-macro-off.rs +++ b/src/test/run-pass/conditional-debug-macro-off.rs @@ -14,5 +14,5 @@ fn main() { // only fails if debug! evaluates its argument. - debug2!("{:?}", { if true { fail2!() } }); + debug!("{:?}", { if true { fail!() } }); } diff --git a/src/test/run-pass/conditional-debug-macro-on.rs b/src/test/run-pass/conditional-debug-macro-on.rs index dec79f0cb5b..3842d480327 100644 --- a/src/test/run-pass/conditional-debug-macro-on.rs +++ b/src/test/run-pass/conditional-debug-macro-on.rs @@ -14,7 +14,7 @@ fn main() { // exits early if debug! evaluates its arguments, otherwise it // will hit the fail. - debug2!("{:?}", { if true { return; } }); + debug!("{:?}", { if true { return; } }); - fail2!(); + fail!(); } diff --git a/src/test/run-pass/const-big-enum.rs b/src/test/run-pass/const-big-enum.rs index 0a5a42116b9..ac2e879ceac 100644 --- a/src/test/run-pass/const-big-enum.rs +++ b/src/test/run-pass/const-big-enum.rs @@ -19,18 +19,18 @@ static X: Foo = Baz; pub fn main() { match X { Baz => {} - _ => fail2!() + _ => fail!() } match Y { Bar(s) => assert!(s == 2654435769), - _ => fail2!() + _ => fail!() } match Z { Quux(d,h) => { assert_eq!(d, 0x123456789abcdef0); assert_eq!(h, 0x1234); } - _ => fail2!() + _ => fail!() } } diff --git a/src/test/run-pass/const-enum-byref-self.rs b/src/test/run-pass/const-enum-byref-self.rs index 25e4b7189f2..098a001cfcd 100644 --- a/src/test/run-pass/const-enum-byref-self.rs +++ b/src/test/run-pass/const-enum-byref-self.rs @@ -15,7 +15,7 @@ impl E { pub fn method(&self) { match *self { V => {} - VV(*) => fail2!() + VV(*) => fail!() } } } diff --git a/src/test/run-pass/const-enum-byref.rs b/src/test/run-pass/const-enum-byref.rs index 22ec61f8544..83fafad4f99 100644 --- a/src/test/run-pass/const-enum-byref.rs +++ b/src/test/run-pass/const-enum-byref.rs @@ -14,7 +14,7 @@ static C: E = V; fn f(a: &E) { match *a { V => {} - VV(*) => fail2!() + VV(*) => fail!() } } diff --git a/src/test/run-pass/const-enum-ptr.rs b/src/test/run-pass/const-enum-ptr.rs index c75d1728ca9..c1e3889d613 100644 --- a/src/test/run-pass/const-enum-ptr.rs +++ b/src/test/run-pass/const-enum-ptr.rs @@ -14,6 +14,6 @@ static C: &'static E = &V0; pub fn main() { match *C { V0 => (), - _ => fail2!() + _ => fail!() } } diff --git a/src/test/run-pass/const-enum-structlike.rs b/src/test/run-pass/const-enum-structlike.rs index 95ba635011f..943597fa28f 100644 --- a/src/test/run-pass/const-enum-structlike.rs +++ b/src/test/run-pass/const-enum-structlike.rs @@ -19,7 +19,7 @@ static C: E = S1 { u: 23 }; pub fn main() { match C { - S0 { _ } => fail2!(), + S0 { _ } => fail!(), S1 { u } => assert!(u == 23) } } diff --git a/src/test/run-pass/const-enum-vec-index.rs b/src/test/run-pass/const-enum-vec-index.rs index 5b4ce1bc4ef..4c81eaae1d8 100644 --- a/src/test/run-pass/const-enum-vec-index.rs +++ b/src/test/run-pass/const-enum-vec-index.rs @@ -16,10 +16,10 @@ static C1: E = C[1]; pub fn main() { match C0 { V0 => (), - _ => fail2!() + _ => fail!() } match C1 { V1(n) => assert!(n == 0xDEADBEE), - _ => fail2!() + _ => fail!() } } diff --git a/src/test/run-pass/const-enum-vec-ptr.rs b/src/test/run-pass/const-enum-vec-ptr.rs index 8b905042f7f..95c4ed836c7 100644 --- a/src/test/run-pass/const-enum-vec-ptr.rs +++ b/src/test/run-pass/const-enum-vec-ptr.rs @@ -14,10 +14,10 @@ static C: &'static [E] = &[V0, V1(0xDEADBEE), V0]; pub fn main() { match C[1] { V1(n) => assert!(n == 0xDEADBEE), - _ => fail2!() + _ => fail!() } match C[2] { V0 => (), - _ => fail2!() + _ => fail!() } } diff --git a/src/test/run-pass/const-enum-vector.rs b/src/test/run-pass/const-enum-vector.rs index cff5d4689e4..3dc5b918f7f 100644 --- a/src/test/run-pass/const-enum-vector.rs +++ b/src/test/run-pass/const-enum-vector.rs @@ -14,10 +14,10 @@ static C: [E, ..3] = [V0, V1(0xDEADBEE), V0]; pub fn main() { match C[1] { V1(n) => assert!(n == 0xDEADBEE), - _ => fail2!() + _ => fail!() } match C[2] { V0 => (), - _ => fail2!() + _ => fail!() } } diff --git a/src/test/run-pass/const-nullary-enum.rs b/src/test/run-pass/const-nullary-enum.rs index ac9a7fa6552..bc61c8e9aec 100644 --- a/src/test/run-pass/const-nullary-enum.rs +++ b/src/test/run-pass/const-nullary-enum.rs @@ -19,11 +19,11 @@ static X: Foo = Bar; pub fn main() { match X { Bar => {} - Baz | Boo => fail2!() + Baz | Boo => fail!() } match Y { Baz => {} - Bar | Boo => fail2!() + Bar | Boo => fail!() } } diff --git a/src/test/run-pass/const.rs b/src/test/run-pass/const.rs index 5696c163fc5..fe060ff482e 100644 --- a/src/test/run-pass/const.rs +++ b/src/test/run-pass/const.rs @@ -12,4 +12,4 @@ static i: int = 10; -pub fn main() { info2!("{}", i); } +pub fn main() { info!("{}", i); } diff --git a/src/test/run-pass/core-rt-smoke.rs b/src/test/run-pass/core-rt-smoke.rs index 0260edf1182..6e3d9629da0 100644 --- a/src/test/run-pass/core-rt-smoke.rs +++ b/src/test/run-pass/core-rt-smoke.rs @@ -15,6 +15,6 @@ #[start] fn start(argc: int, argv: **u8) -> int { do std::rt::start(argc, argv) { - info2!("creating my own runtime is joy"); + info!("creating my own runtime is joy"); } } diff --git a/src/test/run-pass/dead-code-one-arm-if.rs b/src/test/run-pass/dead-code-one-arm-if.rs index 9a2819c2293..2749fc31cea 100644 --- a/src/test/run-pass/dead-code-one-arm-if.rs +++ b/src/test/run-pass/dead-code-one-arm-if.rs @@ -12,4 +12,4 @@ // -*- rust -*- -pub fn main() { if 1 == 1 { return; } info2!("Paul is dead"); } +pub fn main() { if 1 == 1 { return; } info!("Paul is dead"); } diff --git a/src/test/run-pass/deref-lval.rs b/src/test/run-pass/deref-lval.rs index bc0b51c6b5d..e7a307c4a22 100644 --- a/src/test/run-pass/deref-lval.rs +++ b/src/test/run-pass/deref-lval.rs @@ -10,4 +10,4 @@ -pub fn main() { let x = @mut 5; *x = 1000; info2!("{:?}", *x); } +pub fn main() { let x = @mut 5; *x = 1000; info!("{:?}", *x); } diff --git a/src/test/run-pass/deriving-cmp-shortcircuit.rs b/src/test/run-pass/deriving-cmp-shortcircuit.rs index 940ddc31f46..431c856ee88 100644 --- a/src/test/run-pass/deriving-cmp-shortcircuit.rs +++ b/src/test/run-pass/deriving-cmp-shortcircuit.rs @@ -14,19 +14,19 @@ pub struct FailCmp; impl Eq for FailCmp { - fn eq(&self, _: &FailCmp) -> bool { fail2!("eq") } + fn eq(&self, _: &FailCmp) -> bool { fail!("eq") } } impl Ord for FailCmp { - fn lt(&self, _: &FailCmp) -> bool { fail2!("lt") } + fn lt(&self, _: &FailCmp) -> bool { fail!("lt") } } impl TotalEq for FailCmp { - fn equals(&self, _: &FailCmp) -> bool { fail2!("equals") } + fn equals(&self, _: &FailCmp) -> bool { fail!("equals") } } impl TotalOrd for FailCmp { - fn cmp(&self, _: &FailCmp) -> Ordering { fail2!("cmp") } + fn cmp(&self, _: &FailCmp) -> Ordering { fail!("cmp") } } #[deriving(Eq,Ord,TotalEq,TotalOrd)] diff --git a/src/test/run-pass/die-macro.rs b/src/test/run-pass/die-macro.rs index ade01142c35..f08e5f054a9 100644 --- a/src/test/run-pass/die-macro.rs +++ b/src/test/run-pass/die-macro.rs @@ -3,9 +3,9 @@ #[allow(unreachable_code)]; fn f() { - fail2!(); + fail!(); - let _x: int = fail2!(); + let _x: int = fail!(); } pub fn main() { diff --git a/src/test/run-pass/enum-alignment.rs b/src/test/run-pass/enum-alignment.rs index 4c60cfb7328..3c8dd33ae9c 100644 --- a/src/test/run-pass/enum-alignment.rs +++ b/src/test/run-pass/enum-alignment.rs @@ -27,7 +27,7 @@ fn is_aligned<T>(ptr: &T) -> bool { pub fn main() { let x = Some(0u64); match x { - None => fail2!(), + None => fail!(), Some(ref y) => assert!(is_aligned(y)) } } diff --git a/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs b/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs index 334047d6ca6..4764dbb9417 100644 --- a/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs +++ b/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs @@ -19,6 +19,6 @@ pub fn main() { match Cons(10, @Nil) { Cons(10, _) => {} Nil => {} - _ => fail2!() + _ => fail!() } } diff --git a/src/test/run-pass/estr-slice.rs b/src/test/run-pass/estr-slice.rs index 145f04009d1..f579e7a3d20 100644 --- a/src/test/run-pass/estr-slice.rs +++ b/src/test/run-pass/estr-slice.rs @@ -14,8 +14,8 @@ pub fn main() { let v = &"hello"; let y : &str = &"there"; - info2!("{}", x); - info2!("{}", y); + info!("{}", x); + info!("{}", y); assert_eq!(x[0], 'h' as u8); assert_eq!(x[4], 'o' as u8); @@ -30,7 +30,7 @@ pub fn main() { let c = &"cccc"; let cc = &"ccccc"; - info2!("{}", a); + info!("{}", a); assert!(a < b); assert!(a <= b); @@ -38,7 +38,7 @@ pub fn main() { assert!(b >= a); assert!(b > a); - info2!("{}", b); + info!("{}", b); assert!(a < c); assert!(a <= c); @@ -46,7 +46,7 @@ pub fn main() { assert!(c >= a); assert!(c > a); - info2!("{}", c); + info!("{}", c); assert!(c < cc); assert!(c <= cc); @@ -54,5 +54,5 @@ pub fn main() { assert!(cc >= c); assert!(cc > c); - info2!("{}", cc); + info!("{}", cc); } diff --git a/src/test/run-pass/evec-slice.rs b/src/test/run-pass/evec-slice.rs index 32de1ad79b2..a0af5e5a9e0 100644 --- a/src/test/run-pass/evec-slice.rs +++ b/src/test/run-pass/evec-slice.rs @@ -22,7 +22,7 @@ pub fn main() { let c : &[int] = &[2,2,2,2,3]; let cc : &[int] = &[2,2,2,2,2,2]; - info2!("{:?}", a); + info!("{:?}", a); assert!(a < b); assert!(a <= b); @@ -30,7 +30,7 @@ pub fn main() { assert!(b >= a); assert!(b > a); - info2!("{:?}", b); + info!("{:?}", b); assert!(b < c); assert!(b <= c); @@ -44,7 +44,7 @@ pub fn main() { assert!(c >= a); assert!(c > a); - info2!("{:?}", c); + info!("{:?}", c); assert!(a < cc); assert!(a <= cc); @@ -52,5 +52,5 @@ pub fn main() { assert!(cc >= a); assert!(cc > a); - info2!("{:?}", cc); + info!("{:?}", cc); } diff --git a/src/test/run-pass/export-non-interference2.rs b/src/test/run-pass/export-non-interference2.rs index 8fdc9c56315..13b21fbe1af 100644 --- a/src/test/run-pass/export-non-interference2.rs +++ b/src/test/run-pass/export-non-interference2.rs @@ -13,7 +13,7 @@ mod foo { pub fn y() { super::super::foo::x(); } } - pub fn x() { info2!("x"); } + pub fn x() { info!("x"); } } pub fn main() { self::foo::bar::y(); } diff --git a/src/test/run-pass/export-non-interference3.rs b/src/test/run-pass/export-non-interference3.rs index b06323741a5..e2af3121f16 100644 --- a/src/test/run-pass/export-non-interference3.rs +++ b/src/test/run-pass/export-non-interference3.rs @@ -15,7 +15,7 @@ pub mod foo { } pub mod bar { - pub fn x() { info2!("x"); } + pub fn x() { info!("x"); } } pub fn main() { foo::x(); } diff --git a/src/test/run-pass/expr-block-generic-box1.rs b/src/test/run-pass/expr-block-generic-box1.rs index 710cab50fba..b4ca5e31e61 100644 --- a/src/test/run-pass/expr-block-generic-box1.rs +++ b/src/test/run-pass/expr-block-generic-box1.rs @@ -21,8 +21,8 @@ fn test_generic<T>(expected: @T, eq: compare<T>) { fn test_box() { fn compare_box(b1: @bool, b2: @bool) -> bool { - info2!("{}", *b1); - info2!("{}", *b2); + info!("{}", *b1); + info!("{}", *b2); return *b1 == *b2; } test_generic::<bool>(@true, compare_box); diff --git a/src/test/run-pass/expr-block-generic-unique1.rs b/src/test/run-pass/expr-block-generic-unique1.rs index f22ef2138ff..b225f1a8ddf 100644 --- a/src/test/run-pass/expr-block-generic-unique1.rs +++ b/src/test/run-pass/expr-block-generic-unique1.rs @@ -20,8 +20,8 @@ fn test_generic<T:Clone>(expected: ~T, eq: compare<T>) { fn test_box() { fn compare_box(b1: ~bool, b2: ~bool) -> bool { - info2!("{}", *b1); - info2!("{}", *b2); + info!("{}", *b1); + info!("{}", *b2); return *b1 == *b2; } test_generic::<bool>(~true, compare_box); diff --git a/src/test/run-pass/expr-if-fail-all.rs b/src/test/run-pass/expr-if-fail-all.rs index b19b9ceaa00..a34620d2e1b 100644 --- a/src/test/run-pass/expr-if-fail-all.rs +++ b/src/test/run-pass/expr-if-fail-all.rs @@ -14,6 +14,6 @@ pub fn main() { let _x = if true { 10 } else { - if true { fail2!() } else { fail2!() } + if true { fail!() } else { fail!() } }; } diff --git a/src/test/run-pass/expr-if-fail.rs b/src/test/run-pass/expr-if-fail.rs index 966a1db1d0e..f79b7198b50 100644 --- a/src/test/run-pass/expr-if-fail.rs +++ b/src/test/run-pass/expr-if-fail.rs @@ -8,15 +8,15 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn test_if_fail() { let x = if false { fail2!() } else { 10 }; assert!((x == 10)); } +fn test_if_fail() { let x = if false { fail!() } else { 10 }; assert!((x == 10)); } fn test_else_fail() { - let x = if true { 10 } else { fail2!() }; + let x = if true { 10 } else { fail!() }; assert_eq!(x, 10); } fn test_elseif_fail() { - let x = if false { 0 } else if false { fail2!() } else { 10 }; + let x = if false { 0 } else if false { fail!() } else { 10 }; assert_eq!(x, 10); } diff --git a/src/test/run-pass/expr-match-box.rs b/src/test/run-pass/expr-match-box.rs index 6f638758ed8..84a78637187 100644 --- a/src/test/run-pass/expr-match-box.rs +++ b/src/test/run-pass/expr-match-box.rs @@ -15,13 +15,13 @@ // Tests for match as expressions resulting in boxed types fn test_box() { - let res = match true { true => { @100 } _ => fail2!("wat") }; + let res = match true { true => { @100 } _ => fail!("wat") }; assert_eq!(*res, 100); } fn test_str() { let res = match true { true => { ~"happy" }, - _ => fail2!("not happy at all") }; + _ => fail!("not happy at all") }; assert_eq!(res, ~"happy"); } diff --git a/src/test/run-pass/expr-match-fail-all.rs b/src/test/run-pass/expr-match-fail-all.rs index 418031243ee..aef11a78e0d 100644 --- a/src/test/run-pass/expr-match-fail-all.rs +++ b/src/test/run-pass/expr-match-fail-all.rs @@ -17,6 +17,6 @@ pub fn main() { let _x = match true { true => { 10 } - false => { match true { true => { fail2!() } false => { fail2!() } } } + false => { match true { true => { fail!() } false => { fail!() } } } }; } diff --git a/src/test/run-pass/expr-match-fail.rs b/src/test/run-pass/expr-match-fail.rs index c1081561b6f..3e1b96763e1 100644 --- a/src/test/run-pass/expr-match-fail.rs +++ b/src/test/run-pass/expr-match-fail.rs @@ -9,12 +9,12 @@ // except according to those terms. fn test_simple() { - let r = match true { true => { true } false => { fail2!() } }; + let r = match true { true => { true } false => { fail!() } }; assert_eq!(r, true); } fn test_box() { - let r = match true { true => { ~[10] } false => { fail2!() } }; + let r = match true { true => { ~[10] } false => { fail!() } }; assert_eq!(r[0], 10); } diff --git a/src/test/run-pass/expr-match-generic-box1.rs b/src/test/run-pass/expr-match-generic-box1.rs index e70a18a7f6d..064e3343620 100644 --- a/src/test/run-pass/expr-match-generic-box1.rs +++ b/src/test/run-pass/expr-match-generic-box1.rs @@ -15,7 +15,7 @@ type compare<T> = &'static fn(@T, @T) -> bool; fn test_generic<T>(expected: @T, eq: compare<T>) { - let actual: @T = match true { true => { expected }, _ => fail2!() }; + let actual: @T = match true { true => { expected }, _ => fail!() }; assert!((eq(expected, actual))); } diff --git a/src/test/run-pass/expr-match-generic-box2.rs b/src/test/run-pass/expr-match-generic-box2.rs index 92e13e36d07..bca06ebdbb5 100644 --- a/src/test/run-pass/expr-match-generic-box2.rs +++ b/src/test/run-pass/expr-match-generic-box2.rs @@ -14,7 +14,7 @@ type compare<T> = &'static fn(T, T) -> bool; fn test_generic<T:Clone>(expected: T, eq: compare<T>) { - let actual: T = match true { true => { expected.clone() }, _ => fail2!("wat") }; + let actual: T = match true { true => { expected.clone() }, _ => fail!("wat") }; assert!((eq(expected, actual))); } diff --git a/src/test/run-pass/expr-match-generic-unique1.rs b/src/test/run-pass/expr-match-generic-unique1.rs index e4a6fa516c5..7371f8fd89b 100644 --- a/src/test/run-pass/expr-match-generic-unique1.rs +++ b/src/test/run-pass/expr-match-generic-unique1.rs @@ -16,7 +16,7 @@ type compare<T> = &'static fn(~T, ~T) -> bool; fn test_generic<T:Clone>(expected: ~T, eq: compare<T>) { let actual: ~T = match true { true => { expected.clone() }, - _ => fail2!("wat") + _ => fail!("wat") }; assert!((eq(expected, actual))); } diff --git a/src/test/run-pass/expr-match-generic-unique2.rs b/src/test/run-pass/expr-match-generic-unique2.rs index 09278fad75c..d07d40e6757 100644 --- a/src/test/run-pass/expr-match-generic-unique2.rs +++ b/src/test/run-pass/expr-match-generic-unique2.rs @@ -16,7 +16,7 @@ type compare<'self, T> = &'self fn(T, T) -> bool; fn test_generic<T:Clone>(expected: T, eq: compare<T>) { let actual: T = match true { true => expected.clone(), - _ => fail2!("wat") + _ => fail!("wat") }; assert!((eq(expected, actual))); } diff --git a/src/test/run-pass/expr-match-generic.rs b/src/test/run-pass/expr-match-generic.rs index d98cd130022..b43085d346f 100644 --- a/src/test/run-pass/expr-match-generic.rs +++ b/src/test/run-pass/expr-match-generic.rs @@ -14,7 +14,7 @@ type compare<T> = extern "Rust" fn(T, T) -> bool; fn test_generic<T:Clone>(expected: T, eq: compare<T>) { - let actual: T = match true { true => { expected.clone() }, _ => fail2!("wat") }; + let actual: T = match true { true => { expected.clone() }, _ => fail!("wat") }; assert!((eq(expected, actual))); } diff --git a/src/test/run-pass/expr-match-struct.rs b/src/test/run-pass/expr-match-struct.rs index 7fa58a535b0..7cfcc38f8dd 100644 --- a/src/test/run-pass/expr-match-struct.rs +++ b/src/test/run-pass/expr-match-struct.rs @@ -17,7 +17,7 @@ struct R { i: int } fn test_rec() { - let rs = match true { true => R {i: 100}, _ => fail2!() }; + let rs = match true { true => R {i: 100}, _ => fail!() }; assert_eq!(rs.i, 100); } diff --git a/src/test/run-pass/expr-match-unique.rs b/src/test/run-pass/expr-match-unique.rs index 7f610d1babd..cdd4e45877a 100644 --- a/src/test/run-pass/expr-match-unique.rs +++ b/src/test/run-pass/expr-match-unique.rs @@ -15,7 +15,7 @@ // Tests for match as expressions resulting in boxed types fn test_box() { - let res = match true { true => { ~100 }, _ => fail2!() }; + let res = match true { true => { ~100 }, _ => fail!() }; assert_eq!(*res, 100); } diff --git a/src/test/run-pass/extern-call-deep.rs b/src/test/run-pass/extern-call-deep.rs index 41ae128626b..86922f5dc25 100644 --- a/src/test/run-pass/extern-call-deep.rs +++ b/src/test/run-pass/extern-call-deep.rs @@ -31,13 +31,13 @@ extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t { #[fixed_stack_segment] fn count(n: uint) -> uint { unsafe { - info2!("n = {}", n); + info!("n = {}", n); rustrt::rust_dbg_call(cb, n) } } pub fn main() { let result = count(1000u); - info2!("result = {}", result); + info!("result = {}", result); assert_eq!(result, 1000u); } diff --git a/src/test/run-pass/extern-call-deep2.rs b/src/test/run-pass/extern-call-deep2.rs index 0490949e8a4..bbff0edfffd 100644 --- a/src/test/run-pass/extern-call-deep2.rs +++ b/src/test/run-pass/extern-call-deep2.rs @@ -32,7 +32,7 @@ extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t { #[fixed_stack_segment] #[inline(never)] fn count(n: uint) -> uint { unsafe { - info2!("n = {}", n); + info!("n = {}", n); rustrt::rust_dbg_call(cb, n) } } @@ -42,7 +42,7 @@ pub fn main() { // has a large stack) do task::spawn { let result = count(1000u); - info2!("result = {}", result); + info!("result = {}", result); assert_eq!(result, 1000u); }; } diff --git a/src/test/run-pass/extern-call-indirect.rs b/src/test/run-pass/extern-call-indirect.rs index 733625f492e..bea937fa9c9 100644 --- a/src/test/run-pass/extern-call-indirect.rs +++ b/src/test/run-pass/extern-call-indirect.rs @@ -31,13 +31,13 @@ extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t { #[fixed_stack_segment] #[inline(never)] fn fact(n: uint) -> uint { unsafe { - info2!("n = {}", n); + info!("n = {}", n); rustrt::rust_dbg_call(cb, n) } } pub fn main() { let result = fact(10u); - info2!("result = {}", result); + info!("result = {}", result); assert_eq!(result, 3628800u); } diff --git a/src/test/run-pass/extern-call-scrub.rs b/src/test/run-pass/extern-call-scrub.rs index 74b1ed9a5c4..8a54b9bfc34 100644 --- a/src/test/run-pass/extern-call-scrub.rs +++ b/src/test/run-pass/extern-call-scrub.rs @@ -36,7 +36,7 @@ extern fn cb(data: libc::uintptr_t) -> libc::uintptr_t { #[fixed_stack_segment] #[inline(never)] fn count(n: uint) -> uint { unsafe { - info2!("n = {}", n); + info!("n = {}", n); rustrt::rust_dbg_call(cb, n) } } @@ -46,7 +46,7 @@ pub fn main() { // has a large stack) do task::spawn { let result = count(12u); - info2!("result = {}", result); + info!("result = {}", result); assert_eq!(result, 2048u); }; } diff --git a/src/test/run-pass/extern-crosscrate.rs b/src/test/run-pass/extern-crosscrate.rs index 3367b795462..a2b42134b55 100644 --- a/src/test/run-pass/extern-crosscrate.rs +++ b/src/test/run-pass/extern-crosscrate.rs @@ -16,13 +16,13 @@ extern mod externcallback(vers = "0.1"); #[fixed_stack_segment] #[inline(never)] fn fact(n: uint) -> uint { unsafe { - info2!("n = {}", n); + info!("n = {}", n); externcallback::rustrt::rust_dbg_call(externcallback::cb, n) } } pub fn main() { let result = fact(10u); - info2!("result = {}", result); + info!("result = {}", result); assert_eq!(result, 3628800u); } diff --git a/src/test/run-pass/extern-yield.rs b/src/test/run-pass/extern-yield.rs index 7e71d416b55..3ce0dbe30e2 100644 --- a/src/test/run-pass/extern-yield.rs +++ b/src/test/run-pass/extern-yield.rs @@ -41,7 +41,7 @@ pub fn main() { do 10u.times { do task::spawn { let result = count(5u); - info2!("result = {}", result); + info!("result = {}", result); assert_eq!(result, 16u); }; } diff --git a/src/test/run-pass/fact.rs b/src/test/run-pass/fact.rs index f0379e1dac1..1c9f5e254f1 100644 --- a/src/test/run-pass/fact.rs +++ b/src/test/run-pass/fact.rs @@ -15,7 +15,7 @@ fn f(x: int) -> int { // info!("in f:"); - info2!("{}", x); + info!("{}", x); if x == 1 { // info!("bottoming out"); @@ -26,7 +26,7 @@ fn f(x: int) -> int { let y: int = x * f(x - 1); // info!("returned"); - info2!("{}", y); + info!("{}", y); return y; } } diff --git a/src/test/run-pass/fat-arrow-match.rs b/src/test/run-pass/fat-arrow-match.rs index be945e93ec9..63e62e254b8 100644 --- a/src/test/run-pass/fat-arrow-match.rs +++ b/src/test/run-pass/fat-arrow-match.rs @@ -17,7 +17,7 @@ enum color { } pub fn main() { - error2!("{}", match red { + error!("{}", match red { red => { 1 } green => { 2 } blue => { 3 } diff --git a/src/test/run-pass/float-signature.rs b/src/test/run-pass/float-signature.rs index dae41d34e05..26974bbcece 100644 --- a/src/test/run-pass/float-signature.rs +++ b/src/test/run-pass/float-signature.rs @@ -14,5 +14,5 @@ pub fn main() { fn foo(n: f64) -> f64 { return n + 0.12345; } let n: f64 = 0.1; let m: f64 = foo(n); - info2!("{}", m); + info!("{}", m); } diff --git a/src/test/run-pass/float.rs b/src/test/run-pass/float.rs index 1418255d601..987ee233810 100644 --- a/src/test/run-pass/float.rs +++ b/src/test/run-pass/float.rs @@ -12,9 +12,9 @@ pub fn main() { let pi = 3.1415927; - info2!("{:?}", -pi * (pi + 2.0 / pi) - pi * 5.0); + info!("{:?}", -pi * (pi + 2.0 / pi) - pi * 5.0); if pi == 5.0 || pi < 10.0 || pi <= 2.0 || pi != 22.0 / 7.0 || pi >= 10.0 || pi > 1.0 { - info2!("yes"); + info!("yes"); } } diff --git a/src/test/run-pass/fn-bare-item.rs b/src/test/run-pass/fn-bare-item.rs index be0f686c5a4..e01c7ee998c 100644 --- a/src/test/run-pass/fn-bare-item.rs +++ b/src/test/run-pass/fn-bare-item.rs @@ -9,7 +9,7 @@ // except according to those terms. fn f() { - info2!("This is a bare function"); + info!("This is a bare function"); } pub fn main() { diff --git a/src/test/run-pass/for-loop-fail.rs b/src/test/run-pass/for-loop-fail.rs index 9599c5852df..ff718500340 100644 --- a/src/test/run-pass/for-loop-fail.rs +++ b/src/test/run-pass/for-loop-fail.rs @@ -8,4 +8,4 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -pub fn main() { let x: ~[int] = ~[]; for _ in x.iter() { fail2!("moop"); } } +pub fn main() { let x: ~[int] = ~[]; for _ in x.iter() { fail!("moop"); } } diff --git a/src/test/run-pass/foreach-put-structured.rs b/src/test/run-pass/foreach-put-structured.rs index 6e20bb20bd9..2b57cc033f9 100644 --- a/src/test/run-pass/foreach-put-structured.rs +++ b/src/test/run-pass/foreach-put-structured.rs @@ -21,8 +21,8 @@ pub fn main() { let mut j: int = 0; do pairs() |p| { let (_0, _1) = p; - info2!("{}", _0); - info2!("{}", _1); + info!("{}", _0); + info!("{}", _1); assert_eq!(_0 + 10, i); i += 1; j = _1; diff --git a/src/test/run-pass/foreach-simple-outer-slot.rs b/src/test/run-pass/foreach-simple-outer-slot.rs index b5fa186902e..53201c7a91a 100644 --- a/src/test/run-pass/foreach-simple-outer-slot.rs +++ b/src/test/run-pass/foreach-simple-outer-slot.rs @@ -14,13 +14,13 @@ // -*- rust -*- pub fn main() { let mut sum: int = 0; - do first_ten |i| { info2!("main"); info2!("{}", i); sum = sum + i; } - info2!("sum"); - info2!("{}", sum); + do first_ten |i| { info!("main"); info!("{}", i); sum = sum + i; } + info!("sum"); + info!("{}", sum); assert_eq!(sum, 45); } fn first_ten(it: &fn(int)) { let mut i: int = 0; - while i < 10 { info2!("first_ten"); it(i); i = i + 1; } + while i < 10 { info!("first_ten"); it(i); i = i + 1; } } diff --git a/src/test/run-pass/generic-alias-box.rs b/src/test/run-pass/generic-alias-box.rs index b4412db1a58..0ba40fe063d 100644 --- a/src/test/run-pass/generic-alias-box.rs +++ b/src/test/run-pass/generic-alias-box.rs @@ -15,6 +15,6 @@ fn id<T>(t: T) -> T { return t; } pub fn main() { let expected = @100; let actual = id::<@int>(expected); - info2!("{:?}", *actual); + info!("{:?}", *actual); assert_eq!(*expected, *actual); } diff --git a/src/test/run-pass/generic-alias-unique.rs b/src/test/run-pass/generic-alias-unique.rs index ab50b70b1b8..a54c68a907b 100644 --- a/src/test/run-pass/generic-alias-unique.rs +++ b/src/test/run-pass/generic-alias-unique.rs @@ -15,6 +15,6 @@ fn id<T:Send>(t: T) -> T { return t; } pub fn main() { let expected = ~100; let actual = id::<~int>(expected.clone()); - info2!("{:?}", *actual); + info!("{:?}", *actual); assert_eq!(*expected, *actual); } diff --git a/src/test/run-pass/generic-derived-type.rs b/src/test/run-pass/generic-derived-type.rs index 7ce3dc7a03d..396ac88bd06 100644 --- a/src/test/run-pass/generic-derived-type.rs +++ b/src/test/run-pass/generic-derived-type.rs @@ -25,8 +25,8 @@ fn f<T:Clone>(t: T) -> Pair<T> { pub fn main() { let b = f::<int>(10); - info2!("{:?}" ,b.a); - info2!("{:?}", b.b); + info!("{:?}" ,b.a); + info!("{:?}", b.b); assert_eq!(b.a, 10); assert_eq!(b.b, 10); } diff --git a/src/test/run-pass/generic-fn-box.rs b/src/test/run-pass/generic-fn-box.rs index c5d6d23d948..a203b6b3ada 100644 --- a/src/test/run-pass/generic-fn-box.rs +++ b/src/test/run-pass/generic-fn-box.rs @@ -12,4 +12,4 @@ fn f<T>(x: @T) -> @T { return x; } -pub fn main() { let x = f(@3); info2!("{:?}", *x); } +pub fn main() { let x = f(@3); info!("{:?}", *x); } diff --git a/src/test/run-pass/generic-fn-unique.rs b/src/test/run-pass/generic-fn-unique.rs index d4ba0ddfc8e..64e7d0101b8 100644 --- a/src/test/run-pass/generic-fn-unique.rs +++ b/src/test/run-pass/generic-fn-unique.rs @@ -11,4 +11,4 @@ fn f<T>(x: ~T) -> ~T { return x; } -pub fn main() { let x = f(~3); info2!("{:?}", *x); } +pub fn main() { let x = f(~3); info!("{:?}", *x); } diff --git a/src/test/run-pass/generic-fn.rs b/src/test/run-pass/generic-fn.rs index 4d8b382b511..652349dea82 100644 --- a/src/test/run-pass/generic-fn.rs +++ b/src/test/run-pass/generic-fn.rs @@ -23,14 +23,14 @@ pub fn main() { let p: Triple = Triple {x: 65, y: 66, z: 67}; let mut q: Triple = Triple {x: 68, y: 69, z: 70}; y = id::<int>(x); - info2!("{}", y); + info!("{}", y); assert_eq!(x, y); b = id::<char>(a); - info2!("{}", b); + info!("{}", b); assert_eq!(a, b); q = id::<Triple>(p); x = p.z; y = q.z; - info2!("{}", y); + info!("{}", y); assert_eq!(x, y); } diff --git a/src/test/run-pass/generic-tag-match.rs b/src/test/run-pass/generic-tag-match.rs index 7b3b1118974..f740d8cb2d1 100644 --- a/src/test/run-pass/generic-tag-match.rs +++ b/src/test/run-pass/generic-tag-match.rs @@ -14,7 +14,7 @@ enum foo<T> { arm(T), } fn altfoo<T>(f: foo<T>) { let mut hit = false; - match f { arm::<T>(_x) => { info2!("in arm"); hit = true; } } + match f { arm::<T>(_x) => { info!("in arm"); hit = true; } } assert!((hit)); } diff --git a/src/test/run-pass/generic-tag-values.rs b/src/test/run-pass/generic-tag-values.rs index 739eb9f0aca..984765c4e51 100644 --- a/src/test/run-pass/generic-tag-values.rs +++ b/src/test/run-pass/generic-tag-values.rs @@ -18,12 +18,12 @@ struct Pair { x: int, y: int } pub fn main() { let nop: noption<int> = some::<int>(5); - match nop { some::<int>(n) => { info2!("{:?}", n); assert!((n == 5)); } } + match nop { some::<int>(n) => { info!("{:?}", n); assert!((n == 5)); } } let nop2: noption<Pair> = some(Pair{x: 17, y: 42}); match nop2 { some(t) => { - info2!("{:?}", t.x); - info2!("{:?}", t.y); + info!("{:?}", t.x); + info!("{:?}", t.y); assert_eq!(t.x, 17); assert_eq!(t.y, 42); } diff --git a/src/test/run-pass/generic-temporary.rs b/src/test/run-pass/generic-temporary.rs index 5143676f34a..1f480bf402b 100644 --- a/src/test/run-pass/generic-temporary.rs +++ b/src/test/run-pass/generic-temporary.rs @@ -12,7 +12,7 @@ fn mk() -> int { return 1; } -fn chk(a: int) { info2!("{}", a); assert!((a == 1)); } +fn chk(a: int) { info!("{}", a); assert!((a == 1)); } fn apply<T>(produce: extern fn() -> T, consume: extern fn(T)) { diff --git a/src/test/run-pass/generic-tup.rs b/src/test/run-pass/generic-tup.rs index f9f5da51196..9626884be9d 100644 --- a/src/test/run-pass/generic-tup.rs +++ b/src/test/run-pass/generic-tup.rs @@ -11,7 +11,7 @@ fn get_third<T>(t: (T, T, T)) -> T { let (_, _, x) = t; return x; } pub fn main() { - info2!("{:?}", get_third((1, 2, 3))); + info!("{:?}", get_third((1, 2, 3))); assert_eq!(get_third((1, 2, 3)), 3); assert_eq!(get_third((5u8, 6u8, 7u8)), 7u8); } diff --git a/src/test/run-pass/getopts_ref.rs b/src/test/run-pass/getopts_ref.rs index e0ac464f321..bfc14006565 100644 --- a/src/test/run-pass/getopts_ref.rs +++ b/src/test/run-pass/getopts_ref.rs @@ -21,7 +21,7 @@ pub fn main() { match getopts(args, opts) { Ok(ref m) => assert!(!m.opt_present("b")), - Err(ref f) => fail2!("{:?}", (*f).clone().to_err_msg()) + Err(ref f) => fail!("{:?}", (*f).clone().to_err_msg()) }; } diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs index 13a544a200b..73595fd782c 100644 --- a/src/test/run-pass/hashmap-memory.rs +++ b/src/test/run-pass/hashmap-memory.rs @@ -47,11 +47,11 @@ mod map_reduce { return; } let (pp, cc) = stream(); - error2!("sending find_reducer"); + error!("sending find_reducer"); ctrl.send(find_reducer(key.as_bytes().to_owned(), cc)); - error2!("receiving"); + error!("receiving"); let c = pp.recv(); - error2!("{:?}", c); + error!("{:?}", c); im.insert(key, c); } diff --git a/src/test/run-pass/if-bot.rs b/src/test/run-pass/if-bot.rs index 768f3431832..6ac169fed9b 100644 --- a/src/test/run-pass/if-bot.rs +++ b/src/test/run-pass/if-bot.rs @@ -11,6 +11,6 @@ pub fn main() { - let i: int = if false { fail2!() } else { 5 }; - info2!("{:?}", i); + let i: int = if false { fail!() } else { 5 }; + info!("{:?}", i); } diff --git a/src/test/run-pass/if-check.rs b/src/test/run-pass/if-check.rs index 0fd5fc01d17..50a1b4345dc 100644 --- a/src/test/run-pass/if-check.rs +++ b/src/test/run-pass/if-check.rs @@ -16,9 +16,9 @@ fn even(x: uint) -> bool { fn foo(x: uint) { if even(x) { - info2!("{}", x); + info!("{}", x); } else { - fail2!(); + fail!(); } } diff --git a/src/test/run-pass/import-glob-0.rs b/src/test/run-pass/import-glob-0.rs index 1da617273df..0ace721cdc0 100644 --- a/src/test/run-pass/import-glob-0.rs +++ b/src/test/run-pass/import-glob-0.rs @@ -16,10 +16,10 @@ use module_of_many_things::*; use dug::too::greedily::and::too::deep::*; mod module_of_many_things { - pub fn f1() { info2!("f1"); } - pub fn f2() { info2!("f2"); } - fn f3() { info2!("f3"); } - pub fn f4() { info2!("f4"); } + pub fn f1() { info!("f1"); } + pub fn f2() { info!("f2"); } + fn f3() { info!("f3"); } + pub fn f4() { info!("f4"); } } mod dug { @@ -28,8 +28,8 @@ mod dug { pub mod and { pub mod too { pub mod deep { - pub fn nameless_fear() { info2!("Boo!"); } - pub fn also_redstone() { info2!("Whatever."); } + pub fn nameless_fear() { info!("Boo!"); } + pub fn also_redstone() { info!("Whatever."); } } } } diff --git a/src/test/run-pass/import.rs b/src/test/run-pass/import.rs index eff085e687d..2b20eed593a 100644 --- a/src/test/run-pass/import.rs +++ b/src/test/run-pass/import.rs @@ -11,7 +11,7 @@ // except according to those terms. mod foo { - pub fn x(y: int) { info2!("{:?}", y); } + pub fn x(y: int) { info!("{:?}", y); } } mod bar { diff --git a/src/test/run-pass/import2.rs b/src/test/run-pass/import2.rs index 3ca64ce199e..9cda55f5084 100644 --- a/src/test/run-pass/import2.rs +++ b/src/test/run-pass/import2.rs @@ -14,7 +14,7 @@ use zed::bar; mod zed { - pub fn bar() { info2!("bar"); } + pub fn bar() { info!("bar"); } } pub fn main() { bar(); } diff --git a/src/test/run-pass/import3.rs b/src/test/run-pass/import3.rs index 10f6d87bf4c..64d47bf2219 100644 --- a/src/test/run-pass/import3.rs +++ b/src/test/run-pass/import3.rs @@ -17,7 +17,7 @@ use baz::zed::bar; mod baz { pub mod zed { - pub fn bar() { info2!("bar2"); } + pub fn bar() { info!("bar2"); } } } diff --git a/src/test/run-pass/import4.rs b/src/test/run-pass/import4.rs index d453306317b..d368ab2e993 100644 --- a/src/test/run-pass/import4.rs +++ b/src/test/run-pass/import4.rs @@ -14,7 +14,7 @@ use zed::bar; mod zed { - pub fn bar() { info2!("bar"); } + pub fn bar() { info!("bar"); } } pub fn main() { let _zed = 42; bar(); } diff --git a/src/test/run-pass/import5.rs b/src/test/run-pass/import5.rs index 00c5f35c542..e9539b290ae 100644 --- a/src/test/run-pass/import5.rs +++ b/src/test/run-pass/import5.rs @@ -14,7 +14,7 @@ use foo::bar; mod foo { pub use foo::zed::bar; pub mod zed { - pub fn bar() { info2!("foo"); } + pub fn bar() { info!("foo"); } } } diff --git a/src/test/run-pass/import6.rs b/src/test/run-pass/import6.rs index 150a89f6176..4f813247576 100644 --- a/src/test/run-pass/import6.rs +++ b/src/test/run-pass/import6.rs @@ -17,7 +17,7 @@ use bar::baz; mod foo { pub mod zed { - pub fn baz() { info2!("baz"); } + pub fn baz() { info!("baz"); } } } mod bar { diff --git a/src/test/run-pass/import7.rs b/src/test/run-pass/import7.rs index e9241882f65..63a30ccee2c 100644 --- a/src/test/run-pass/import7.rs +++ b/src/test/run-pass/import7.rs @@ -17,7 +17,7 @@ use bar::baz; mod foo { pub mod zed { - pub fn baz() { info2!("baz"); } + pub fn baz() { info!("baz"); } } } mod bar { diff --git a/src/test/run-pass/import8.rs b/src/test/run-pass/import8.rs index 9b0c512d4f1..2af4cf5e984 100644 --- a/src/test/run-pass/import8.rs +++ b/src/test/run-pass/import8.rs @@ -15,7 +15,7 @@ use foo::x; use z = foo::x; mod foo { - pub fn x(y: int) { info2!("{}", y); } + pub fn x(y: int) { info!("{}", y); } } pub fn main() { x(10); z(10); } diff --git a/src/test/run-pass/inner-module.rs b/src/test/run-pass/inner-module.rs index 7e3547ba7f3..1e53dd849fc 100644 --- a/src/test/run-pass/inner-module.rs +++ b/src/test/run-pass/inner-module.rs @@ -14,7 +14,7 @@ // -*- rust -*- mod inner { pub mod inner2 { - pub fn hello() { info2!("hello, modular world"); } + pub fn hello() { info!("hello, modular world"); } } pub fn hello() { inner2::hello(); } } diff --git a/src/test/run-pass/integral-indexing.rs b/src/test/run-pass/integral-indexing.rs index 05032dda759..edc71b524e3 100644 --- a/src/test/run-pass/integral-indexing.rs +++ b/src/test/run-pass/integral-indexing.rs @@ -20,11 +20,11 @@ pub fn main() { assert_eq!(v[3i8], 3); assert_eq!(v[3u32], 3); assert_eq!(v[3i32], 3); - info2!("{}", v[3u8]); + info!("{}", v[3u8]); assert_eq!(s[3u], 'd' as u8); assert_eq!(s[3u8], 'd' as u8); assert_eq!(s[3i8], 'd' as u8); assert_eq!(s[3u32], 'd' as u8); assert_eq!(s[3i32], 'd' as u8); - info2!("{}", s[3u8]); + info!("{}", s[3u8]); } diff --git a/src/test/run-pass/issue-1516.rs b/src/test/run-pass/issue-1516.rs index 17444e65708..4b73d83595e 100644 --- a/src/test/run-pass/issue-1516.rs +++ b/src/test/run-pass/issue-1516.rs @@ -9,5 +9,5 @@ // except according to those terms. pub fn main() { - let early_error: &'static fn(&str) -> ! = |_msg| { fail2!() }; + let early_error: &'static fn(&str) -> ! = |_msg| { fail!() }; } diff --git a/src/test/run-pass/issue-1696.rs b/src/test/run-pass/issue-1696.rs index de62c57ab9f..1532a8a3fb8 100644 --- a/src/test/run-pass/issue-1696.rs +++ b/src/test/run-pass/issue-1696.rs @@ -15,5 +15,5 @@ use std::hashmap::HashMap; pub fn main() { let mut m = HashMap::new(); m.insert("foo".as_bytes().to_owned(), "bar".as_bytes().to_owned()); - error2!("{:?}", m); + error!("{:?}", m); } diff --git a/src/test/run-pass/issue-2216.rs b/src/test/run-pass/issue-2216.rs index f51a49e9c7b..4a1bb2ea877 100644 --- a/src/test/run-pass/issue-2216.rs +++ b/src/test/run-pass/issue-2216.rs @@ -27,6 +27,6 @@ pub fn main() { break; } - error2!("{:?}", x); + error!("{:?}", x); assert_eq!(x, 42); } diff --git a/src/test/run-pass/issue-2311-2.rs b/src/test/run-pass/issue-2311-2.rs index cf8d3dc642c..b03bfb958af 100644 --- a/src/test/run-pass/issue-2311-2.rs +++ b/src/test/run-pass/issue-2311-2.rs @@ -15,7 +15,7 @@ struct foo<A> { impl<A> foo<A> { pub fn bar<B,C:clam<A>>(&self, _c: C) -> B { - fail2!(); + fail!(); } } diff --git a/src/test/run-pass/issue-2312.rs b/src/test/run-pass/issue-2312.rs index 54a8730fa1b..14b5efe904d 100644 --- a/src/test/run-pass/issue-2312.rs +++ b/src/test/run-pass/issue-2312.rs @@ -15,7 +15,7 @@ trait clam<A> { } struct foo(int); impl foo { - pub fn bar<B,C:clam<B>>(&self, _c: C) -> B { fail2!(); } + pub fn bar<B,C:clam<B>>(&self, _c: C) -> B { fail!(); } } pub fn main() { } diff --git a/src/test/run-pass/issue-2611-3.rs b/src/test/run-pass/issue-2611-3.rs index 5882edf1880..a3d51bb9014 100644 --- a/src/test/run-pass/issue-2611-3.rs +++ b/src/test/run-pass/issue-2611-3.rs @@ -20,7 +20,7 @@ struct E { } impl A for E { - fn b<F,G>(_x: F) -> F { fail2!() } + fn b<F,G>(_x: F) -> F { fail!() } //~^ ERROR in method `b`, type parameter 0 has 1 bound, but } diff --git a/src/test/run-pass/issue-2633.rs b/src/test/run-pass/issue-2633.rs index e905c895c35..bde18d77b9a 100644 --- a/src/test/run-pass/issue-2633.rs +++ b/src/test/run-pass/issue-2633.rs @@ -13,7 +13,7 @@ struct cat { } fn meow() { - error2!("meow") + error!("meow") } fn cat() -> cat { diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs index 617f98cdb5f..7cebfa13223 100644 --- a/src/test/run-pass/issue-2718.rs +++ b/src/test/run-pass/issue-2718.rs @@ -52,9 +52,9 @@ pub mod pipes { } mod rusti { - pub fn atomic_xchg(_dst: &mut int, _src: int) -> int { fail2!(); } - pub fn atomic_xchg_acq(_dst: &mut int, _src: int) -> int { fail2!(); } - pub fn atomic_xchg_rel(_dst: &mut int, _src: int) -> int { fail2!(); } + pub fn atomic_xchg(_dst: &mut int, _src: int) -> int { fail!(); } + pub fn atomic_xchg_acq(_dst: &mut int, _src: int) -> int { fail!(); } + pub fn atomic_xchg_rel(_dst: &mut int, _src: int) -> int { fail!(); } } // We should consider moving this to ::std::unsafe, although I @@ -88,7 +88,7 @@ pub mod pipes { // The receiver will eventually clean this up. unsafe { forget(p); } } - full => { fail2!("duplicate send") } + full => { fail!("duplicate send") } blocked => { // The receiver will eventually clean this up. @@ -130,7 +130,7 @@ pub mod pipes { } full => { // This is impossible - fail2!("you dun goofed") + fail!("you dun goofed") } terminated => { // I have to clean up, use drop_glue @@ -147,7 +147,7 @@ pub mod pipes { } blocked => { // this shouldn't happen. - fail2!("terminating a blocked packet") + fail!("terminating a blocked packet") } terminated | full => { // I have to clean up, use drop_glue @@ -232,7 +232,7 @@ pub mod pingpong { let _addr : *::pipes::send_packet<pong> = match &p { &ping(ref x) => { cast::transmute(x) } }; - fail2!() + fail!() } } @@ -241,7 +241,7 @@ pub mod pingpong { let _addr : *::pipes::send_packet<ping> = match &p { &pong(ref x) => { cast::transmute(x) } }; - fail2!() + fail!() } } @@ -265,7 +265,7 @@ pub mod pingpong { pub fn do_pong(c: pong) -> (ping, ()) { let packet = ::pipes::recv(c); if packet.is_none() { - fail2!("sender closed the connection") + fail!("sender closed the connection") } (pingpong::liberate_pong(packet.unwrap()), ()) } @@ -280,7 +280,7 @@ pub mod pingpong { pub fn do_ping(c: ping) -> (pong, ()) { let packet = ::pipes::recv(c); if packet.is_none() { - fail2!("sender closed the connection") + fail!("sender closed the connection") } (pingpong::liberate_ping(packet.unwrap()), ()) } @@ -295,16 +295,16 @@ pub mod pingpong { fn client(chan: pingpong::client::ping) { let chan = pingpong::client::do_ping(chan); - error2!("Sent ping"); + error!("Sent ping"); let (_chan, _data) = pingpong::client::do_pong(chan); - error2!("Received pong"); + error!("Received pong"); } fn server(chan: pingpong::server::ping) { let (chan, _data) = pingpong::server::do_ping(chan); - error2!("Received ping"); + error!("Received ping"); let _chan = pingpong::server::do_pong(chan); - error2!("Sent pong"); + error!("Sent pong"); } pub fn main() { diff --git a/src/test/run-pass/issue-2804-2.rs b/src/test/run-pass/issue-2804-2.rs index 8fad80ce238..9597823c335 100644 --- a/src/test/run-pass/issue-2804-2.rs +++ b/src/test/run-pass/issue-2804-2.rs @@ -16,7 +16,7 @@ use std::hashmap::HashMap; fn add_interfaces(managed_ip: ~str, device: HashMap<~str, int>) { - error2!("{}, {:?}", managed_ip, device.get(&~"interfaces")); + error!("{}, {:?}", managed_ip, device.get(&~"interfaces")); } pub fn main() {} diff --git a/src/test/run-pass/issue-2804.rs b/src/test/run-pass/issue-2804.rs index efcdbaa482c..2d590f25af1 100644 --- a/src/test/run-pass/issue-2804.rs +++ b/src/test/run-pass/issue-2804.rs @@ -28,7 +28,7 @@ fn lookup(table: ~json::Object, key: ~str, default: ~str) -> ~str (*s).clone() } option::Some(value) => { - error2!("{} was expected to be a string but is a {:?}", key, value); + error!("{} was expected to be a string but is a {:?}", key, value); default } option::None => { @@ -47,7 +47,7 @@ fn add_interface(_store: int, managed_ip: ~str, data: extra::json::Json) -> (~st (label, bool_value(false)) } _ => { - error2!("Expected dict for {} interfaces but found {:?}", managed_ip, data); + error!("Expected dict for {} interfaces but found {:?}", managed_ip, data); (~"gnos:missing-interface", bool_value(true)) } } @@ -65,7 +65,7 @@ fn add_interfaces(store: int, managed_ip: ~str, device: HashMap<~str, extra::jso } _ => { - error2!("Expected list for {} interfaces but found {:?}", managed_ip, + error!("Expected list for {} interfaces but found {:?}", managed_ip, device.get(&~"interfaces")); ~[] } diff --git a/src/test/run-pass/issue-2904.rs b/src/test/run-pass/issue-2904.rs index f2a4692d396..328ea167d1e 100644 --- a/src/test/run-pass/issue-2904.rs +++ b/src/test/run-pass/issue-2904.rs @@ -55,8 +55,8 @@ fn square_from_char(c: char) -> square { '.' => { earth } ' ' => { empty } _ => { - error2!("invalid square: {:?}", c); - fail2!() + error!("invalid square: {:?}", c); + fail!() } } } diff --git a/src/test/run-pass/issue-2935.rs b/src/test/run-pass/issue-2935.rs index fff89381dbe..c1f4e1e49aa 100644 --- a/src/test/run-pass/issue-2935.rs +++ b/src/test/run-pass/issue-2935.rs @@ -29,6 +29,6 @@ pub fn main() { // x.f(); // y.f(); // (*z).f(); - error2!("ok so far..."); + error!("ok so far..."); z.f(); //segfault } diff --git a/src/test/run-pass/issue-3109.rs b/src/test/run-pass/issue-3109.rs index 76cb182b0b6..15580a01f7a 100644 --- a/src/test/run-pass/issue-3109.rs +++ b/src/test/run-pass/issue-3109.rs @@ -9,5 +9,5 @@ // except according to those terms. pub fn main() { - error2!("{:?}", ("hi there!", "you")); + error!("{:?}", ("hi there!", "you")); } diff --git a/src/test/run-pass/issue-3609.rs b/src/test/run-pass/issue-3609.rs index fdd26478a99..8ed70a7ee32 100644 --- a/src/test/run-pass/issue-3609.rs +++ b/src/test/run-pass/issue-3609.rs @@ -18,7 +18,7 @@ fn foo(name: ~str, samples_chan: Chan<Msg>) { |buffer| { for i in range(0u, buffer.len()) { - error2!("{}: {}", i, buffer[i]) + error!("{}: {}", i, buffer[i]) } }; samples_chan.send(GetSamples(name.clone(), callback)); diff --git a/src/test/run-pass/issue-3895.rs b/src/test/run-pass/issue-3895.rs index ef9cab87541..efe0cb8d491 100644 --- a/src/test/run-pass/issue-3895.rs +++ b/src/test/run-pass/issue-3895.rs @@ -13,6 +13,6 @@ pub fn main() { match BadChar { _ if true => BadChar, - BadChar | BadSyntax => fail2!() , + BadChar | BadSyntax => fail!() , }; } diff --git a/src/test/run-pass/issue-4016.rs b/src/test/run-pass/issue-4016.rs index 98b6a9c5f44..c4178961d9e 100644 --- a/src/test/run-pass/issue-4016.rs +++ b/src/test/run-pass/issue-4016.rs @@ -20,7 +20,7 @@ fn exec<T: JD>() { let doc = json::from_str("").unwrap(); let mut decoder = json::Decoder(doc); let _v: T = Decodable::decode(&mut decoder); - fail2!() + fail!() } pub fn main() {} diff --git a/src/test/run-pass/issue-5275.rs b/src/test/run-pass/issue-5275.rs index b0560b4e637..8f0d01fab40 100644 --- a/src/test/run-pass/issue-5275.rs +++ b/src/test/run-pass/issue-5275.rs @@ -12,14 +12,14 @@ fn foo(self_: &A) -> int { if true { - fail2!() + fail!() } else { *bar(self_.bar) } } fn bar<'r>(_: &'r mut int) -> &'r int { - fail2!() + fail!() } struct A { diff --git a/src/test/run-pass/issue-6128.rs b/src/test/run-pass/issue-6128.rs index 51c7ed8babc..a01a04ebf82 100644 --- a/src/test/run-pass/issue-6128.rs +++ b/src/test/run-pass/issue-6128.rs @@ -17,7 +17,7 @@ trait Graph<Node, Edge> { impl<E> Graph<int, E> for HashMap<int, int> { fn f(&self, _e: E) { - fail2!(); + fail!(); } } diff --git a/src/test/run-pass/issue-6344-let.rs b/src/test/run-pass/issue-6344-let.rs index 2d70f2623e4..05404b16f16 100644 --- a/src/test/run-pass/issue-6344-let.rs +++ b/src/test/run-pass/issue-6344-let.rs @@ -17,5 +17,5 @@ pub fn main() { let a = A { x: 0 }; let A { x: ref x } = a; - info2!("{:?}", x) + info!("{:?}", x) } diff --git a/src/test/run-pass/issue-6344-match.rs b/src/test/run-pass/issue-6344-match.rs index 465e413b0ec..ddac1823546 100644 --- a/src/test/run-pass/issue-6344-match.rs +++ b/src/test/run-pass/issue-6344-match.rs @@ -18,7 +18,7 @@ pub fn main() { match a { A { x : ref x } => { - info2!("{:?}", x) + info!("{:?}", x) } } } diff --git a/src/test/run-pass/issue-7563.rs b/src/test/run-pass/issue-7563.rs index 348a455830f..ece53f4e3f2 100644 --- a/src/test/run-pass/issue-7563.rs +++ b/src/test/run-pass/issue-7563.rs @@ -19,7 +19,7 @@ pub fn main() { let sa = A { a: 100 }; let sb = B { b: 200, pa: &sa }; - debug2!("sa is {:?}", sa); - debug2!("sb is {:?}", sb); - debug2!("sb.pa is {:?}", sb.get_pa()); + debug!("sa is {:?}", sa); + debug!("sb is {:?}", sb); + debug!("sb.pa is {:?}", sb.get_pa()); } diff --git a/src/test/run-pass/issue-8351-1.rs b/src/test/run-pass/issue-8351-1.rs index 44e100576e2..9aaaa13c799 100644 --- a/src/test/run-pass/issue-8351-1.rs +++ b/src/test/run-pass/issue-8351-1.rs @@ -18,8 +18,8 @@ enum E { pub fn main() { let e = Foo{f: 0}; match e { - Foo{f: 1} => fail2!(), + Foo{f: 1} => fail!(), Foo{_} => (), - _ => fail2!(), + _ => fail!(), } } diff --git a/src/test/run-pass/issue-8351-2.rs b/src/test/run-pass/issue-8351-2.rs index 4c319218953..528303c8ad3 100644 --- a/src/test/run-pass/issue-8351-2.rs +++ b/src/test/run-pass/issue-8351-2.rs @@ -18,8 +18,8 @@ enum E { pub fn main() { let e = Foo{f: 0, b: false}; match e { - Foo{f: 1, b: true} => fail2!(), + Foo{f: 1, b: true} => fail!(), Foo{b: false, f: 0} => (), - _ => fail2!(), + _ => fail!(), } } diff --git a/src/test/run-pass/istr.rs b/src/test/run-pass/istr.rs index a02edba5f65..9b3db58ea9b 100644 --- a/src/test/run-pass/istr.rs +++ b/src/test/run-pass/istr.rs @@ -10,7 +10,7 @@ fn test_stack_assign() { let s: ~str = ~"a"; - info2!("{}", s.clone()); + info!("{}", s.clone()); let t: ~str = ~"a"; assert!(s == t); let u: ~str = ~"b"; @@ -27,7 +27,7 @@ fn test_heap_assign() { assert!((s != u)); } -fn test_heap_log() { let s = ~"a big ol' string"; info2!("{}", s); } +fn test_heap_log() { let s = ~"a big ol' string"; info!("{}", s); } fn test_stack_add() { assert_eq!(~"a" + "b", ~"ab"); @@ -49,7 +49,7 @@ fn test_append() { let mut s = ~"a"; s.push_str("b"); - info2!("{}", s.clone()); + info!("{}", s.clone()); assert_eq!(s, ~"ab"); let mut s = ~"c"; diff --git a/src/test/run-pass/iter-range.rs b/src/test/run-pass/iter-range.rs index 82163200e59..5ada4aa8c75 100644 --- a/src/test/run-pass/iter-range.rs +++ b/src/test/run-pass/iter-range.rs @@ -19,5 +19,5 @@ fn range_(a: int, b: int, it: &fn(int)) { pub fn main() { let mut sum: int = 0; range_(0, 100, |x| sum += x ); - info2!("{}", sum); + info!("{}", sum); } diff --git a/src/test/run-pass/lambda-infer-unresolved.rs b/src/test/run-pass/lambda-infer-unresolved.rs index 0a6393d3dee..e615cfae6ad 100644 --- a/src/test/run-pass/lambda-infer-unresolved.rs +++ b/src/test/run-pass/lambda-infer-unresolved.rs @@ -16,6 +16,6 @@ struct Refs { refs: ~[int], n: int } pub fn main() { let e = @mut Refs{refs: ~[], n: 0}; - let _f: &fn() = || error2!("{}", e.n); + let _f: &fn() = || error!("{}", e.n); e.refs.push(1); } diff --git a/src/test/run-pass/last-use-in-block.rs b/src/test/run-pass/last-use-in-block.rs index 2f7f0f26e0f..e2dbf7d29db 100644 --- a/src/test/run-pass/last-use-in-block.rs +++ b/src/test/run-pass/last-use-in-block.rs @@ -15,7 +15,7 @@ fn lp<T>(s: ~str, f: &fn(~str) -> T) -> T { let r = f(s); return (r); } - fail2!(); + fail!(); } fn apply<T>(s: ~str, f: &fn(~str) -> T) -> T { diff --git a/src/test/run-pass/last-use-is-capture.rs b/src/test/run-pass/last-use-is-capture.rs index a6beed631da..5c349a09551 100644 --- a/src/test/run-pass/last-use-is-capture.rs +++ b/src/test/run-pass/last-use-is-capture.rs @@ -16,5 +16,5 @@ pub fn main() { fn invoke(f: &fn()) { f(); } let k = ~22; let _u = A {a: k.clone()}; - invoke(|| error2!("{:?}", k.clone()) ) + invoke(|| error!("{:?}", k.clone()) ) } diff --git a/src/test/run-pass/lazy-and-or.rs b/src/test/run-pass/lazy-and-or.rs index c821f582662..a3dc848344c 100644 --- a/src/test/run-pass/lazy-and-or.rs +++ b/src/test/run-pass/lazy-and-or.rs @@ -16,7 +16,7 @@ pub fn main() { let x = 1 == 2 || 3 == 3; assert!((x)); let mut y: int = 10; - info2!("{:?}", x || incr(&mut y)); + info!("{:?}", x || incr(&mut y)); assert_eq!(y, 10); if true && x { assert!((true)); } else { assert!((false)); } } diff --git a/src/test/run-pass/lazy-init.rs b/src/test/run-pass/lazy-init.rs index 53edb3d732c..d58e7f2a287 100644 --- a/src/test/run-pass/lazy-init.rs +++ b/src/test/run-pass/lazy-init.rs @@ -10,6 +10,6 @@ -fn foo(x: int) { info2!("{}", x); } +fn foo(x: int) { info!("{}", x); } pub fn main() { let mut x: int; if 1 > 2 { x = 12; } else { x = 10; } foo(x); } diff --git a/src/test/run-pass/linear-for-loop.rs b/src/test/run-pass/linear-for-loop.rs index db27a471ba3..05ac2d7e120 100644 --- a/src/test/run-pass/linear-for-loop.rs +++ b/src/test/run-pass/linear-for-loop.rs @@ -11,8 +11,8 @@ pub fn main() { let x = ~[1, 2, 3]; let mut y = 0; - for i in x.iter() { info2!("{:?}", *i); y += *i; } - info2!("{:?}", y); + for i in x.iter() { info!("{:?}", *i); y += *i; } + info!("{:?}", y); assert_eq!(y, 6); let s = ~"hello there"; let mut i: int = 0; @@ -25,8 +25,8 @@ pub fn main() { // ... i += 1; - info2!("{:?}", i); - info2!("{:?}", c); + info!("{:?}", i); + info!("{:?}", c); } assert_eq!(i, 11); } diff --git a/src/test/run-pass/liveness-loop-break.rs b/src/test/run-pass/liveness-loop-break.rs index 103a34492d9..3e11f74f04a 100644 --- a/src/test/run-pass/liveness-loop-break.rs +++ b/src/test/run-pass/liveness-loop-break.rs @@ -14,7 +14,7 @@ fn test() { v = 3; break; } - info2!("{}", v); + info!("{}", v); } pub fn main() { diff --git a/src/test/run-pass/log-err-phi.rs b/src/test/run-pass/log-err-phi.rs index 399ef25b727..57aeac9fcf8 100644 --- a/src/test/run-pass/log-err-phi.rs +++ b/src/test/run-pass/log-err-phi.rs @@ -10,4 +10,4 @@ -pub fn main() { if false { error2!("{}", ~"foo" + "bar"); } } +pub fn main() { if false { error!("{}", ~"foo" + "bar"); } } diff --git a/src/test/run-pass/log-linearized.rs b/src/test/run-pass/log-linearized.rs index 393b5c3d281..42a0020fad1 100644 --- a/src/test/run-pass/log-linearized.rs +++ b/src/test/run-pass/log-linearized.rs @@ -26,7 +26,7 @@ fn mk<T:'static>() -> @mut Smallintmap<T> { fn f<T,U:'static>() { let sim = mk::<U>(); - error2!("{:?}", sim); + error!("{:?}", sim); } pub fn main() { diff --git a/src/test/run-pass/log-poly.rs b/src/test/run-pass/log-poly.rs index 5cd45611377..c5221cd73d7 100644 --- a/src/test/run-pass/log-poly.rs +++ b/src/test/run-pass/log-poly.rs @@ -13,8 +13,8 @@ enum Numbers { } pub fn main() { - info2!("{}", 1); - info2!("{}", 2.0); - warn2!("{:?}", Three); - error2!("{:?}", ~[4]); + info!("{}", 1); + info!("{}", 2.0); + warn!("{:?}", Three); + error!("{:?}", ~[4]); } diff --git a/src/test/run-pass/loop-break-cont.rs b/src/test/run-pass/loop-break-cont.rs index 812089fd5a5..d6f148f559d 100644 --- a/src/test/run-pass/loop-break-cont.rs +++ b/src/test/run-pass/loop-break-cont.rs @@ -11,7 +11,7 @@ pub fn main() { let mut i = 0u; loop { - error2!("a"); + error!("a"); i += 1u; if i == 10u { break; @@ -23,7 +23,7 @@ pub fn main() { if i == 21u { break; } - error2!("b"); + error!("b"); is_even = false; i += 1u; if i % 2u != 0u { @@ -33,7 +33,7 @@ pub fn main() { } assert!(!is_even); loop { - error2!("c"); + error!("c"); if i == 22u { break; } diff --git a/src/test/run-pass/macro-interpolation.rs b/src/test/run-pass/macro-interpolation.rs index 0741d74b214..4b89844194a 100644 --- a/src/test/run-pass/macro-interpolation.rs +++ b/src/test/run-pass/macro-interpolation.rs @@ -18,7 +18,7 @@ macro_rules! overly_complicated ( Some($pat) => { $res } - _ => { fail2!(); } + _ => { fail!(); } } }) diff --git a/src/test/run-pass/match-bot-2.rs b/src/test/run-pass/match-bot-2.rs index 3abc4435edc..ba897bd92c0 100644 --- a/src/test/run-pass/match-bot-2.rs +++ b/src/test/run-pass/match-bot-2.rs @@ -9,5 +9,5 @@ // except according to those terms. // n.b. This was only ever failing with optimization disabled. -fn a() -> int { match return 1 { 2 => 3, _ => fail2!() } } +fn a() -> int { match return 1 { 2 => 3, _ => fail!() } } pub fn main() { a(); } diff --git a/src/test/run-pass/match-bot.rs b/src/test/run-pass/match-bot.rs index fd26dbfac0f..861d72ea228 100644 --- a/src/test/run-pass/match-bot.rs +++ b/src/test/run-pass/match-bot.rs @@ -11,6 +11,6 @@ pub fn main() { let i: int = - match Some::<int>(3) { None::<int> => { fail2!() } Some::<int>(_) => { 5 } }; - info2!("{}", i); + match Some::<int>(3) { None::<int> => { fail!() } Some::<int>(_) => { 5 } }; + info!("{}", i); } diff --git a/src/test/run-pass/match-enum-struct-0.rs b/src/test/run-pass/match-enum-struct-0.rs index f5e4cf6c926..0e3ecba8a35 100644 --- a/src/test/run-pass/match-enum-struct-0.rs +++ b/src/test/run-pass/match-enum-struct-0.rs @@ -20,7 +20,7 @@ enum E { pub fn main() { let e = Bar; match e { - Foo{f: _f} => fail2!(), + Foo{f: _f} => fail!(), _ => (), } } diff --git a/src/test/run-pass/match-enum-struct-1.rs b/src/test/run-pass/match-enum-struct-1.rs index 0f853cf64c5..5ee06e29cb8 100644 --- a/src/test/run-pass/match-enum-struct-1.rs +++ b/src/test/run-pass/match-enum-struct-1.rs @@ -19,10 +19,10 @@ pub fn main() { let e = Foo{f: 1}; match e { Foo{_} => (), - _ => fail2!(), + _ => fail!(), } match e { Foo{f: _f} => (), - _ => fail2!(), + _ => fail!(), } } diff --git a/src/test/run-pass/match-join.rs b/src/test/run-pass/match-join.rs index e73319712af..0f01985f274 100644 --- a/src/test/run-pass/match-join.rs +++ b/src/test/run-pass/match-join.rs @@ -28,4 +28,4 @@ fn foo<T>(y: Option<T>) { return; } -pub fn main() { info2!("hello"); foo::<int>(Some::<int>(5)); } +pub fn main() { info!("hello"); foo::<int>(Some::<int>(5)); } diff --git a/src/test/run-pass/match-pattern-drop.rs b/src/test/run-pass/match-pattern-drop.rs index 416c932b6c7..34d6597c62d 100644 --- a/src/test/run-pass/match-pattern-drop.rs +++ b/src/test/run-pass/match-pattern-drop.rs @@ -14,20 +14,20 @@ enum t { make_t(@int), clam, } fn foo(s: @int) { - info2!("{:?}", ::std::managed::refcount(s)); + info!("{:?}", ::std::managed::refcount(s)); let count = ::std::managed::refcount(s); let x: t = make_t(s); // ref up assert_eq!(::std::managed::refcount(s), count + 1u); - info2!("{:?}", ::std::managed::refcount(s)); + info!("{:?}", ::std::managed::refcount(s)); match x { make_t(y) => { - info2!("{:?}", y); // ref up then down + info!("{:?}", y); // ref up then down } - _ => { info2!("?"); fail2!(); } + _ => { info!("?"); fail!(); } } - info2!("{:?}", ::std::managed::refcount(s)); + info!("{:?}", ::std::managed::refcount(s)); assert_eq!(::std::managed::refcount(s), count + 1u); let _ = ::std::managed::refcount(s); // don't get bitten by last-use. } @@ -39,7 +39,7 @@ pub fn main() { foo(s); // ref up then down - info2!("{}", ::std::managed::refcount(s)); + info!("{}", ::std::managed::refcount(s)); let count2 = ::std::managed::refcount(s); assert_eq!(count, count2); } diff --git a/src/test/run-pass/match-pattern-lit.rs b/src/test/run-pass/match-pattern-lit.rs index 9493b8d960d..84e9012be4e 100644 --- a/src/test/run-pass/match-pattern-lit.rs +++ b/src/test/run-pass/match-pattern-lit.rs @@ -12,9 +12,9 @@ fn altlit(f: int) -> int { match f { - 10 => { info2!("case 10"); return 20; } - 11 => { info2!("case 11"); return 22; } - _ => fail2!("the impossible happened") + 10 => { info!("case 10"); return 20; } + 11 => { info!("case 11"); return 22; } + _ => fail!("the impossible happened") } } diff --git a/src/test/run-pass/match-pattern-no-type-params.rs b/src/test/run-pass/match-pattern-no-type-params.rs index 6ef3f75fbbc..2076f46e8ab 100644 --- a/src/test/run-pass/match-pattern-no-type-params.rs +++ b/src/test/run-pass/match-pattern-no-type-params.rs @@ -12,8 +12,8 @@ enum maybe<T> { nothing, just(T), } fn foo(x: maybe<int>) { match x { - nothing => { error2!("A"); } - just(_a) => { error2!("B"); } + nothing => { error!("A"); } + just(_a) => { error!("B"); } } } diff --git a/src/test/run-pass/match-pipe-binding.rs b/src/test/run-pass/match-pipe-binding.rs index 70832548f82..6df4c812361 100644 --- a/src/test/run-pass/match-pipe-binding.rs +++ b/src/test/run-pass/match-pipe-binding.rs @@ -15,7 +15,7 @@ fn test1() { assert_eq!(a, ~"a"); assert_eq!(b, ~"b"); }, - _ => fail2!(), + _ => fail!(), } } @@ -25,7 +25,7 @@ fn test2() { assert_eq!(a, 2); assert_eq!(b, 3); }, - _ => fail2!(), + _ => fail!(), } } @@ -35,7 +35,7 @@ fn test3() { assert_eq!(*a, 2); assert_eq!(*b, 3); }, - _ => fail2!(), + _ => fail!(), } } @@ -45,7 +45,7 @@ fn test4() { assert_eq!(a, 2); assert_eq!(b, 3); }, - _ => fail2!(), + _ => fail!(), } } @@ -55,7 +55,7 @@ fn test5() { assert_eq!(*a, 2); assert_eq!(*b, 3); }, - _ => fail2!(), + _ => fail!(), } } diff --git a/src/test/run-pass/match-range.rs b/src/test/run-pass/match-range.rs index a95c4e5289b..6b02b21a084 100644 --- a/src/test/run-pass/match-range.rs +++ b/src/test/run-pass/match-range.rs @@ -11,31 +11,31 @@ pub fn main() { match 5u { 1u..5u => {} - _ => fail2!("should match range"), + _ => fail!("should match range"), } match 5u { - 6u..7u => fail2!("shouldn't match range"), + 6u..7u => fail!("shouldn't match range"), _ => {} } match 5u { - 1u => fail2!("should match non-first range"), + 1u => fail!("should match non-first range"), 2u..6u => {} - _ => fail2!("math is broken") + _ => fail!("math is broken") } match 'c' { 'a'..'z' => {} - _ => fail2!("should suppport char ranges") + _ => fail!("should suppport char ranges") } match -3 { -7..5 => {} - _ => fail2!("should match signed range") + _ => fail!("should match signed range") } match 3.0 { 1.0..5.0 => {} - _ => fail2!("should match float range") + _ => fail!("should match float range") } match -1.5 { -3.6..3.6 => {} - _ => fail2!("should match negative float range") + _ => fail!("should match negative float range") } } diff --git a/src/test/run-pass/match-ref-binding-in-guard-3256.rs b/src/test/run-pass/match-ref-binding-in-guard-3256.rs index 74a3f255362..e1d2f0e1c48 100644 --- a/src/test/run-pass/match-ref-binding-in-guard-3256.rs +++ b/src/test/run-pass/match-ref-binding-in-guard-3256.rs @@ -17,7 +17,7 @@ pub fn main() { Some(ref z) if z.with(|b| *b) => { do z.with |b| { assert!(*b); } }, - _ => fail2!() + _ => fail!() } } } diff --git a/src/test/run-pass/match-str.rs b/src/test/run-pass/match-str.rs index ecec003519c..8bbcc507f18 100644 --- a/src/test/run-pass/match-str.rs +++ b/src/test/run-pass/match-str.rs @@ -11,21 +11,21 @@ // Issue #53 pub fn main() { - match ~"test" { ~"not-test" => fail2!(), ~"test" => (), _ => fail2!() } + match ~"test" { ~"not-test" => fail!(), ~"test" => (), _ => fail!() } enum t { tag1(~str), tag2, } match tag1(~"test") { - tag2 => fail2!(), - tag1(~"not-test") => fail2!(), + tag2 => fail!(), + tag1(~"not-test") => fail!(), tag1(~"test") => (), - _ => fail2!() + _ => fail!() } - let x = match ~"a" { ~"a" => 1, ~"b" => 2, _ => fail2!() }; + let x = match ~"a" { ~"a" => 1, ~"b" => 2, _ => fail!() }; assert_eq!(x, 1); - match ~"a" { ~"a" => { } ~"b" => { }, _ => fail2!() } + match ~"a" { ~"a" => { } ~"b" => { }, _ => fail!() } } diff --git a/src/test/run-pass/match-struct-0.rs b/src/test/run-pass/match-struct-0.rs index 215b05ac73f..67e844c519e 100644 --- a/src/test/run-pass/match-struct-0.rs +++ b/src/test/run-pass/match-struct-0.rs @@ -15,15 +15,15 @@ struct Foo{ pub fn main() { let f = Foo{f: 1}; match f { - Foo{f: 0} => fail2!(), + Foo{f: 0} => fail!(), Foo{_} => (), } match f { - Foo{f: 0} => fail2!(), + Foo{f: 0} => fail!(), Foo{f: _f} => (), } match f { - Foo{f: 0} => fail2!(), + Foo{f: 0} => fail!(), _ => (), } } diff --git a/src/test/run-pass/match-unique-bind.rs b/src/test/run-pass/match-unique-bind.rs index 7f2af90d09a..50aa840e6d7 100644 --- a/src/test/run-pass/match-unique-bind.rs +++ b/src/test/run-pass/match-unique-bind.rs @@ -11,7 +11,7 @@ pub fn main() { match ~100 { ~x => { - info2!("{:?}", x); + info!("{:?}", x); assert_eq!(x, 100); } } diff --git a/src/test/run-pass/match-with-ret-arm.rs b/src/test/run-pass/match-with-ret-arm.rs index 2476d440a15..4257442ea33 100644 --- a/src/test/run-pass/match-with-ret-arm.rs +++ b/src/test/run-pass/match-with-ret-arm.rs @@ -19,5 +19,5 @@ pub fn main() { Some(num) => num as u32 }; assert_eq!(f, 1234u32); - error2!("{}", f) + error!("{}", f) } diff --git a/src/test/run-pass/morestack-address.rs b/src/test/run-pass/morestack-address.rs index ad8b32839ea..ec678df357a 100644 --- a/src/test/run-pass/morestack-address.rs +++ b/src/test/run-pass/morestack-address.rs @@ -19,6 +19,6 @@ pub fn main() { unsafe { let addr = rusti::morestack_addr(); assert!(addr.is_not_null()); - error2!("{}", addr); + error!("{}", addr); } } diff --git a/src/test/run-pass/mutable-alias-vec.rs b/src/test/run-pass/mutable-alias-vec.rs index 9ec91d930c0..0d08c11b664 100644 --- a/src/test/run-pass/mutable-alias-vec.rs +++ b/src/test/run-pass/mutable-alias-vec.rs @@ -21,6 +21,6 @@ pub fn main() { grow(&mut v); grow(&mut v); let len = v.len(); - info2!("{}", len); + info!("{}", len); assert_eq!(len, 3 as uint); } diff --git a/src/test/run-pass/negative.rs b/src/test/run-pass/negative.rs index a435f2c6050..d92496c4b7b 100644 --- a/src/test/run-pass/negative.rs +++ b/src/test/run-pass/negative.rs @@ -11,6 +11,6 @@ pub fn main() { match -5 { -5 => {} - _ => { fail2!() } + _ => { fail!() } } } diff --git a/src/test/run-pass/nested-matchs.rs b/src/test/run-pass/nested-matchs.rs index 9c728194e90..a516e2bf9bc 100644 --- a/src/test/run-pass/nested-matchs.rs +++ b/src/test/run-pass/nested-matchs.rs @@ -9,16 +9,16 @@ // except according to those terms. -fn baz() -> ! { fail2!(); } +fn baz() -> ! { fail!(); } fn foo() { match Some::<int>(5) { Some::<int>(_x) => { let mut bar; match None::<int> { None::<int> => { bar = 5; } _ => { baz(); } } - info2!("{:?}", bar); + info!("{:?}", bar); } - None::<int> => { info2!("hello"); } + None::<int> => { info!("hello"); } } } diff --git a/src/test/run-pass/nested-pattern.rs b/src/test/run-pass/nested-pattern.rs index cc8436e7c4b..0bc6280393c 100644 --- a/src/test/run-pass/nested-pattern.rs +++ b/src/test/run-pass/nested-pattern.rs @@ -16,8 +16,8 @@ enum t { foo(int, uint), bar(int, Option<int>), } fn nested(o: t) { match o { - bar(_i, Some::<int>(_)) => { error2!("wrong pattern matched"); fail2!(); } - _ => { error2!("succeeded"); } + bar(_i, Some::<int>(_)) => { error!("wrong pattern matched"); fail!(); } + _ => { error!("succeeded"); } } } diff --git a/src/test/run-pass/nested-patterns.rs b/src/test/run-pass/nested-patterns.rs index b979518f8a1..d901a625e1d 100644 --- a/src/test/run-pass/nested-patterns.rs +++ b/src/test/run-pass/nested-patterns.rs @@ -16,7 +16,7 @@ struct C { c: int } pub fn main() { match A {a: 10, b: @20} { x@A {a, b: @20} => { assert!(x.a == 10); assert!(a == 10); } - A {b: _b, _} => { fail2!(); } + A {b: _b, _} => { fail!(); } } let mut x@B {b, _} = B {a: 10, b: C {c: 20}}; x.b.c = 30; diff --git a/src/test/run-pass/opeq.rs b/src/test/run-pass/opeq.rs index 5172af17184..c83a3b7dfd0 100644 --- a/src/test/run-pass/opeq.rs +++ b/src/test/run-pass/opeq.rs @@ -15,15 +15,15 @@ pub fn main() { let mut x: int = 1; x *= 2; - info2!("{}", x); + info!("{}", x); assert_eq!(x, 2); x += 3; - info2!("{}", x); + info!("{}", x); assert_eq!(x, 5); x *= x; - info2!("{}", x); + info!("{}", x); assert_eq!(x, 25); x /= 5; - info2!("{}", x); + info!("{}", x); assert_eq!(x, 5); } diff --git a/src/test/run-pass/option-unwrap.rs b/src/test/run-pass/option-unwrap.rs index 7c8872fae8a..66cd7f2b55f 100644 --- a/src/test/run-pass/option-unwrap.rs +++ b/src/test/run-pass/option-unwrap.rs @@ -24,7 +24,7 @@ impl Drop for dtor { fn unwrap<T>(o: Option<T>) -> T { match o { Some(v) => v, - None => fail2!() + None => fail!() } } diff --git a/src/test/run-pass/over-constrained-vregs.rs b/src/test/run-pass/over-constrained-vregs.rs index 0fc56cecec5..cbd0416cb69 100644 --- a/src/test/run-pass/over-constrained-vregs.rs +++ b/src/test/run-pass/over-constrained-vregs.rs @@ -17,6 +17,6 @@ pub fn main() { while b <= 32u { 0u << b; b <<= 1u; - info2!("{:?}", b); + info!("{:?}", b); } } diff --git a/src/test/run-pass/overload-index-operator.rs b/src/test/run-pass/overload-index-operator.rs index 8de802e1fc9..b475222619d 100644 --- a/src/test/run-pass/overload-index-operator.rs +++ b/src/test/run-pass/overload-index-operator.rs @@ -36,7 +36,7 @@ impl<K:Eq,V:Clone> Index<K,V> for AssociationList<K,V> { return pair.value.clone(); } } - fail2!("No value found for key: {:?}", index); + fail!("No value found for key: {:?}", index); } } diff --git a/src/test/run-pass/paren-free.rs b/src/test/run-pass/paren-free.rs index 29789f38a4b..751ba78b282 100644 --- a/src/test/run-pass/paren-free.rs +++ b/src/test/run-pass/paren-free.rs @@ -11,5 +11,5 @@ pub fn main() { let x = true; if x { let mut i = 10; while i > 0 { i -= 1; } } - match x { true => { info2!("right"); } false => { info2!("wrong"); } } + match x { true => { info!("right"); } false => { info!("wrong"); } } } diff --git a/src/test/run-pass/parse-fail.rs b/src/test/run-pass/parse-fail.rs index 7d4a74fe32c..cfb5ecb1f5d 100644 --- a/src/test/run-pass/parse-fail.rs +++ b/src/test/run-pass/parse-fail.rs @@ -11,6 +11,6 @@ #[allow(unreachable_code)]; // -*- rust -*- -fn dont_call_me() { fail2!(); info2!("{}", 1); } +fn dont_call_me() { fail!(); info!("{}", 1); } pub fn main() { } diff --git a/src/test/run-pass/pass-by-copy.rs b/src/test/run-pass/pass-by-copy.rs index a9cfd3aa183..14ce305d6c1 100644 --- a/src/test/run-pass/pass-by-copy.rs +++ b/src/test/run-pass/pass-by-copy.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn magic(x: A) { info2!("{:?}", x); } -fn magic2(x: @int) { info2!("{:?}", x); } +fn magic(x: A) { info!("{:?}", x); } +fn magic2(x: @int) { info!("{:?}", x); } struct A { a: @int } diff --git a/src/test/run-pass/purity-infer.rs b/src/test/run-pass/purity-infer.rs index 030df6bcc08..debde77b211 100644 --- a/src/test/run-pass/purity-infer.rs +++ b/src/test/run-pass/purity-infer.rs @@ -11,5 +11,5 @@ fn something(f: &fn()) { f(); } pub fn main() { - something(|| error2!("hi!") ); + something(|| error!("hi!") ); } diff --git a/src/test/run-pass/rcvr-borrowed-to-region.rs b/src/test/run-pass/rcvr-borrowed-to-region.rs index 376a14924c0..8f256bbf2a4 100644 --- a/src/test/run-pass/rcvr-borrowed-to-region.rs +++ b/src/test/run-pass/rcvr-borrowed-to-region.rs @@ -28,16 +28,16 @@ pub fn main() { let x = @6; let y = x.get(); - info2!("y={}", y); + info!("y={}", y); assert_eq!(y, 6); let x = ~6; let y = x.get(); - info2!("y={}", y); + info!("y={}", y); assert_eq!(y, 6); let x = &6; let y = x.get(); - info2!("y={}", y); + info!("y={}", y); assert_eq!(y, 6); } diff --git a/src/test/run-pass/rcvr-borrowed-to-slice.rs b/src/test/run-pass/rcvr-borrowed-to-slice.rs index 1f1b9d3d1ee..fd37cc12302 100644 --- a/src/test/run-pass/rcvr-borrowed-to-slice.rs +++ b/src/test/run-pass/rcvr-borrowed-to-slice.rs @@ -24,16 +24,16 @@ fn call_sum(x: &[int]) -> int { x.sum_() } pub fn main() { let x = ~[1, 2, 3]; let y = call_sum(x); - info2!("y=={}", y); + info!("y=={}", y); assert_eq!(y, 6); let x = ~[1, 2, 3]; let y = x.sum_(); - info2!("y=={}", y); + info!("y=={}", y); assert_eq!(y, 6); let x = ~[1, 2, 3]; let y = x.sum_(); - info2!("y=={}", y); + info!("y=={}", y); assert_eq!(y, 6); } diff --git a/src/test/run-pass/rec-align-u32.rs b/src/test/run-pass/rec-align-u32.rs index 43304b66176..55375b62844 100644 --- a/src/test/run-pass/rec-align-u32.rs +++ b/src/test/run-pass/rec-align-u32.rs @@ -54,9 +54,9 @@ pub fn main() { // Send it through the shape code let y = format!("{:?}", x); - info2!("align inner = {:?}", rusti::min_align_of::<Inner>()); - info2!("size outer = {:?}", mem::size_of::<Outer>()); - info2!("y = {}", y); + info!("align inner = {:?}", rusti::min_align_of::<Inner>()); + info!("size outer = {:?}", mem::size_of::<Outer>()); + info!("y = {}", y); // per clang/gcc the alignment of `inner` is 4 on x86. assert_eq!(rusti::min_align_of::<Inner>(), m::align()); diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/run-pass/rec-align-u64.rs index 5adb8cf9510..9185ac123b2 100644 --- a/src/test/run-pass/rec-align-u64.rs +++ b/src/test/run-pass/rec-align-u64.rs @@ -76,9 +76,9 @@ pub fn main() { // Send it through the shape code let y = format!("{:?}", x); - info2!("align inner = {}", rusti::min_align_of::<Inner>()); - info2!("size outer = {}", mem::size_of::<Outer>()); - info2!("y = {}", y); + info!("align inner = {}", rusti::min_align_of::<Inner>()); + info!("size outer = {}", mem::size_of::<Outer>()); + info!("y = {}", y); // per clang/gcc the alignment of `Inner` is 4 on x86. assert_eq!(rusti::min_align_of::<Inner>(), m::m::align()); diff --git a/src/test/run-pass/rec-auto.rs b/src/test/run-pass/rec-auto.rs index 086d03ae4e3..669965bd617 100644 --- a/src/test/run-pass/rec-auto.rs +++ b/src/test/run-pass/rec-auto.rs @@ -19,6 +19,6 @@ struct X { foo: ~str, bar: ~str } pub fn main() { let x = X {foo: ~"hello", bar: ~"world"}; - info2!("{}", x.foo.clone()); - info2!("{}", x.bar.clone()); + info!("{}", x.foo.clone()); + info!("{}", x.bar.clone()); } diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs index 5a2243b1940..9e7021a56bb 100644 --- a/src/test/run-pass/reflect-visit-data.rs +++ b/src/test/run-pass/reflect-visit-data.rs @@ -551,7 +551,7 @@ impl TyVisitor for my_visitor { _sz: uint, _align: uint) -> bool { true } fn visit_rec_field(&mut self, _i: uint, _name: &str, _mtbl: uint, inner: *TyDesc) -> bool { - error2!("rec field!"); + error!("rec field!"); self.visit_inner(inner) } fn visit_leave_rec(&mut self, _n_fields: uint, @@ -569,7 +569,7 @@ impl TyVisitor for my_visitor { fn visit_enter_tup(&mut self, _n_fields: uint, _sz: uint, _align: uint) -> bool { true } fn visit_tup_field(&mut self, _i: uint, inner: *TyDesc) -> bool { - error2!("tup field!"); + error!("tup field!"); self.visit_inner(inner) } fn visit_leave_tup(&mut self, _n_fields: uint, @@ -633,7 +633,7 @@ pub fn main() { vals: ~[]}); let mut v = ptr_visit_adaptor(Inner {inner: u}); let td = get_tydesc_for(r); - error2!("tydesc sz: {}, align: {}", + error!("tydesc sz: {}, align: {}", (*td).size, (*td).align); visit_tydesc(td, &mut v as &mut TyVisitor); @@ -641,7 +641,7 @@ pub fn main() { for s in r.iter() { println!("val: {}", *s); } - error2!("{:?}", u.vals.clone()); + error!("{:?}", u.vals.clone()); assert_eq!(u.vals.clone(), ~[ ~"1", ~"2", ~"3", ~"true", ~"false", ~"5", ~"4", ~"3", ~"12"]); } diff --git a/src/test/run-pass/reflect-visit-type.rs b/src/test/run-pass/reflect-visit-type.rs index 0afc5dd1b17..e447c9c650c 100644 --- a/src/test/run-pass/reflect-visit-type.rs +++ b/src/test/run-pass/reflect-visit-type.rs @@ -17,32 +17,32 @@ struct MyVisitor { impl TyVisitor for MyVisitor { fn visit_bot(&mut self) -> bool { self.types.push(~"bot"); - error2!("visited bot type"); + error!("visited bot type"); true } fn visit_nil(&mut self) -> bool { self.types.push(~"nil"); - error2!("visited nil type"); + error!("visited nil type"); true } fn visit_bool(&mut self) -> bool { self.types.push(~"bool"); - error2!("visited bool type"); + error!("visited bool type"); true } fn visit_int(&mut self) -> bool { self.types.push(~"int"); - error2!("visited int type"); + error!("visited int type"); true } fn visit_i8(&mut self) -> bool { self.types.push(~"i8"); - error2!("visited i8 type"); + error!("visited i8 type"); true } fn visit_i16(&mut self) -> bool { self.types.push(~"i16"); - error2!("visited i16 type"); + error!("visited i16 type"); true } fn visit_i32(&mut self) -> bool { true } diff --git a/src/test/run-pass/region-dependent-addr-of.rs b/src/test/run-pass/region-dependent-addr-of.rs index 1d44d8defdc..d8076f543ec 100644 --- a/src/test/run-pass/region-dependent-addr-of.rs +++ b/src/test/run-pass/region-dependent-addr-of.rs @@ -57,21 +57,21 @@ fn get_v5<'v>(a: &'v A, _i: uint) -> &'v int { fn get_v6_a<'v>(a: &'v A, _i: uint) -> &'v int { match a.value.v6 { Some(ref v) => &v.f, - None => fail2!() + None => fail!() } } fn get_v6_b<'v>(a: &'v A, _i: uint) -> &'v int { match *a { A { value: B { v6: Some(ref v), _ } } => &v.f, - _ => fail2!() + _ => fail!() } } fn get_v6_c<'v>(a: &'v A, _i: uint) -> &'v int { match a { &A { value: B { v6: Some(ref v), _ } } => &v.f, - _ => fail2!() + _ => fail!() } } diff --git a/src/test/run-pass/region-return-interior-of-option.rs b/src/test/run-pass/region-return-interior-of-option.rs index 9258b149fd3..aa4630717db 100644 --- a/src/test/run-pass/region-return-interior-of-option.rs +++ b/src/test/run-pass/region-return-interior-of-option.rs @@ -11,7 +11,7 @@ fn get<'r, T>(opt: &'r Option<T>) -> &'r T { match *opt { Some(ref v) => v, - None => fail2!("none") + None => fail!("none") } } diff --git a/src/test/run-pass/regions-addr-of-ret.rs b/src/test/run-pass/regions-addr-of-ret.rs index 08b1d249869..898759f67d2 100644 --- a/src/test/run-pass/regions-addr-of-ret.rs +++ b/src/test/run-pass/regions-addr-of-ret.rs @@ -14,5 +14,5 @@ fn f<'a>(x : &'a int) -> &'a int { pub fn main() { let three = &3; - error2!("{}", *f(three)); + error!("{}", *f(three)); } diff --git a/src/test/run-pass/regions-borrow-at.rs b/src/test/run-pass/regions-borrow-at.rs index a504296a182..b4ec9914f26 100644 --- a/src/test/run-pass/regions-borrow-at.rs +++ b/src/test/run-pass/regions-borrow-at.rs @@ -15,6 +15,6 @@ fn foo(x: &uint) -> uint { pub fn main() { let p = @22u; let r = foo(p); - info2!("r={}", r); + info!("r={}", r); assert_eq!(r, 22u); } diff --git a/src/test/run-pass/regions-bot.rs b/src/test/run-pass/regions-bot.rs index 5d8d5d6033a..dbc5bf6626a 100644 --- a/src/test/run-pass/regions-bot.rs +++ b/src/test/run-pass/regions-bot.rs @@ -10,7 +10,7 @@ // A very limited test of the "bottom" region -fn produce_static<T>() -> &'static T { fail2!(); } +fn produce_static<T>() -> &'static T { fail!(); } fn foo<T>(_x: &T) -> &uint { produce_static() } diff --git a/src/test/run-pass/regions-self-impls.rs b/src/test/run-pass/regions-self-impls.rs index 61d088851fd..ceff247b5dd 100644 --- a/src/test/run-pass/regions-self-impls.rs +++ b/src/test/run-pass/regions-self-impls.rs @@ -22,6 +22,6 @@ impl<'self> get_chowder<'self> for Clam<'self> { pub fn main() { let clam = Clam { chowder: &3 }; - info2!("{:?}", *clam.get_chowder()); + info!("{:?}", *clam.get_chowder()); clam.get_chowder(); } diff --git a/src/test/run-pass/regions-self-in-enums.rs b/src/test/run-pass/regions-self-in-enums.rs index f0b7306990d..1b429110e10 100644 --- a/src/test/run-pass/regions-self-in-enums.rs +++ b/src/test/run-pass/regions-self-in-enums.rs @@ -19,5 +19,5 @@ pub fn main() { match y { int_wrapper_ctor(zz) => { z = zz; } } - info2!("{:?}", *z); + info!("{:?}", *z); } diff --git a/src/test/run-pass/regions-simple.rs b/src/test/run-pass/regions-simple.rs index e57c2e9807e..bb612c5b0df 100644 --- a/src/test/run-pass/regions-simple.rs +++ b/src/test/run-pass/regions-simple.rs @@ -12,5 +12,5 @@ pub fn main() { let mut x: int = 3; let y: &mut int = &mut x; *y = 5; - info2!("{:?}", *y); + info!("{:?}", *y); } diff --git a/src/test/run-pass/regions-static-closure.rs b/src/test/run-pass/regions-static-closure.rs index 3cb6fea3e53..a2eb459ce20 100644 --- a/src/test/run-pass/regions-static-closure.rs +++ b/src/test/run-pass/regions-static-closure.rs @@ -21,6 +21,6 @@ fn call_static_closure(cl: closure_box<'static>) { } pub fn main() { - let cl_box = box_it(|| info2!("Hello, world!")); + let cl_box = box_it(|| info!("Hello, world!")); call_static_closure(cl_box); } diff --git a/src/test/run-pass/repeated-vector-syntax.rs b/src/test/run-pass/repeated-vector-syntax.rs index 6291e229b6c..465c9b7090e 100644 --- a/src/test/run-pass/repeated-vector-syntax.rs +++ b/src/test/run-pass/repeated-vector-syntax.rs @@ -17,6 +17,6 @@ pub fn main() { let x = [ @[true], ..512 ]; let y = [ 0, ..1 ]; - error2!("{:?}", x); - error2!("{:?}", y); + error!("{:?}", x); + error!("{:?}", y); } diff --git a/src/test/run-pass/resource-assign-is-not-copy.rs b/src/test/run-pass/resource-assign-is-not-copy.rs index 2e30044f318..f5bc9895755 100644 --- a/src/test/run-pass/resource-assign-is-not-copy.rs +++ b/src/test/run-pass/resource-assign-is-not-copy.rs @@ -32,7 +32,7 @@ pub fn main() { let a = r(i); let b = (a, 10); let (c, _d) = b; - info2!("{:?}", c); + info!("{:?}", c); } assert_eq!(*i, 1); } diff --git a/src/test/run-pass/resource-cycle.rs b/src/test/run-pass/resource-cycle.rs index e7384203310..0c0707e9036 100644 --- a/src/test/run-pass/resource-cycle.rs +++ b/src/test/run-pass/resource-cycle.rs @@ -19,7 +19,7 @@ struct r { impl Drop for r { fn drop(&mut self) { unsafe { - info2!("r's dtor: self = {:x}, self.v = {:x}, self.v's value = {:x}", + info!("r's dtor: self = {:x}, self.v = {:x}, self.v's value = {:x}", cast::transmute::<*mut r, uint>(self), cast::transmute::<**int, uint>(&(self.v)), cast::transmute::<*int, uint>(self.v)); @@ -54,11 +54,11 @@ pub fn main() { next: None, r: { let rs = r(i1p); - info2!("r = {:x}", cast::transmute::<*r, uint>(&rs)); + info!("r = {:x}", cast::transmute::<*r, uint>(&rs)); rs } }); - info2!("x1 = {:x}, x1.r = {:x}", + info!("x1 = {:x}, x1.r = {:x}", cast::transmute::<@mut t, uint>(x1), cast::transmute::<*r, uint>(&x1.r)); @@ -66,12 +66,12 @@ pub fn main() { next: None, r: { let rs = r(i2p); - info2!("r2 = {:x}", cast::transmute::<*r, uint>(&rs)); + info!("r2 = {:x}", cast::transmute::<*r, uint>(&rs)); rs } }); - info2!("x2 = {:x}, x2.r = {:x}", + info!("x2 = {:x}, x2.r = {:x}", cast::transmute::<@mut t, uint>(x2), cast::transmute::<*r, uint>(&(x2.r))); diff --git a/src/test/run-pass/resource-destruct.rs b/src/test/run-pass/resource-destruct.rs index 70adccbb9c9..50b6509bb73 100644 --- a/src/test/run-pass/resource-destruct.rs +++ b/src/test/run-pass/resource-destruct.rs @@ -15,7 +15,7 @@ struct shrinky_pointer { #[unsafe_destructor] impl Drop for shrinky_pointer { fn drop(&mut self) { - error2!("Hello!"); **(self.i) -= 1; + error!("Hello!"); **(self.i) -= 1; } } @@ -32,6 +32,6 @@ fn shrinky_pointer(i: @@mut int) -> shrinky_pointer { pub fn main() { let my_total = @@mut 10; { let pt = shrinky_pointer(my_total); assert!((pt.look_at() == 10)); } - error2!("my_total = {}", **my_total); + error!("my_total = {}", **my_total); assert_eq!(**my_total, 9); } diff --git a/src/test/run-pass/ret-bang.rs b/src/test/run-pass/ret-bang.rs index f56cf57e12e..9754b08cd18 100644 --- a/src/test/run-pass/ret-bang.rs +++ b/src/test/run-pass/ret-bang.rs @@ -12,7 +12,7 @@ // -*- rust -*- -fn my_err(s: ~str) -> ! { error2!("{:?}", s); fail2!(); } +fn my_err(s: ~str) -> ! { error!("{:?}", s); fail!(); } fn okay(i: uint) -> int { if i == 3u { my_err(~"I don't like three"); } else { return 42; } diff --git a/src/test/run-pass/rt-start-main-thread.rs b/src/test/run-pass/rt-start-main-thread.rs index 9a6dfb22106..47a723ce6e1 100644 --- a/src/test/run-pass/rt-start-main-thread.rs +++ b/src/test/run-pass/rt-start-main-thread.rs @@ -13,9 +13,9 @@ #[start] fn start(argc: int, argv: **u8) -> int { do std::rt::start_on_main_thread(argc, argv) { - info2!("running on main thread"); + info!("running on main thread"); do spawn { - info2!("running on another thread"); + info!("running on another thread"); } } } diff --git a/src/test/run-pass/sendfn-generic-fn.rs b/src/test/run-pass/sendfn-generic-fn.rs index 7cc83e2ff54..d077db69c2a 100644 --- a/src/test/run-pass/sendfn-generic-fn.rs +++ b/src/test/run-pass/sendfn-generic-fn.rs @@ -26,12 +26,12 @@ fn make_generic_record<A,B>(a: A, b: B) -> Pair<A,B> { fn test05_start(f: &~fn(v: f64, v: ~str) -> Pair<f64, ~str>) { let p = (*f)(22.22, ~"Hi"); - info2!("{:?}", p.clone()); + info!("{:?}", p.clone()); assert!(p.a == 22.22); assert!(p.b == ~"Hi"); let q = (*f)(44.44, ~"Ho"); - info2!("{:?}", q.clone()); + info!("{:?}", q.clone()); assert!(q.a == 44.44); assert!(q.b == ~"Ho"); } diff --git a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs b/src/test/run-pass/sendfn-spawn-with-fn-arg.rs index 6cc8b27834c..ecf1830864c 100644 --- a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs +++ b/src/test/run-pass/sendfn-spawn-with-fn-arg.rs @@ -20,7 +20,7 @@ fn test05_start(f: ~fn(int)) { fn test05() { let three = ~3; let fn_to_send: ~fn(int) = |n| { - error2!("{}", *three + n); // will copy x into the closure + error!("{}", *three + n); // will copy x into the closure assert_eq!(*three, 3); }; let fn_to_send = Cell::new(fn_to_send); diff --git a/src/test/run-pass/shadow.rs b/src/test/run-pass/shadow.rs index 345c2aad0d3..050c505b7c1 100644 --- a/src/test/run-pass/shadow.rs +++ b/src/test/run-pass/shadow.rs @@ -17,7 +17,7 @@ fn foo(c: ~[int]) { match none::<int> { some::<int>(_) => { for _i in c.iter() { - info2!("{:?}", a); + info!("{:?}", a); let a = 17; b.push(a); } diff --git a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs index a989ac68d71..4420804aad1 100644 --- a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs +++ b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs @@ -57,6 +57,6 @@ pub fn main() { let p_: Path_ = Path_ { global: true, idents: ~[~"hi"], types: ~[t] }; let p: path = Spanned { data: p_, span: sp }; let x = X { sp: sp, path: p }; - error2!("{:?}", x.path.clone()); - error2!("{:?}", x.clone()); + error!("{:?}", x.path.clone()); + error!("{:?}", x.clone()); } diff --git a/src/test/run-pass/simple-infer.rs b/src/test/run-pass/simple-infer.rs index 0924655a767..e3d3b3389ba 100644 --- a/src/test/run-pass/simple-infer.rs +++ b/src/test/run-pass/simple-infer.rs @@ -10,4 +10,4 @@ -pub fn main() { let mut n; n = 1; info2!("{}", n); } +pub fn main() { let mut n; n = 1; info!("{}", n); } diff --git a/src/test/run-pass/simple-match-generic-tag.rs b/src/test/run-pass/simple-match-generic-tag.rs index 1c080bb8146..d8b7c99d000 100644 --- a/src/test/run-pass/simple-match-generic-tag.rs +++ b/src/test/run-pass/simple-match-generic-tag.rs @@ -14,5 +14,5 @@ enum opt<T> { none, } pub fn main() { let x = none::<int>; - match x { none::<int> => { info2!("hello world"); } } + match x { none::<int> => { info!("hello world"); } } } diff --git a/src/test/run-pass/size-and-align.rs b/src/test/run-pass/size-and-align.rs index d34da045c02..4d2309cb869 100644 --- a/src/test/run-pass/size-and-align.rs +++ b/src/test/run-pass/size-and-align.rs @@ -17,11 +17,11 @@ enum clam<T> { a(T, int), b, } fn uhoh<T>(v: ~[clam<T>]) { match v[1] { a::<T>(ref _t, ref u) => { - info2!("incorrect"); - info2!("{:?}", u); - fail2!(); + info!("incorrect"); + info!("{:?}", u); + fail!(); } - b::<T> => { info2!("correct"); } + b::<T> => { info!("correct"); } } } diff --git a/src/test/run-pass/spawn-fn.rs b/src/test/run-pass/spawn-fn.rs index f95ddcad4d6..b8f356f80d4 100644 --- a/src/test/run-pass/spawn-fn.rs +++ b/src/test/run-pass/spawn-fn.rs @@ -12,8 +12,8 @@ use std::task; fn x(s: ~str, n: int) { - info2!("{:?}", s); - info2!("{:?}", n); + info!("{:?}", s); + info!("{:?}", n); } pub fn main() { @@ -21,5 +21,5 @@ pub fn main() { task::spawn(|| x(~"hello from second spawned fn", 66) ); task::spawn(|| x(~"hello from third spawned fn", 67) ); let mut i: int = 30; - while i > 0 { i = i - 1; info2!("parent sleeping"); task::deschedule(); } + while i > 0 { i = i - 1; info!("parent sleeping"); task::deschedule(); } } diff --git a/src/test/run-pass/spawn.rs b/src/test/run-pass/spawn.rs index 9273752d629..5c24c622812 100644 --- a/src/test/run-pass/spawn.rs +++ b/src/test/run-pass/spawn.rs @@ -17,4 +17,4 @@ pub fn main() { task::spawn(|| child(10) ); } -fn child(i: int) { error2!("{}", i); assert!((i == 10)); } +fn child(i: int) { error!("{}", i); assert!((i == 10)); } diff --git a/src/test/run-pass/spawn2.rs b/src/test/run-pass/spawn2.rs index 31967b31c63..a94877714c5 100644 --- a/src/test/run-pass/spawn2.rs +++ b/src/test/run-pass/spawn2.rs @@ -15,15 +15,15 @@ pub fn main() { task::spawn(|| child((10, 20, 30, 40, 50, 60, 70, 80, 90)) ); } fn child(args: (int, int, int, int, int, int, int, int, int)) { let (i1, i2, i3, i4, i5, i6, i7, i8, i9) = args; - error2!("{}", i1); - error2!("{}", i2); - error2!("{}", i3); - error2!("{}", i4); - error2!("{}", i5); - error2!("{}", i6); - error2!("{}", i7); - error2!("{}", i8); - error2!("{}", i9); + error!("{}", i1); + error!("{}", i2); + error!("{}", i3); + error!("{}", i4); + error!("{}", i5); + error!("{}", i6); + error!("{}", i7); + error!("{}", i8); + error!("{}", i9); assert_eq!(i1, 10); assert_eq!(i2, 20); assert_eq!(i3, 30); diff --git a/src/test/run-pass/stat.rs b/src/test/run-pass/stat.rs index aa0661d49a2..7501c46079d 100644 --- a/src/test/run-pass/stat.rs +++ b/src/test/run-pass/stat.rs @@ -23,7 +23,7 @@ pub fn main() { { match io::file_writer(&path, [io::Create, io::Truncate]) { - Err(ref e) => fail2!("{}", e.clone()), + Err(ref e) => fail!("{}", e.clone()), Ok(f) => { for _ in range(0u, 1000) { f.write_u8(0); diff --git a/src/test/run-pass/str-append.rs b/src/test/run-pass/str-append.rs index fe57c5dd4e5..127838fd9ec 100644 --- a/src/test/run-pass/str-append.rs +++ b/src/test/run-pass/str-append.rs @@ -16,7 +16,7 @@ extern mod extra; fn test1() { let mut s: ~str = ~"hello"; s.push_str("world"); - info2!("{}", s.clone()); + info!("{}", s.clone()); assert_eq!(s[9], 'd' as u8); } @@ -26,8 +26,8 @@ fn test2() { let ff: ~str = ~"abc"; let a: ~str = ff + "ABC" + ff; let b: ~str = ~"ABC" + ff + "ABC"; - info2!("{}", a.clone()); - info2!("{}", b.clone()); + info!("{}", a.clone()); + info!("{}", b.clone()); assert_eq!(a, ~"abcABCabc"); assert_eq!(b, ~"ABCabcABC"); } diff --git a/src/test/run-pass/str-concat.rs b/src/test/run-pass/str-concat.rs index dc605c50bb0..870fc20f771 100644 --- a/src/test/run-pass/str-concat.rs +++ b/src/test/run-pass/str-concat.rs @@ -16,6 +16,6 @@ pub fn main() { let a: ~str = ~"hello"; let b: ~str = ~"world"; let s: ~str = a + b; - info2!("{}", s.clone()); + info!("{}", s.clone()); assert_eq!(s[9], 'd' as u8); } diff --git a/src/test/run-pass/str-idx.rs b/src/test/run-pass/str-idx.rs index ca80f71cca7..ebed8e24a48 100644 --- a/src/test/run-pass/str-idx.rs +++ b/src/test/run-pass/str-idx.rs @@ -13,6 +13,6 @@ pub fn main() { let s = ~"hello"; let c: u8 = s[4]; - info2!("{:?}", c); + info!("{:?}", c); assert_eq!(c, 0x6f as u8); } diff --git a/src/test/run-pass/string-self-append.rs b/src/test/run-pass/string-self-append.rs index f230bb38701..68f1e21571c 100644 --- a/src/test/run-pass/string-self-append.rs +++ b/src/test/run-pass/string-self-append.rs @@ -16,7 +16,7 @@ pub fn main() { let mut i = 20; let mut expected_len = 1u; while i > 0 { - error2!("{}", a.len()); + error!("{}", a.len()); assert_eq!(a.len(), expected_len); a = a + a; // FIXME(#3387)---can't write a += a i -= 1; diff --git a/src/test/run-pass/struct-literal-dtor.rs b/src/test/run-pass/struct-literal-dtor.rs index a4238799d09..c5f8d0410d8 100644 --- a/src/test/run-pass/struct-literal-dtor.rs +++ b/src/test/run-pass/struct-literal-dtor.rs @@ -14,7 +14,7 @@ struct foo { impl Drop for foo { fn drop(&mut self) { - error2!("{}", self.x); + error!("{}", self.x); } } diff --git a/src/test/run-pass/struct-return.rs b/src/test/run-pass/struct-return.rs index 7b5988b9b3d..8b22b4c9ac1 100644 --- a/src/test/run-pass/struct-return.rs +++ b/src/test/run-pass/struct-return.rs @@ -31,10 +31,10 @@ fn test1() { c: 0xcccc_cccc_cccc_cccc_u64, d: 0xdddd_dddd_dddd_dddd_u64 }; let qq = rustrt::rust_dbg_abi_1(q); - error2!("a: {:x}", qq.a as uint); - error2!("b: {:x}", qq.b as uint); - error2!("c: {:x}", qq.c as uint); - error2!("d: {:x}", qq.d as uint); + error!("a: {:x}", qq.a as uint); + error!("b: {:x}", qq.b as uint); + error!("c: {:x}", qq.c as uint); + error!("d: {:x}", qq.d as uint); assert_eq!(qq.a, q.c + 1u64); assert_eq!(qq.b, q.d - 1u64); assert_eq!(qq.c, q.a + 1u64); @@ -51,9 +51,9 @@ fn test2() { b: 0b_1010_1010_u8, c: 1.0987654321e-15_f64 }; let ff = rustrt::rust_dbg_abi_2(f); - error2!("a: {}", ff.a as f64); - error2!("b: {}", ff.b as uint); - error2!("c: {}", ff.c as f64); + error!("a: {}", ff.a as f64); + error!("b: {}", ff.b as uint); + error!("c: {}", ff.c as f64); assert_eq!(ff.a, f.c + 1.0f64); assert_eq!(ff.b, 0xff_u8); assert_eq!(ff.c, f.a - 1.0f64); diff --git a/src/test/run-pass/supported-cast.rs b/src/test/run-pass/supported-cast.rs index 090e932d8dc..60e5a157bfc 100644 --- a/src/test/run-pass/supported-cast.rs +++ b/src/test/run-pass/supported-cast.rs @@ -12,221 +12,221 @@ use std::libc; pub fn main() { let f = 1 as *libc::FILE; - info2!("{}", f as int); - info2!("{}", f as uint); - info2!("{}", f as i8); - info2!("{}", f as i16); - info2!("{}", f as i32); - info2!("{}", f as i64); - info2!("{}", f as u8); - info2!("{}", f as u16); - info2!("{}", f as u32); - info2!("{}", f as u64); - - info2!("{}", 1 as int); - info2!("{}", 1 as uint); - info2!("{}", 1 as *libc::FILE); - info2!("{}", 1 as i8); - info2!("{}", 1 as i16); - info2!("{}", 1 as i32); - info2!("{}", 1 as i64); - info2!("{}", 1 as u8); - info2!("{}", 1 as u16); - info2!("{}", 1 as u32); - info2!("{}", 1 as u64); - info2!("{}", 1 as f32); - info2!("{}", 1 as f64); - - info2!("{}", 1u as int); - info2!("{}", 1u as uint); - info2!("{}", 1u as *libc::FILE); - info2!("{}", 1u as i8); - info2!("{}", 1u as i16); - info2!("{}", 1u as i32); - info2!("{}", 1u as i64); - info2!("{}", 1u as u8); - info2!("{}", 1u as u16); - info2!("{}", 1u as u32); - info2!("{}", 1u as u64); - info2!("{}", 1u as f32); - info2!("{}", 1u as f64); - - info2!("{}", 1i8 as int); - info2!("{}", 1i8 as uint); - info2!("{}", 1i8 as *libc::FILE); - info2!("{}", 1i8 as i8); - info2!("{}", 1i8 as i16); - info2!("{}", 1i8 as i32); - info2!("{}", 1i8 as i64); - info2!("{}", 1i8 as u8); - info2!("{}", 1i8 as u16); - info2!("{}", 1i8 as u32); - info2!("{}", 1i8 as u64); - info2!("{}", 1i8 as f32); - info2!("{}", 1i8 as f64); - - info2!("{}", 1u8 as int); - info2!("{}", 1u8 as uint); - info2!("{}", 1u8 as *libc::FILE); - info2!("{}", 1u8 as i8); - info2!("{}", 1u8 as i16); - info2!("{}", 1u8 as i32); - info2!("{}", 1u8 as i64); - info2!("{}", 1u8 as u8); - info2!("{}", 1u8 as u16); - info2!("{}", 1u8 as u32); - info2!("{}", 1u8 as u64); - info2!("{}", 1u8 as f32); - info2!("{}", 1u8 as f64); - - info2!("{}", 1i16 as int); - info2!("{}", 1i16 as uint); - info2!("{}", 1i16 as *libc::FILE); - info2!("{}", 1i16 as i8); - info2!("{}", 1i16 as i16); - info2!("{}", 1i16 as i32); - info2!("{}", 1i16 as i64); - info2!("{}", 1i16 as u8); - info2!("{}", 1i16 as u16); - info2!("{}", 1i16 as u32); - info2!("{}", 1i16 as u64); - info2!("{}", 1i16 as f32); - info2!("{}", 1i16 as f64); - - info2!("{}", 1u16 as int); - info2!("{}", 1u16 as uint); - info2!("{}", 1u16 as *libc::FILE); - info2!("{}", 1u16 as i8); - info2!("{}", 1u16 as i16); - info2!("{}", 1u16 as i32); - info2!("{}", 1u16 as i64); - info2!("{}", 1u16 as u8); - info2!("{}", 1u16 as u16); - info2!("{}", 1u16 as u32); - info2!("{}", 1u16 as u64); - info2!("{}", 1u16 as f32); - info2!("{}", 1u16 as f64); - - info2!("{}", 1i32 as int); - info2!("{}", 1i32 as uint); - info2!("{}", 1i32 as *libc::FILE); - info2!("{}", 1i32 as i8); - info2!("{}", 1i32 as i16); - info2!("{}", 1i32 as i32); - info2!("{}", 1i32 as i64); - info2!("{}", 1i32 as u8); - info2!("{}", 1i32 as u16); - info2!("{}", 1i32 as u32); - info2!("{}", 1i32 as u64); - info2!("{}", 1i32 as f32); - info2!("{}", 1i32 as f64); - - info2!("{}", 1u32 as int); - info2!("{}", 1u32 as uint); - info2!("{}", 1u32 as *libc::FILE); - info2!("{}", 1u32 as i8); - info2!("{}", 1u32 as i16); - info2!("{}", 1u32 as i32); - info2!("{}", 1u32 as i64); - info2!("{}", 1u32 as u8); - info2!("{}", 1u32 as u16); - info2!("{}", 1u32 as u32); - info2!("{}", 1u32 as u64); - info2!("{}", 1u32 as f32); - info2!("{}", 1u32 as f64); - - info2!("{}", 1i64 as int); - info2!("{}", 1i64 as uint); - info2!("{}", 1i64 as *libc::FILE); - info2!("{}", 1i64 as i8); - info2!("{}", 1i64 as i16); - info2!("{}", 1i64 as i32); - info2!("{}", 1i64 as i64); - info2!("{}", 1i64 as u8); - info2!("{}", 1i64 as u16); - info2!("{}", 1i64 as u32); - info2!("{}", 1i64 as u64); - info2!("{}", 1i64 as f32); - info2!("{}", 1i64 as f64); - - info2!("{}", 1u64 as int); - info2!("{}", 1u64 as uint); - info2!("{}", 1u64 as *libc::FILE); - info2!("{}", 1u64 as i8); - info2!("{}", 1u64 as i16); - info2!("{}", 1u64 as i32); - info2!("{}", 1u64 as i64); - info2!("{}", 1u64 as u8); - info2!("{}", 1u64 as u16); - info2!("{}", 1u64 as u32); - info2!("{}", 1u64 as u64); - info2!("{}", 1u64 as f32); - info2!("{}", 1u64 as f64); - - info2!("{}", 1u64 as int); - info2!("{}", 1u64 as uint); - info2!("{}", 1u64 as *libc::FILE); - info2!("{}", 1u64 as i8); - info2!("{}", 1u64 as i16); - info2!("{}", 1u64 as i32); - info2!("{}", 1u64 as i64); - info2!("{}", 1u64 as u8); - info2!("{}", 1u64 as u16); - info2!("{}", 1u64 as u32); - info2!("{}", 1u64 as u64); - info2!("{}", 1u64 as f32); - info2!("{}", 1u64 as f64); - - info2!("{}", true as int); - info2!("{}", true as uint); - info2!("{}", true as *libc::FILE); - info2!("{}", true as i8); - info2!("{}", true as i16); - info2!("{}", true as i32); - info2!("{}", true as i64); - info2!("{}", true as u8); - info2!("{}", true as u16); - info2!("{}", true as u32); - info2!("{}", true as u64); - info2!("{}", true as f32); - info2!("{}", true as f64); - - info2!("{}", 1. as int); - info2!("{}", 1. as uint); - info2!("{}", 1. as i8); - info2!("{}", 1. as i16); - info2!("{}", 1. as i32); - info2!("{}", 1. as i64); - info2!("{}", 1. as u8); - info2!("{}", 1. as u16); - info2!("{}", 1. as u32); - info2!("{}", 1. as u64); - info2!("{}", 1. as f32); - info2!("{}", 1. as f64); - - info2!("{}", 1f32 as int); - info2!("{}", 1f32 as uint); - info2!("{}", 1f32 as i8); - info2!("{}", 1f32 as i16); - info2!("{}", 1f32 as i32); - info2!("{}", 1f32 as i64); - info2!("{}", 1f32 as u8); - info2!("{}", 1f32 as u16); - info2!("{}", 1f32 as u32); - info2!("{}", 1f32 as u64); - info2!("{}", 1f32 as f32); - info2!("{}", 1f32 as f64); - - info2!("{}", 1f64 as int); - info2!("{}", 1f64 as uint); - info2!("{}", 1f64 as i8); - info2!("{}", 1f64 as i16); - info2!("{}", 1f64 as i32); - info2!("{}", 1f64 as i64); - info2!("{}", 1f64 as u8); - info2!("{}", 1f64 as u16); - info2!("{}", 1f64 as u32); - info2!("{}", 1f64 as u64); - info2!("{}", 1f64 as f32); - info2!("{}", 1f64 as f64); + info!("{}", f as int); + info!("{}", f as uint); + info!("{}", f as i8); + info!("{}", f as i16); + info!("{}", f as i32); + info!("{}", f as i64); + info!("{}", f as u8); + info!("{}", f as u16); + info!("{}", f as u32); + info!("{}", f as u64); + + info!("{}", 1 as int); + info!("{}", 1 as uint); + info!("{}", 1 as *libc::FILE); + info!("{}", 1 as i8); + info!("{}", 1 as i16); + info!("{}", 1 as i32); + info!("{}", 1 as i64); + info!("{}", 1 as u8); + info!("{}", 1 as u16); + info!("{}", 1 as u32); + info!("{}", 1 as u64); + info!("{}", 1 as f32); + info!("{}", 1 as f64); + + info!("{}", 1u as int); + info!("{}", 1u as uint); + info!("{}", 1u as *libc::FILE); + info!("{}", 1u as i8); + info!("{}", 1u as i16); + info!("{}", 1u as i32); + info!("{}", 1u as i64); + info!("{}", 1u as u8); + info!("{}", 1u as u16); + info!("{}", 1u as u32); + info!("{}", 1u as u64); + info!("{}", 1u as f32); + info!("{}", 1u as f64); + + info!("{}", 1i8 as int); + info!("{}", 1i8 as uint); + info!("{}", 1i8 as *libc::FILE); + info!("{}", 1i8 as i8); + info!("{}", 1i8 as i16); + info!("{}", 1i8 as i32); + info!("{}", 1i8 as i64); + info!("{}", 1i8 as u8); + info!("{}", 1i8 as u16); + info!("{}", 1i8 as u32); + info!("{}", 1i8 as u64); + info!("{}", 1i8 as f32); + info!("{}", 1i8 as f64); + + info!("{}", 1u8 as int); + info!("{}", 1u8 as uint); + info!("{}", 1u8 as *libc::FILE); + info!("{}", 1u8 as i8); + info!("{}", 1u8 as i16); + info!("{}", 1u8 as i32); + info!("{}", 1u8 as i64); + info!("{}", 1u8 as u8); + info!("{}", 1u8 as u16); + info!("{}", 1u8 as u32); + info!("{}", 1u8 as u64); + info!("{}", 1u8 as f32); + info!("{}", 1u8 as f64); + + info!("{}", 1i16 as int); + info!("{}", 1i16 as uint); + info!("{}", 1i16 as *libc::FILE); + info!("{}", 1i16 as i8); + info!("{}", 1i16 as i16); + info!("{}", 1i16 as i32); + info!("{}", 1i16 as i64); + info!("{}", 1i16 as u8); + info!("{}", 1i16 as u16); + info!("{}", 1i16 as u32); + info!("{}", 1i16 as u64); + info!("{}", 1i16 as f32); + info!("{}", 1i16 as f64); + + info!("{}", 1u16 as int); + info!("{}", 1u16 as uint); + info!("{}", 1u16 as *libc::FILE); + info!("{}", 1u16 as i8); + info!("{}", 1u16 as i16); + info!("{}", 1u16 as i32); + info!("{}", 1u16 as i64); + info!("{}", 1u16 as u8); + info!("{}", 1u16 as u16); + info!("{}", 1u16 as u32); + info!("{}", 1u16 as u64); + info!("{}", 1u16 as f32); + info!("{}", 1u16 as f64); + + info!("{}", 1i32 as int); + info!("{}", 1i32 as uint); + info!("{}", 1i32 as *libc::FILE); + info!("{}", 1i32 as i8); + info!("{}", 1i32 as i16); + info!("{}", 1i32 as i32); + info!("{}", 1i32 as i64); + info!("{}", 1i32 as u8); + info!("{}", 1i32 as u16); + info!("{}", 1i32 as u32); + info!("{}", 1i32 as u64); + info!("{}", 1i32 as f32); + info!("{}", 1i32 as f64); + + info!("{}", 1u32 as int); + info!("{}", 1u32 as uint); + info!("{}", 1u32 as *libc::FILE); + info!("{}", 1u32 as i8); + info!("{}", 1u32 as i16); + info!("{}", 1u32 as i32); + info!("{}", 1u32 as i64); + info!("{}", 1u32 as u8); + info!("{}", 1u32 as u16); + info!("{}", 1u32 as u32); + info!("{}", 1u32 as u64); + info!("{}", 1u32 as f32); + info!("{}", 1u32 as f64); + + info!("{}", 1i64 as int); + info!("{}", 1i64 as uint); + info!("{}", 1i64 as *libc::FILE); + info!("{}", 1i64 as i8); + info!("{}", 1i64 as i16); + info!("{}", 1i64 as i32); + info!("{}", 1i64 as i64); + info!("{}", 1i64 as u8); + info!("{}", 1i64 as u16); + info!("{}", 1i64 as u32); + info!("{}", 1i64 as u64); + info!("{}", 1i64 as f32); + info!("{}", 1i64 as f64); + + info!("{}", 1u64 as int); + info!("{}", 1u64 as uint); + info!("{}", 1u64 as *libc::FILE); + info!("{}", 1u64 as i8); + info!("{}", 1u64 as i16); + info!("{}", 1u64 as i32); + info!("{}", 1u64 as i64); + info!("{}", 1u64 as u8); + info!("{}", 1u64 as u16); + info!("{}", 1u64 as u32); + info!("{}", 1u64 as u64); + info!("{}", 1u64 as f32); + info!("{}", 1u64 as f64); + + info!("{}", 1u64 as int); + info!("{}", 1u64 as uint); + info!("{}", 1u64 as *libc::FILE); + info!("{}", 1u64 as i8); + info!("{}", 1u64 as i16); + info!("{}", 1u64 as i32); + info!("{}", 1u64 as i64); + info!("{}", 1u64 as u8); + info!("{}", 1u64 as u16); + info!("{}", 1u64 as u32); + info!("{}", 1u64 as u64); + info!("{}", 1u64 as f32); + info!("{}", 1u64 as f64); + + info!("{}", true as int); + info!("{}", true as uint); + info!("{}", true as *libc::FILE); + info!("{}", true as i8); + info!("{}", true as i16); + info!("{}", true as i32); + info!("{}", true as i64); + info!("{}", true as u8); + info!("{}", true as u16); + info!("{}", true as u32); + info!("{}", true as u64); + info!("{}", true as f32); + info!("{}", true as f64); + + info!("{}", 1. as int); + info!("{}", 1. as uint); + info!("{}", 1. as i8); + info!("{}", 1. as i16); + info!("{}", 1. as i32); + info!("{}", 1. as i64); + info!("{}", 1. as u8); + info!("{}", 1. as u16); + info!("{}", 1. as u32); + info!("{}", 1. as u64); + info!("{}", 1. as f32); + info!("{}", 1. as f64); + + info!("{}", 1f32 as int); + info!("{}", 1f32 as uint); + info!("{}", 1f32 as i8); + info!("{}", 1f32 as i16); + info!("{}", 1f32 as i32); + info!("{}", 1f32 as i64); + info!("{}", 1f32 as u8); + info!("{}", 1f32 as u16); + info!("{}", 1f32 as u32); + info!("{}", 1f32 as u64); + info!("{}", 1f32 as f32); + info!("{}", 1f32 as f64); + + info!("{}", 1f64 as int); + info!("{}", 1f64 as uint); + info!("{}", 1f64 as i8); + info!("{}", 1f64 as i16); + info!("{}", 1f64 as i32); + info!("{}", 1f64 as i64); + info!("{}", 1f64 as u8); + info!("{}", 1f64 as u16); + info!("{}", 1f64 as u32); + info!("{}", 1f64 as u64); + info!("{}", 1f64 as f32); + info!("{}", 1f64 as f64); } diff --git a/src/test/run-pass/syntax-extension-cfg.rs b/src/test/run-pass/syntax-extension-cfg.rs index 89ca7de00e2..321929207f7 100644 --- a/src/test/run-pass/syntax-extension-cfg.rs +++ b/src/test/run-pass/syntax-extension-cfg.rs @@ -13,23 +13,23 @@ fn main() { // check - if ! cfg!(foo) { fail2!() } - if cfg!(not(foo)) { fail2!() } + if ! cfg!(foo) { fail!() } + if cfg!(not(foo)) { fail!() } - if ! cfg!(bar(baz)) { fail2!() } - if cfg!(not(bar(baz))) { fail2!() } + if ! cfg!(bar(baz)) { fail!() } + if cfg!(not(bar(baz))) { fail!() } - if ! cfg!(qux="foo") { fail2!() } - if cfg!(not(qux="foo")) { fail2!() } + if ! cfg!(qux="foo") { fail!() } + if cfg!(not(qux="foo")) { fail!() } - if ! cfg!(foo, bar(baz), qux="foo") { fail2!() } - if cfg!(not(foo, bar(baz), qux="foo")) { fail2!() } + if ! cfg!(foo, bar(baz), qux="foo") { fail!() } + if cfg!(not(foo, bar(baz), qux="foo")) { fail!() } - if cfg!(not_a_cfg) { fail2!() } - if cfg!(not_a_cfg, foo, bar(baz), qux="foo") { fail2!() } + if cfg!(not_a_cfg) { fail!() } + if cfg!(not_a_cfg, foo, bar(baz), qux="foo") { fail!() } - if ! cfg!(not(not_a_cfg)) { fail2!() } - if ! cfg!(not(not_a_cfg), foo, bar(baz), qux="foo") { fail2!() } + if ! cfg!(not(not_a_cfg)) { fail!() } + if ! cfg!(not(not_a_cfg), foo, bar(baz), qux="foo") { fail!() } - if cfg!(trailing_comma, ) { fail2!() } + if cfg!(trailing_comma, ) { fail!() } } diff --git a/src/test/run-pass/tag-align-shape.rs b/src/test/run-pass/tag-align-shape.rs index 6f5ca090052..42d730ff6bf 100644 --- a/src/test/run-pass/tag-align-shape.rs +++ b/src/test/run-pass/tag-align-shape.rs @@ -22,6 +22,6 @@ struct t_rec { pub fn main() { let x = t_rec {c8: 22u8, t: a_tag(44u64)}; let y = format!("{:?}", x); - info2!("y = {}", y); + info!("y = {}", y); assert_eq!(y, ~"t_rec{c8: 22u8, t: a_tag(44u64)}"); } diff --git a/src/test/run-pass/tail-cps.rs b/src/test/run-pass/tail-cps.rs index 9991f05aa3a..22e2304c0ce 100644 --- a/src/test/run-pass/tail-cps.rs +++ b/src/test/run-pass/tail-cps.rs @@ -17,13 +17,13 @@ fn checktrue(rs: bool) -> bool { assert!((rs)); return true; } pub fn main() { let k = checktrue; evenk(42, k); oddk(45, k); } fn evenk(n: int, k: extern fn(bool) -> bool) -> bool { - info2!("evenk"); - info2!("{:?}", n); + info!("evenk"); + info!("{:?}", n); if n == 0 { return k(true); } else { return oddk(n - 1, k); } } fn oddk(n: int, k: extern fn(bool) -> bool) -> bool { - info2!("oddk"); - info2!("{:?}", n); + info!("oddk"); + info!("{:?}", n); if n == 0 { return k(false); } else { return evenk(n - 1, k); } } diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/run-pass/task-comm-0.rs index 69d66092abf..804b03559fa 100644 --- a/src/test/run-pass/task-comm-0.rs +++ b/src/test/run-pass/task-comm-0.rs @@ -20,21 +20,21 @@ pub fn main() { test05(); } fn test05_start(ch : &Chan<int>) { ch.send(10); - error2!("sent 10"); + error!("sent 10"); ch.send(20); - error2!("sent 20"); + error!("sent 20"); ch.send(30); - error2!("sent 30"); + error!("sent 30"); } fn test05() { let (po, ch) = comm::stream(); task::spawn(|| test05_start(&ch) ); let mut value: int = po.recv(); - error2!("{}", value); + error!("{}", value); value = po.recv(); - error2!("{}", value); + error!("{}", value); value = po.recv(); - error2!("{}", value); + error!("{}", value); assert_eq!(value, 30); } diff --git a/src/test/run-pass/task-comm-1.rs b/src/test/run-pass/task-comm-1.rs index f169566653a..d202bac7089 100644 --- a/src/test/run-pass/task-comm-1.rs +++ b/src/test/run-pass/task-comm-1.rs @@ -12,9 +12,9 @@ use std::task; pub fn main() { test00(); } -fn start() { info2!("Started / Finished task."); } +fn start() { info!("Started / Finished task."); } fn test00() { task::try(|| start() ); - info2!("Completing."); + info!("Completing."); } diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs index 023bb142e44..9195208fb96 100644 --- a/src/test/run-pass/task-comm-10.rs +++ b/src/test/run-pass/task-comm-10.rs @@ -23,10 +23,10 @@ fn start(c: &comm::Chan<comm::Chan<~str>>) { let mut b; a = p.recv(); assert!(a == ~"A"); - error2!("{:?}", a); + error!("{:?}", a); b = p.recv(); assert!(b == ~"B"); - error2!("{:?}", b); + error!("{:?}", b); } pub fn main() { diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/run-pass/task-comm-12.rs index 9d5f8937590..0d221a6cb1d 100644 --- a/src/test/run-pass/task-comm-12.rs +++ b/src/test/run-pass/task-comm-12.rs @@ -14,7 +14,7 @@ use std::task; pub fn main() { test00(); } -fn start(_task_number: int) { info2!("Started / Finished task."); } +fn start(_task_number: int) { info!("Started / Finished task."); } fn test00() { let i: int = 0; @@ -34,5 +34,5 @@ fn test00() { // Try joining tasks that have already finished. result.recv(); - info2!("Joined task."); + info!("Joined task."); } diff --git a/src/test/run-pass/task-comm-13.rs b/src/test/run-pass/task-comm-13.rs index 2bbed1497cc..b039f01bf0c 100644 --- a/src/test/run-pass/task-comm-13.rs +++ b/src/test/run-pass/task-comm-13.rs @@ -21,8 +21,8 @@ fn start(c: &comm::Chan<int>, start: int, number_of_messages: int) { } pub fn main() { - info2!("Check that we don't deadlock."); + info!("Check that we don't deadlock."); let (_p, ch) = comm::stream(); task::try(|| start(&ch, 0, 10) ); - info2!("Joined task"); + info!("Joined task"); } diff --git a/src/test/run-pass/task-comm-14.rs b/src/test/run-pass/task-comm-14.rs index cacaea5e8c0..da9b3703a99 100644 --- a/src/test/run-pass/task-comm-14.rs +++ b/src/test/run-pass/task-comm-14.rs @@ -20,7 +20,7 @@ pub fn main() { // Spawn 10 tasks each sending us back one int. let mut i = 10; while (i > 0) { - info2!("{}", i); + info!("{}", i); let ch = ch.clone(); task::spawn({let i = i; || child(i, &ch)}); i = i - 1; @@ -31,15 +31,15 @@ pub fn main() { i = 10; while (i > 0) { - info2!("{}", i); + info!("{}", i); po.recv(); i = i - 1; } - info2!("main thread exiting"); + info!("main thread exiting"); } fn child(x: int, ch: &comm::SharedChan<int>) { - info2!("{}", x); + info!("{}", x); ch.send(x); } diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index b4a1a38faa2..eb48fa1812d 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -16,24 +16,24 @@ use std::comm::SharedChan; use std::comm; use std::task; -pub fn main() { info2!("===== WITHOUT THREADS ====="); test00(); } +pub fn main() { info!("===== WITHOUT THREADS ====="); test00(); } fn test00_start(ch: &SharedChan<int>, message: int, count: int) { - info2!("Starting test00_start"); + info!("Starting test00_start"); let mut i: int = 0; while i < count { - info2!("Sending Message"); + info!("Sending Message"); ch.send(message + 0); i = i + 1; } - info2!("Ending test00_start"); + info!("Ending test00_start"); } fn test00() { let number_of_tasks: int = 16; let number_of_messages: int = 4; - info2!("Creating tasks"); + info!("Creating tasks"); let (po, ch) = comm::stream(); let ch = comm::SharedChan::new(ch); @@ -67,8 +67,8 @@ fn test00() { // Join spawned tasks... for r in results.iter() { r.recv(); } - info2!("Completed: Final number is: "); - error2!("{:?}", sum); + info!("Completed: Final number is: "); + error!("{:?}", sum); // assert (sum == (((number_of_tasks * (number_of_tasks - 1)) / 2) * // number_of_messages)); assert_eq!(sum, 480); diff --git a/src/test/run-pass/task-comm-4.rs b/src/test/run-pass/task-comm-4.rs index 80d981b0d45..8e1704fe12f 100644 --- a/src/test/run-pass/task-comm-4.rs +++ b/src/test/run-pass/task-comm-4.rs @@ -24,31 +24,31 @@ fn test00() { c.send(4); r = p.recv(); sum += r; - info2!("{}", r); + info!("{}", r); r = p.recv(); sum += r; - info2!("{}", r); + info!("{}", r); r = p.recv(); sum += r; - info2!("{}", r); + info!("{}", r); r = p.recv(); sum += r; - info2!("{}", r); + info!("{}", r); c.send(5); c.send(6); c.send(7); c.send(8); r = p.recv(); sum += r; - info2!("{}", r); + info!("{}", r); r = p.recv(); sum += r; - info2!("{}", r); + info!("{}", r); r = p.recv(); sum += r; - info2!("{}", r); + info!("{}", r); r = p.recv(); sum += r; - info2!("{}", r); + info!("{}", r); assert_eq!(sum, 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8); } diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs index 20d22204bed..049810ff569 100644 --- a/src/test/run-pass/task-comm-9.rs +++ b/src/test/run-pass/task-comm-9.rs @@ -37,7 +37,7 @@ fn test00() { let mut i: int = 0; while i < number_of_messages { sum += p.recv(); - info2!("{:?}", r); + info!("{:?}", r); i += 1; } diff --git a/src/test/run-pass/tempfile.rs b/src/test/run-pass/tempfile.rs index 5d12f4e8817..142186853f5 100644 --- a/src/test/run-pass/tempfile.rs +++ b/src/test/run-pass/tempfile.rs @@ -41,7 +41,7 @@ fn test_rm_tempdir() { let f: ~fn() = || { let tmp = TempDir::new("test_rm_tempdir").unwrap(); wr.send(tmp.path().clone()); - fail2!("fail to unwind past `tmp`"); + fail!("fail to unwind past `tmp`"); }; task::try(f); let path = rd.recv(); @@ -52,7 +52,7 @@ fn test_rm_tempdir() { let cell = Cell::new(tmp); let f: ~fn() = || { let _tmp = cell.take(); - fail2!("fail to unwind past `tmp`"); + fail!("fail to unwind past `tmp`"); }; task::try(f); assert!(!os::path_exists(&path)); @@ -83,7 +83,7 @@ fn test_rm_tempdir() { fn recursive_mkdir_rel() { let path = Path::new("frob"); let cwd = os::getcwd(); - debug2!("recursive_mkdir_rel: Making: {} in cwd {} [{:?}]", path.display(), + debug!("recursive_mkdir_rel: Making: {} in cwd {} [{:?}]", path.display(), cwd.display(), os::path_exists(&path)); assert!(os::mkdir_recursive(&path, (S_IRUSR | S_IWUSR | S_IXUSR) as i32)); assert!(os::path_is_dir(&path)); @@ -101,13 +101,13 @@ fn recursive_mkdir_dot() { fn recursive_mkdir_rel_2() { let path = Path::new("./frob/baz"); let cwd = os::getcwd(); - debug2!("recursive_mkdir_rel_2: Making: {} in cwd {} [{:?}]", path.display(), + debug!("recursive_mkdir_rel_2: Making: {} in cwd {} [{:?}]", path.display(), cwd.display(), os::path_exists(&path)); assert!(os::mkdir_recursive(&path, (S_IRUSR | S_IWUSR | S_IXUSR) as i32)); assert!(os::path_is_dir(&path)); assert!(os::path_is_dir(&path.dir_path())); let path2 = Path::new("quux/blat"); - debug2!("recursive_mkdir_rel_2: Making: {} in cwd {}", path2.display(), + debug!("recursive_mkdir_rel_2: Making: {} in cwd {}", path2.display(), cwd.display()); assert!(os::mkdir_recursive(&path2, (S_IRUSR | S_IWUSR | S_IXUSR) as i32)); assert!(os::path_is_dir(&path2)); @@ -123,7 +123,7 @@ pub fn test_rmdir_recursive_ok() { let tmpdir = tmpdir.path(); let root = tmpdir.join("foo"); - debug2!("making {}", root.display()); + debug!("making {}", root.display()); assert!(os::make_dir(&root, rwx)); assert!(os::make_dir(&root.join("foo"), rwx)); assert!(os::make_dir(&root.join("foo").join("bar"), rwx)); diff --git a/src/test/run-pass/terminate-in-initializer.rs b/src/test/run-pass/terminate-in-initializer.rs index 37cbc2b40de..c1b308c489e 100644 --- a/src/test/run-pass/terminate-in-initializer.rs +++ b/src/test/run-pass/terminate-in-initializer.rs @@ -22,12 +22,12 @@ fn test_cont() { let mut i = 0; while i < 1 { i += 1; let _x: @int = continue; } fn test_ret() { let _x: @int = return; } fn test_fail() { - fn f() { let _x: @int = fail2!(); } + fn f() { let _x: @int = fail!(); } task::try(|| f() ); } fn test_fail_indirect() { - fn f() -> ! { fail2!(); } + fn f() -> ! { fail!(); } fn g() { let _x: @int = f(); } task::try(|| g() ); } diff --git a/src/test/run-pass/test-runner-hides-main.rs b/src/test/run-pass/test-runner-hides-main.rs index a399d22cdad..3f1e9fe4c51 100644 --- a/src/test/run-pass/test-runner-hides-main.rs +++ b/src/test/run-pass/test-runner-hides-main.rs @@ -15,4 +15,4 @@ extern mod extra; // Building as a test runner means that a synthetic main will be run, // not ours -pub fn main() { fail2!(); } +pub fn main() { fail!(); } diff --git a/src/test/run-pass/threads.rs b/src/test/run-pass/threads.rs index 81fcfd7efa0..d5f853fc241 100644 --- a/src/test/run-pass/threads.rs +++ b/src/test/run-pass/threads.rs @@ -16,7 +16,7 @@ use std::task; pub fn main() { let mut i = 10; while i > 0 { task::spawn({let i = i; || child(i)}); i = i - 1; } - info2!("main thread exiting"); + info!("main thread exiting"); } -fn child(x: int) { info2!("{}", x); } +fn child(x: int) { info!("{}", x); } diff --git a/src/test/run-pass/trivial-message.rs b/src/test/run-pass/trivial-message.rs index 62b415422a3..faea070c94d 100644 --- a/src/test/run-pass/trivial-message.rs +++ b/src/test/run-pass/trivial-message.rs @@ -19,5 +19,5 @@ pub fn main() { let (po, ch) = comm::stream(); ch.send(42); let r = po.recv(); - error2!("{:?}", r); + error!("{:?}", r); } diff --git a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs b/src/test/run-pass/typeck-macro-interaction-issue-8852.rs index b4f28114f96..a4512e99ce0 100644 --- a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs +++ b/src/test/run-pass/typeck-macro-interaction-issue-8852.rs @@ -11,7 +11,7 @@ macro_rules! test( match (a, b) { (A(x), A(y)) => A($e), (B(x), B(y)) => B($e), - _ => fail2!() + _ => fail!() } } ) diff --git a/src/test/run-pass/typeclasses-eq-example-static.rs b/src/test/run-pass/typeclasses-eq-example-static.rs index 0d37c0f443d..c14dd0471f9 100644 --- a/src/test/run-pass/typeclasses-eq-example-static.rs +++ b/src/test/run-pass/typeclasses-eq-example-static.rs @@ -61,5 +61,5 @@ pub fn main() { assert!(!Equal::isEq(branch(@leaf(magenta), @leaf(cyan)), branch(@leaf(magenta), @leaf(magenta)))); - error2!("Assertions all succeeded!"); + error!("Assertions all succeeded!"); } diff --git a/src/test/run-pass/typeclasses-eq-example.rs b/src/test/run-pass/typeclasses-eq-example.rs index 11973df2fec..18a68bc1c34 100644 --- a/src/test/run-pass/typeclasses-eq-example.rs +++ b/src/test/run-pass/typeclasses-eq-example.rs @@ -60,5 +60,5 @@ pub fn main() { assert!(!branch(@leaf(magenta), @leaf(cyan)) .isEq(branch(@leaf(magenta), @leaf(magenta)))); - error2!("Assertions all succeeded!"); + error!("Assertions all succeeded!"); } diff --git a/src/test/run-pass/unary-minus-suffix-inference.rs b/src/test/run-pass/unary-minus-suffix-inference.rs index e1ed28bc2cc..4898ef1cd0a 100644 --- a/src/test/run-pass/unary-minus-suffix-inference.rs +++ b/src/test/run-pass/unary-minus-suffix-inference.rs @@ -11,43 +11,43 @@ pub fn main() { let a = 1; let a_neg: i8 = -a; - error2!("{}", a_neg); + error!("{}", a_neg); let b = 1; let b_neg: i16 = -b; - error2!("{}", b_neg); + error!("{}", b_neg); let c = 1; let c_neg: i32 = -c; - error2!("{}", c_neg); + error!("{}", c_neg); let d = 1; let d_neg: i64 = -d; - error2!("{}", d_neg); + error!("{}", d_neg); let e = 1; let e_neg: int = -e; - error2!("{}", e_neg); + error!("{}", e_neg); // intentional overflows let f = 1; let f_neg: u8 = -f; - error2!("{}", f_neg); + error!("{}", f_neg); let g = 1; let g_neg: u16 = -g; - error2!("{}", g_neg); + error!("{}", g_neg); let h = 1; let h_neg: u32 = -h; - error2!("{}", h_neg); + error!("{}", h_neg); let i = 1; let i_neg: u64 = -i; - error2!("{}", i_neg); + error!("{}", i_neg); let j = 1; let j_neg: uint = -j; - error2!("{}", j_neg); + error!("{}", j_neg); } diff --git a/src/test/run-pass/unique-copy-box.rs b/src/test/run-pass/unique-copy-box.rs index 6f4c8596035..d84ebe0ba76 100644 --- a/src/test/run-pass/unique-copy-box.rs +++ b/src/test/run-pass/unique-copy-box.rs @@ -18,6 +18,6 @@ pub fn main() { let rc1 = managed::refcount(*i); let j = i.clone(); let rc2 = managed::refcount(*i); - error2!("rc1: {} rc2: {}", rc1, rc2); + error!("rc1: {} rc2: {}", rc1, rc2); assert_eq!(rc1 + 1u, rc2); } diff --git a/src/test/run-pass/unique-decl.rs b/src/test/run-pass/unique-decl.rs index 14a651943fd..74b73d77369 100644 --- a/src/test/run-pass/unique-decl.rs +++ b/src/test/run-pass/unique-decl.rs @@ -13,5 +13,5 @@ pub fn main() { } fn f(_i: ~int) -> ~int { - fail2!(); + fail!(); } diff --git a/src/test/run-pass/unique-in-tag.rs b/src/test/run-pass/unique-in-tag.rs index d0fa48a6c4d..b1fc4e76ea0 100644 --- a/src/test/run-pass/unique-in-tag.rs +++ b/src/test/run-pass/unique-in-tag.rs @@ -14,7 +14,7 @@ fn test1() { let x = u(~10); assert!(match x { u(a) => { - error2!("{:?}", a); + error!("{:?}", a); *a } _ => { 66 } diff --git a/src/test/run-pass/unique-log.rs b/src/test/run-pass/unique-log.rs index 24342190e3f..96d61b377af 100644 --- a/src/test/run-pass/unique-log.rs +++ b/src/test/run-pass/unique-log.rs @@ -10,5 +10,5 @@ pub fn main() { let i = ~100; - error2!("{:?}", i); + error!("{:?}", i); } diff --git a/src/test/run-pass/unique-pat-3.rs b/src/test/run-pass/unique-pat-3.rs index 7a9790973d0..077bbdfb0ba 100644 --- a/src/test/run-pass/unique-pat-3.rs +++ b/src/test/run-pass/unique-pat-3.rs @@ -14,7 +14,7 @@ enum bar { u(~int), w(int), } pub fn main() { assert!(match u(~10) { u(a) => { - error2!("{:?}", a); + error!("{:?}", a); *a } _ => { 66 } diff --git a/src/test/run-pass/unique-pat.rs b/src/test/run-pass/unique-pat.rs index d33db85eb30..0b9ad6ee194 100644 --- a/src/test/run-pass/unique-pat.rs +++ b/src/test/run-pass/unique-pat.rs @@ -11,7 +11,7 @@ fn simple() { match ~true { ~true => { } - _ => { fail2!(); } + _ => { fail!(); } } } diff --git a/src/test/run-pass/unit-like-struct-drop-run.rs b/src/test/run-pass/unit-like-struct-drop-run.rs index 2d7234cbe31..7b450168cc4 100644 --- a/src/test/run-pass/unit-like-struct-drop-run.rs +++ b/src/test/run-pass/unit-like-struct-drop-run.rs @@ -16,7 +16,7 @@ struct Foo; impl Drop for Foo { fn drop(&mut self) { - fail2!("This failure should happen."); + fail!("This failure should happen."); } } diff --git a/src/test/run-pass/unreachable-code-1.rs b/src/test/run-pass/unreachable-code-1.rs index e094f874c3f..d1896a258c6 100644 --- a/src/test/run-pass/unreachable-code-1.rs +++ b/src/test/run-pass/unreachable-code-1.rs @@ -14,7 +14,7 @@ fn id(x: bool) -> bool { x } fn call_id() { - let c = fail2!(); + let c = fail!(); id(c); //~ WARNING unreachable statement } diff --git a/src/test/run-pass/unreachable-code.rs b/src/test/run-pass/unreachable-code.rs index 55a359efeed..2c65e2283e8 100644 --- a/src/test/run-pass/unreachable-code.rs +++ b/src/test/run-pass/unreachable-code.rs @@ -15,7 +15,7 @@ fn id(x: bool) -> bool { x } fn call_id() { - let c = fail2!(); + let c = fail!(); id(c); } diff --git a/src/test/run-pass/unwind-box.rs b/src/test/run-pass/unwind-box.rs index de65d9bbaba..24e898a90bb 100644 --- a/src/test/run-pass/unwind-box.rs +++ b/src/test/run-pass/unwind-box.rs @@ -14,7 +14,7 @@ use std::task; fn f() { let _a = @0; - fail2!(); + fail!(); } pub fn main() { diff --git a/src/test/run-pass/unwind-resource.rs b/src/test/run-pass/unwind-resource.rs index 6ab40c10aa4..c5276b727a9 100644 --- a/src/test/run-pass/unwind-resource.rs +++ b/src/test/run-pass/unwind-resource.rs @@ -21,14 +21,14 @@ struct complainer { impl Drop for complainer { fn drop(&mut self) { - error2!("About to send!"); + error!("About to send!"); self.c.send(true); - error2!("Sent!"); + error!("Sent!"); } } fn complainer(c: SharedChan<bool>) -> complainer { - error2!("Hello!"); + error!("Hello!"); complainer { c: c } @@ -36,13 +36,13 @@ fn complainer(c: SharedChan<bool>) -> complainer { fn f(c: SharedChan<bool>) { let _c = complainer(c); - fail2!(); + fail!(); } pub fn main() { let (p, c) = stream(); let c = SharedChan::new(c); task::spawn_unlinked(|| f(c.clone()) ); - error2!("hiiiiiiiii"); + error!("hiiiiiiiii"); assert!(p.recv()); } diff --git a/src/test/run-pass/unwind-resource2.rs b/src/test/run-pass/unwind-resource2.rs index 751b9430e3b..5b0cd17eea0 100644 --- a/src/test/run-pass/unwind-resource2.rs +++ b/src/test/run-pass/unwind-resource2.rs @@ -29,7 +29,7 @@ fn complainer(c: @int) -> complainer { fn f() { let _c = complainer(@0); - fail2!(); + fail!(); } pub fn main() { diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/run-pass/unwind-unique.rs index 07610fe7115..0038392115b 100644 --- a/src/test/run-pass/unwind-unique.rs +++ b/src/test/run-pass/unwind-unique.rs @@ -14,7 +14,7 @@ use std::task; fn f() { let _a = ~0; - fail2!(); + fail!(); } pub fn main() { diff --git a/src/test/run-pass/use-uninit-match.rs b/src/test/run-pass/use-uninit-match.rs index 18698a48613..69e28e30d09 100644 --- a/src/test/run-pass/use-uninit-match.rs +++ b/src/test/run-pass/use-uninit-match.rs @@ -21,4 +21,4 @@ fn foo<T>(o: myoption<T>) -> int { enum myoption<T> { none, some(T), } -pub fn main() { info2!("{}", 5); } +pub fn main() { info!("{}", 5); } diff --git a/src/test/run-pass/use-uninit-match2.rs b/src/test/run-pass/use-uninit-match2.rs index 844b0521f3a..a85861d2aa5 100644 --- a/src/test/run-pass/use-uninit-match2.rs +++ b/src/test/run-pass/use-uninit-match2.rs @@ -13,7 +13,7 @@ fn foo<T>(o: myoption<T>) -> int { let mut x: int; match o { - none::<T> => { fail2!(); } + none::<T> => { fail!(); } some::<T>(_t) => { x = 5; } } return x; @@ -21,4 +21,4 @@ fn foo<T>(o: myoption<T>) -> int { enum myoption<T> { none, some(T), } -pub fn main() { info2!("{}", 5); } +pub fn main() { info!("{}", 5); } diff --git a/src/test/run-pass/utf8.rs b/src/test/run-pass/utf8.rs index 5222b0eb984..984b4938faa 100644 --- a/src/test/run-pass/utf8.rs +++ b/src/test/run-pass/utf8.rs @@ -42,10 +42,10 @@ pub fn main() { fn check_str_eq(a: ~str, b: ~str) { let mut i: int = 0; for ab in a.byte_iter() { - info2!("{}", i); - info2!("{}", ab); + info!("{}", i); + info!("{}", ab); let bb: u8 = b[i]; - info2!("{}", bb); + info!("{}", bb); assert_eq!(ab, bb); i += 1; } diff --git a/src/test/run-pass/vec-concat.rs b/src/test/run-pass/vec-concat.rs index 0a8a9b1bab7..3a4a424c3b8 100644 --- a/src/test/run-pass/vec-concat.rs +++ b/src/test/run-pass/vec-concat.rs @@ -13,7 +13,7 @@ pub fn main() { let a: ~[int] = ~[1, 2, 3, 4, 5]; let b: ~[int] = ~[6, 7, 8, 9, 0]; let v: ~[int] = a + b; - info2!("{}", v[9]); + info!("{}", v[9]); assert_eq!(v[0], 1); assert_eq!(v[7], 8); assert_eq!(v[9], 0); diff --git a/src/test/run-pass/vec-late-init.rs b/src/test/run-pass/vec-late-init.rs index e11bd257d42..7ffbade05c1 100644 --- a/src/test/run-pass/vec-late-init.rs +++ b/src/test/run-pass/vec-late-init.rs @@ -13,5 +13,5 @@ pub fn main() { let mut later: ~[int]; if true { later = ~[1]; } else { later = ~[2]; } - info2!("{}", later[0]); + info!("{}", later[0]); } diff --git a/src/test/run-pass/vec-matching-autoslice.rs b/src/test/run-pass/vec-matching-autoslice.rs index 8965ee68842..2ad21aba6cd 100644 --- a/src/test/run-pass/vec-matching-autoslice.rs +++ b/src/test/run-pass/vec-matching-autoslice.rs @@ -1,22 +1,22 @@ pub fn main() { let x = @[1, 2, 3]; match x { - [2, .._] => fail2!(), + [2, .._] => fail!(), [1, ..tail] => { assert_eq!(tail, [2, 3]); } - [_] => fail2!(), - [] => fail2!() + [_] => fail!(), + [] => fail!() } let y = (~[(1, true), (2, false)], 0.5); match y { - ([_, _, _], 0.5) => fail2!(), + ([_, _, _], 0.5) => fail!(), ([(1, a), (b, false), ..tail], _) => { assert_eq!(a, true); assert_eq!(b, 2); assert!(tail.is_empty()); } - ([.._tail], _) => fail2!() + ([.._tail], _) => fail!() } } diff --git a/src/test/run-pass/vec-matching.rs b/src/test/run-pass/vec-matching.rs index dec29c8da53..c09fb8d6bc7 100644 --- a/src/test/run-pass/vec-matching.rs +++ b/src/test/run-pass/vec-matching.rs @@ -1,14 +1,14 @@ fn a() { let x = ~[1]; match x { - [_, _, _, _, _, .._] => fail2!(), - [.._, _, _, _, _] => fail2!(), - [_, .._, _, _] => fail2!(), - [_, _] => fail2!(), + [_, _, _, _, _, .._] => fail!(), + [.._, _, _, _, _] => fail!(), + [_, .._, _, _] => fail!(), + [_, _] => fail!(), [a] => { assert_eq!(a, 1); } - [] => fail2!() + [] => fail!() } } @@ -20,7 +20,7 @@ fn b() { assert_eq!(b, 2); assert_eq!(c, &[3]); } - _ => fail2!() + _ => fail!() } match x { [..a, b, c] => { @@ -28,7 +28,7 @@ fn b() { assert_eq!(b, 2); assert_eq!(c, 3); } - _ => fail2!() + _ => fail!() } match x { [a, ..b, c] => { @@ -36,7 +36,7 @@ fn b() { assert_eq!(b, &[2]); assert_eq!(c, 3); } - _ => fail2!() + _ => fail!() } match x { [a, b, c] => { @@ -44,14 +44,14 @@ fn b() { assert_eq!(b, 2); assert_eq!(c, 3); } - _ => fail2!() + _ => fail!() } } fn c() { let x = [1]; match x { - [2, .. _] => fail2!(), + [2, .. _] => fail!(), [.. _] => () } } diff --git a/src/test/run-pass/vec-self-append.rs b/src/test/run-pass/vec-self-append.rs index 4d5286502b7..ce70643cfc6 100644 --- a/src/test/run-pass/vec-self-append.rs +++ b/src/test/run-pass/vec-self-append.rs @@ -47,7 +47,7 @@ fn test_loop() { let mut i = 20; let mut expected_len = 1u; while i > 0 { - error2!("{}", a.len()); + error!("{}", a.len()); assert_eq!(a.len(), expected_len); a = a + a; // FIXME(#3387)---can't write a += a i -= 1; diff --git a/src/test/run-pass/weird-exprs.rs b/src/test/run-pass/weird-exprs.rs index 9de4e295294..0e24ba326b7 100644 --- a/src/test/run-pass/weird-exprs.rs +++ b/src/test/run-pass/weird-exprs.rs @@ -61,17 +61,17 @@ fn canttouchthis() -> uint { fn p() -> bool { true } let _a = (assert!((true)) == (assert!(p()))); let _c = (assert!((p())) == ()); - let _b: bool = (info2!("{}", 0) == (return 0u)); + let _b: bool = (info!("{}", 0) == (return 0u)); } fn angrydome() { loop { if break { } } let mut i = 0; - loop { i += 1; if i == 1 { match (continue) { 1 => { }, _ => fail2!("wat") } } + loop { i += 1; if i == 1 { match (continue) { 1 => { }, _ => fail!("wat") } } break; } } -fn evil_lincoln() { let _evil = info2!("lincoln"); } +fn evil_lincoln() { let _evil = info!("lincoln"); } pub fn main() { strange(); diff --git a/src/test/run-pass/while-cont.rs b/src/test/run-pass/while-cont.rs index 44c3225bb15..ed7ba12ea0f 100644 --- a/src/test/run-pass/while-cont.rs +++ b/src/test/run-pass/while-cont.rs @@ -13,7 +13,7 @@ pub fn main() { let mut i = 1; while i > 0 { assert!((i > 0)); - info2!("{}", i); + info!("{}", i); i -= 1; continue; } diff --git a/src/test/run-pass/while-loop-constraints-2.rs b/src/test/run-pass/while-loop-constraints-2.rs index a07d122c8e2..a21aa4a9a62 100644 --- a/src/test/run-pass/while-loop-constraints-2.rs +++ b/src/test/run-pass/while-loop-constraints-2.rs @@ -18,7 +18,7 @@ pub fn main() { while z < 50 { z += 1; while false { x = y; y = z; } - info2!("{}", y); + info!("{}", y); } assert!((y == 42 && z == 50)); } diff --git a/src/test/run-pass/while-with-break.rs b/src/test/run-pass/while-with-break.rs index 05eea29b31d..82fb39a7c62 100644 --- a/src/test/run-pass/while-with-break.rs +++ b/src/test/run-pass/while-with-break.rs @@ -5,13 +5,13 @@ pub fn main() { let mut i: int = 90; while i < 100 { - info2!("{}", i); + info!("{}", i); i = i + 1; if i == 95 { let _v: ~[int] = ~[1, 2, 3, 4, 5]; // we check that it is freed by break - info2!("breaking"); + info!("breaking"); break; } } diff --git a/src/test/run-pass/while.rs b/src/test/run-pass/while.rs index 4295c89865f..fe2506ad686 100644 --- a/src/test/run-pass/while.rs +++ b/src/test/run-pass/while.rs @@ -13,10 +13,10 @@ pub fn main() { let mut x: int = 10; let mut y: int = 0; - while y < x { info2!("{}", y); info2!("hello"); y = y + 1; } + while y < x { info!("{}", y); info!("hello"); y = y + 1; } while x > 0 { - info2!("goodbye"); + info!("goodbye"); x = x - 1; - info2!("{}", x); + info!("{}", x); } } diff --git a/src/test/run-pass/writealias.rs b/src/test/run-pass/writealias.rs index 06c2ca7be0b..2db954d27c1 100644 --- a/src/test/run-pass/writealias.rs +++ b/src/test/run-pass/writealias.rs @@ -22,7 +22,7 @@ pub fn main() { Some(ref z) if z.with(|b| *b) => { do z.with |b| { assert!(*b); } }, - _ => fail2!() + _ => fail!() } } } diff --git a/src/test/run-pass/yield.rs b/src/test/run-pass/yield.rs index 6f6f59d80a5..2c331f29223 100644 --- a/src/test/run-pass/yield.rs +++ b/src/test/run-pass/yield.rs @@ -15,14 +15,14 @@ pub fn main() { let mut builder = task::task(); let result = builder.future_result(); builder.spawn(child); - error2!("1"); + error!("1"); task::deschedule(); - error2!("2"); + error!("2"); task::deschedule(); - error2!("3"); + error!("3"); result.recv(); } fn child() { - error2!("4"); task::deschedule(); error2!("5"); task::deschedule(); error2!("6"); + error!("4"); task::deschedule(); error!("5"); task::deschedule(); error!("6"); } diff --git a/src/test/run-pass/yield1.rs b/src/test/run-pass/yield1.rs index 6b189e515ff..21088c9dacc 100644 --- a/src/test/run-pass/yield1.rs +++ b/src/test/run-pass/yield1.rs @@ -15,9 +15,9 @@ pub fn main() { let mut builder = task::task(); let result = builder.future_result(); builder.spawn(child); - error2!("1"); + error!("1"); task::deschedule(); result.recv(); } -fn child() { error2!("2"); } +fn child() { error!("2"); } diff --git a/src/test/run-pass/yield2.rs b/src/test/run-pass/yield2.rs index 6dc96536540..aaf4b257f7a 100644 --- a/src/test/run-pass/yield2.rs +++ b/src/test/run-pass/yield2.rs @@ -13,5 +13,5 @@ use std::task; pub fn main() { let mut i: int = 0; - while i < 100 { i = i + 1; error2!("{}", i); task::deschedule(); } + while i < 100 { i = i + 1; error!("{}", i); task::deschedule(); } } |