`m1!{...}` -> `m1!(...)`

28 files changed, 163 insertions, 163 deletions

diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs
index d58cd1ef4cf..b912b2cb12d 100644
--- a/src/test/bench/core-std.rs
+++ b/src/test/bench/core-std.rs
@@ -17,12 +17,12 @@ fn main(argv: ~[~str]) {
 
     let tests = vec::view(argv, 1, argv.len());
 
-    bench!{shift_push};
-    bench!{read_line};
-    bench!{str_set};
-    bench!{vec_plus};
-    bench!{vec_append};
-    bench!{vec_push_all};
+    bench!(shift_push);
+    bench!(read_line);
+    bench!(str_set);
+    bench!(vec_plus);
+    bench!(vec_append);
+    bench!(vec_push_all);
 }
 
 fn maybe_run_test(argv: &[~str], name: ~str, test: fn()) {
@@ -39,7 +39,7 @@ fn maybe_run_test(argv: &[~str], name: ~str, test: fn()) {
     test();
     let stop = precise_time_s();
 
-    io::println(fmt!{"%s:\t\t%f ms", name, (stop - start) * 1000f});
+    io::println(fmt!("%s:\t\t%f ms", name, (stop - start) * 1000f));
 }
 
 fn shift_push() {
@@ -53,7 +53,7 @@ fn shift_push() {
 
 fn read_line() {
     let path = path::connect(
-        env!{"CFG_SRC_DIR"},
+        env!("CFG_SRC_DIR"),
         ~"src/test/bench/shootout-k-nucleotide.data"
     );
 
diff --git a/src/test/bench/core-vec-append.rs b/src/test/bench/core-vec-append.rs
index b480d92a0d8..a9641acf45d 100644
--- a/src/test/bench/core-vec-append.rs
+++ b/src/test/bench/core-vec-append.rs
@@ -48,18 +48,18 @@ fn main(args: ~[~str]) {
     let rawf = raw as float;
     let dvecf = dvec as float;
     
-    io::stdout().write_str(fmt!{"Raw     : %? seconds\n", raw});
-    io::stdout().write_str(fmt!{"        : %f op/sec\n", maxf/rawf});
-    io::stdout().write_str(fmt!{"\n"});
-    io::stdout().write_str(fmt!{"Dvec    : %? seconds\n", dvec});
-    io::stdout().write_str(fmt!{"        : %f op/sec\n", maxf/dvecf});
-    io::stdout().write_str(fmt!{"\n"});
+    io::stdout().write_str(fmt!("Raw     : %? seconds\n", raw));
+    io::stdout().write_str(fmt!("        : %f op/sec\n", maxf/rawf));
+    io::stdout().write_str(fmt!("\n"));
+    io::stdout().write_str(fmt!("Dvec    : %? seconds\n", dvec));
+    io::stdout().write_str(fmt!("        : %f op/sec\n", maxf/dvecf));
+    io::stdout().write_str(fmt!("\n"));
     
     if dvec < raw {
-        io::stdout().write_str(fmt!{"Dvec is %f%% faster than raw\n",
-                                    (rawf - dvecf) / rawf * 100.0});
+        io::stdout().write_str(fmt!("Dvec is %f%% faster than raw\n",
+                                    (rawf - dvecf) / rawf * 100.0));
     } else {
-        io::stdout().write_str(fmt!{"Raw is %f%% faster than dvec\n",
-                                    (dvecf - rawf) / dvecf * 100.0});
+        io::stdout().write_str(fmt!("Raw is %f%% faster than dvec\n",
+                                    (dvecf - rawf) / dvecf * 100.0));
     }
 }
diff --git a/src/test/bench/graph500-bfs.rs b/src/test/bench/graph500-bfs.rs
index 35ff2e648c9..78a3dd5ed96 100644
--- a/src/test/bench/graph500-bfs.rs
+++ b/src/test/bench/graph500-bfs.rs
@@ -167,7 +167,7 @@ fn bfs2(graph: graph, key: node_id) -> bfs_result {
     let mut i = 0u;
     while vec::any(colors, is_gray) {
         // Do the BFS.
-        log(info, fmt!{"PBFS iteration %?", i});
+        log(info, fmt!("PBFS iteration %?", i));
         i += 1u;
         colors = do colors.mapi() |i, c| {
             let c : color = c;
@@ -237,7 +237,7 @@ fn pbfs(&&graph: arc::arc<graph>, key: node_id) -> bfs_result {
     let mut i = 0u;
     while par::any(colors, is_gray) {
         // Do the BFS.
-        log(info, fmt!{"PBFS iteration %?", i});
+        log(info, fmt!("PBFS iteration %?", i));
         i += 1u;
         let old_len = colors.len();
 
@@ -397,8 +397,8 @@ fn main(args: ~[~str]) {
     let edges = make_edges(scale, 16u);
     let stop = time::precise_time_s();
 
-    io::stdout().write_line(fmt!{"Generated %? edges in %? seconds.",
-                                 vec::len(edges), stop - start});
+    io::stdout().write_line(fmt!("Generated %? edges in %? seconds.",
+                                 vec::len(edges), stop - start));
 
     let start = time::precise_time_s();
     let graph = make_graph(1u << scale, edges);
@@ -407,9 +407,9 @@ fn main(args: ~[~str]) {
     let mut total_edges = 0u;
     vec::each(graph, |edges| { total_edges += edges.len(); true });
 
-    io::stdout().write_line(fmt!{"Generated graph with %? edges in %? seconds.",
+    io::stdout().write_line(fmt!("Generated graph with %? edges in %? seconds.",
                                  total_edges / 2u,
-                                 stop - start});
+                                 stop - start));
 
     let mut total_seq = 0.0;
     let mut total_par = 0.0;
@@ -418,7 +418,7 @@ fn main(args: ~[~str]) {
 
     do gen_search_keys(graph, num_keys).map() |root| {
         io::stdout().write_line(~"");
-        io::stdout().write_line(fmt!{"Search key: %?", root});
+        io::stdout().write_line(fmt!("Search key: %?", root));
 
         if do_sequential {
             let start = time::precise_time_s();
@@ -428,8 +428,8 @@ fn main(args: ~[~str]) {
             //total_seq += stop - start;
 
             io::stdout().write_line(
-                fmt!{"Sequential BFS completed in %? seconds.",
-                     stop - start});
+                fmt!("Sequential BFS completed in %? seconds.",
+                     stop - start));
             
             if do_validate {
                 let start = time::precise_time_s();
@@ -437,8 +437,8 @@ fn main(args: ~[~str]) {
                 let stop = time::precise_time_s();
                 
                 io::stdout().write_line(
-                    fmt!{"Validation completed in %? seconds.",
-                         stop - start});
+                    fmt!("Validation completed in %? seconds.",
+                         stop - start));
             }
             
             let start = time::precise_time_s();
@@ -448,8 +448,8 @@ fn main(args: ~[~str]) {
             total_seq += stop - start;
             
             io::stdout().write_line(
-                fmt!{"Alternate Sequential BFS completed in %? seconds.",
-                     stop - start});
+                fmt!("Alternate Sequential BFS completed in %? seconds.",
+                     stop - start));
             
             if do_validate {
                 let start = time::precise_time_s();
@@ -457,8 +457,8 @@ fn main(args: ~[~str]) {
                 let stop = time::precise_time_s();
                 
                 io::stdout().write_line(
-                    fmt!{"Validation completed in %? seconds.",
-                         stop - start});
+                    fmt!("Validation completed in %? seconds.",
+                         stop - start));
             }
         }
         
@@ -468,21 +468,21 @@ fn main(args: ~[~str]) {
 
         total_par += stop - start;
 
-        io::stdout().write_line(fmt!{"Parallel BFS completed in %? seconds.",
-                                     stop - start});
+        io::stdout().write_line(fmt!("Parallel BFS completed in %? seconds.",
+                                     stop - start));
 
         if do_validate {
             let start = time::precise_time_s();
             assert(validate(edges, root, bfs_tree));
             let stop = time::precise_time_s();
             
-            io::stdout().write_line(fmt!{"Validation completed in %? seconds.",
-                                         stop - start});
+            io::stdout().write_line(fmt!("Validation completed in %? seconds.",
+                                         stop - start));
         }
     };
 
     io::stdout().write_line(~"");
     io::stdout().write_line(
-        fmt!{"Total sequential: %? \t Total Parallel: %? \t Speedup: %?x",
-             total_seq, total_par, total_seq / total_par});
+        fmt!("Total sequential: %? \t Total Parallel: %? \t Speedup: %?x",
+             total_seq, total_par, total_seq / total_par));
 }
diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs
index 26741f6298f..0f16bec626e 100644
--- a/src/test/bench/msgsend-pipes-shared.rs
+++ b/src/test/bench/msgsend-pipes-shared.rs
@@ -33,7 +33,7 @@ fn server(requests: port<request>, responses: pipes::chan<uint>) {
         match requests.try_recv() {
           some(get_count) => { responses.send(copy count); }
           some(bytes(b)) => {
-            //error!{"server: received %? bytes", b};
+            //error!("server: received %? bytes", b);
             count += b;
           }
           none => { done = true; }
@@ -41,7 +41,7 @@ fn server(requests: port<request>, responses: pipes::chan<uint>) {
         }
     }
     responses.send(count);
-    //error!{"server exiting"};
+    //error!("server exiting");
 }
 
 fn run(args: &[~str]) {
@@ -61,10 +61,10 @@ fn run(args: &[~str]) {
             vec::push(worker_results, r);
         }).spawn {
             for uint::range(0u, size / workers) |_i| {
-                //error!{"worker %?: sending %? bytes", i, num_bytes};
+                //error!("worker %?: sending %? bytes", i, num_bytes);
                 to_child.send(bytes(num_bytes));
             }
-            //error!{"worker %? exiting", i};
+            //error!("worker %? exiting", i);
         };
     }
     do task::spawn {
@@ -72,16 +72,16 @@ fn run(args: &[~str]) {
     }
 
     vec::iter(worker_results, |r| { future::get(&r); } );
-    //error!{"sending stop message"};
+    //error!("sending stop message");
     to_child.send(stop);
-    move_out!{to_child};
+    move_out!(to_child);
     let result = from_child.recv();
     let end = std::time::precise_time_s();
     let elapsed = end - start;
-    io::stdout().write_str(fmt!{"Count is %?\n", result});
-    io::stdout().write_str(fmt!{"Test took %? seconds\n", elapsed});
+    io::stdout().write_str(fmt!("Count is %?\n", result));
+    io::stdout().write_str(fmt!("Test took %? seconds\n", elapsed));
     let thruput = ((size / workers * workers) as float) / (elapsed as float);
-    io::stdout().write_str(fmt!{"Throughput=%f per sec\n", thruput});
+    io::stdout().write_str(fmt!("Throughput=%f per sec\n", thruput));
     assert result == num_bytes * size;
 }
 
@@ -94,6 +94,6 @@ fn main(args: ~[~str]) {
         copy args
     };        
 
-    debug!{"%?", args};
+    debug!("%?", args);
     run(args);
 }
diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs
index fc041382721..7b2930387f4 100644
--- a/src/test/bench/msgsend-pipes.rs
+++ b/src/test/bench/msgsend-pipes.rs
@@ -29,7 +29,7 @@ fn server(requests: PortSet<request>, responses: pipes::chan<uint>) {
         match requests.try_recv() {
           some(get_count) => { responses.send(copy count); }
           some(bytes(b)) => {
-            //error!{"server: received %? bytes", b};
+            //error!("server: received %? bytes", b);
             count += b;
           }
           none => { done = true; }
@@ -37,7 +37,7 @@ fn server(requests: PortSet<request>, responses: pipes::chan<uint>) {
         }
     }
     responses.send(count);
-    //error!{"server exiting"};
+    //error!("server exiting");
 }
 
 fn run(args: &[~str]) {
@@ -58,10 +58,10 @@ fn run(args: &[~str]) {
             vec::push(worker_results, r);
         }).spawn {
             for uint::range(0u, size / workers) |_i| {
-                //error!{"worker %?: sending %? bytes", i, num_bytes};
+                //error!("worker %?: sending %? bytes", i, num_bytes);
                 to_child.send(bytes(num_bytes));
             }
-            //error!{"worker %? exiting", i};
+            //error!("worker %? exiting", i);
         };
     }
     do task::spawn {
@@ -69,16 +69,16 @@ fn run(args: &[~str]) {
     }
 
     vec::iter(worker_results, |r| { future::get(&r); } );
-    //error!{"sending stop message"};
+    //error!("sending stop message");
     to_child.send(stop);
-    move_out!{to_child};
+    move_out!(to_child);
     let result = from_child.recv();
     let end = std::time::precise_time_s();
     let elapsed = end - start;
-    io::stdout().write_str(fmt!{"Count is %?\n", result});
-    io::stdout().write_str(fmt!{"Test took %? seconds\n", elapsed});
+    io::stdout().write_str(fmt!("Count is %?\n", result));
+    io::stdout().write_str(fmt!("Test took %? seconds\n", elapsed));
     let thruput = ((size / workers * workers) as float) / (elapsed as float);
-    io::stdout().write_str(fmt!{"Throughput=%f per sec\n", thruput});
+    io::stdout().write_str(fmt!("Throughput=%f per sec\n", thruput));
     assert result == num_bytes * size;
 }
 
@@ -91,6 +91,6 @@ fn main(args: ~[~str]) {
         copy args
     };        
 
-    debug!{"%?", args};
+    debug!("%?", args);
     run(args);
 }
diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs
index 172351e506f..644bb12f018 100644
--- a/src/test/bench/msgsend-ring-mutex-arcs.rs
+++ b/src/test/bench/msgsend-ring-mutex-arcs.rs
@@ -45,7 +45,7 @@ fn thread_ring(i: uint,
     let mut num_port <- some(num_port);
     // Send/Receive lots of messages.
     for uint::range(0u, count) |j| {
-        //error!{"task %?, iter %?", i, j};
+        //error!("task %?, iter %?", i, j);
         let mut num_chan2 = option::swap_unwrap(&mut num_chan);
         let mut num_port2 = option::swap_unwrap(&mut num_port);
         send(&num_chan2, i * j);
@@ -77,7 +77,7 @@ fn main(args: ~[~str]) {
     let mut futures = ~[];
 
     for uint::range(1u, num_tasks) |i| {
-        //error!{"spawning %?", i};
+        //error!("spawning %?", i);
         let (new_chan, num_port) = init();
         let num_chan2 = ~mut none;
         *num_chan2 <-> num_chan;
@@ -107,8 +107,8 @@ fn main(args: ~[~str]) {
     let elapsed = (stop - start);
     let rate = (num_msgs as float) / elapsed;
 
-    io::println(fmt!{"Sent %? messages in %? seconds",
-                     num_msgs, elapsed});
-    io::println(fmt!{"  %? messages / second", rate});
-    io::println(fmt!{"  %? μs / message", 1000000. / rate});
+    io::println(fmt!("Sent %? messages in %? seconds",
+                     num_msgs, elapsed));
+    io::println(fmt!("  %? messages / second", rate));
+    io::println(fmt!("  %? μs / message", 1000000. / rate));
 }
diff --git a/src/test/bench/msgsend-ring-pipes.rs b/src/test/bench/msgsend-ring-pipes.rs
index 9bf0298ab32..96f65b3462e 100644
--- a/src/test/bench/msgsend-ring-pipes.rs
+++ b/src/test/bench/msgsend-ring-pipes.rs
@@ -36,7 +36,7 @@ fn thread_ring(i: uint,
     let mut num_port <- some(num_port);
     // Send/Receive lots of messages.
     for uint::range(0u, count) |j| {
-        //error!{"task %?, iter %?", i, j};
+        //error!("task %?, iter %?", i, j);
         let mut num_chan2 = none;
         let mut num_port2 = none;
         num_chan2 <-> num_chan;
@@ -46,7 +46,7 @@ fn thread_ring(i: uint,
         match recv(port) {
           ring::num(_n, p) => {
             //log(error, _n);
-            num_port = some(move_out!{p});
+            num_port = some(move_out!(p));
           }
         }
     };
@@ -73,7 +73,7 @@ fn main(args: ~[~str]) {
     let mut futures = ~[];
 
     for uint::range(1u, num_tasks) |i| {
-        //error!{"spawning %?", i};
+        //error!("spawning %?", i);
         let (new_chan, num_port) = ring::init();
         let num_chan2 = ~mut none;
         *num_chan2 <-> num_chan;
@@ -103,8 +103,8 @@ fn main(args: ~[~str]) {
     let elapsed = (stop - start);
     let rate = (num_msgs as float) / elapsed;
 
-    io::println(fmt!{"Sent %? messages in %? seconds",
-                     num_msgs, elapsed});
-    io::println(fmt!{"  %? messages / second", rate});
-    io::println(fmt!{"  %? μs / message", 1000000. / rate});
+    io::println(fmt!("Sent %? messages in %? seconds",
+                     num_msgs, elapsed));
+    io::println(fmt!("  %? messages / second", rate));
+    io::println(fmt!("  %? μs / message", 1000000. / rate));
 }
diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs
index 6dcaabdb56e..61934037014 100644
--- a/src/test/bench/msgsend-ring-rw-arcs.rs
+++ b/src/test/bench/msgsend-ring-rw-arcs.rs
@@ -46,7 +46,7 @@ fn thread_ring(i: uint,
     let mut num_port <- some(num_port);
     // Send/Receive lots of messages.
     for uint::range(0u, count) |j| {
-        //error!{"task %?, iter %?", i, j};
+        //error!("task %?, iter %?", i, j);
         let mut num_chan2 = option::swap_unwrap(&mut num_chan);
         let mut num_port2 = option::swap_unwrap(&mut num_port);
         send(&num_chan2, i * j);
@@ -78,7 +78,7 @@ fn main(args: ~[~str]) {
     let mut futures = ~[];
 
     for uint::range(1u, num_tasks) |i| {
-        //error!{"spawning %?", i};
+        //error!("spawning %?", i);
         let (new_chan, num_port) = init();
         let num_chan2 = ~mut none;
         *num_chan2 <-> num_chan;
@@ -108,8 +108,8 @@ fn main(args: ~[~str]) {
     let elapsed = (stop - start);
     let rate = (num_msgs as float) / elapsed;
 
-    io::println(fmt!{"Sent %? messages in %? seconds",
-                     num_msgs, elapsed});
-    io::println(fmt!{"  %? messages / second", rate});
-    io::println(fmt!{"  %? μs / message", 1000000. / rate});
+    io::println(fmt!("Sent %? messages in %? seconds",
+                     num_msgs, elapsed));
+    io::println(fmt!("  %? messages / second", rate));
+    io::println(fmt!("  %? μs / message", 1000000. / rate));
 }
diff --git a/src/test/bench/msgsend-ring.rs b/src/test/bench/msgsend-ring.rs
index 418ea3e538f..d3fdc472b66 100644
--- a/src/test/bench/msgsend-ring.rs
+++ b/src/test/bench/msgsend-ring.rs
@@ -67,8 +67,8 @@ fn main(args: ~[~str]) {
     let elapsed = (stop - start);
     let rate = (num_msgs as float) / elapsed;
 
-    io::println(fmt!{"Sent %? messages in %? seconds",
-                     num_msgs, elapsed});
-    io::println(fmt!{"  %? messages / second", rate});
-    io::println(fmt!{"  %? μs / message", 1000000. / rate});
+    io::println(fmt!("Sent %? messages in %? seconds",
+                     num_msgs, elapsed));
+    io::println(fmt!("  %? messages / second", rate));
+    io::println(fmt!("  %? μs / message", 1000000. / rate));
 }
diff --git a/src/test/bench/msgsend.rs b/src/test/bench/msgsend.rs
index 50751567822..d7c8e8436cd 100644
--- a/src/test/bench/msgsend.rs
+++ b/src/test/bench/msgsend.rs
@@ -49,10 +49,10 @@ fn run(args: ~[~str]) {
     let result = comm::recv(from_child);
     let end = std::time::precise_time_s();
     let elapsed = end - start;
-    io::stdout().write_str(fmt!{"Count is %?\n", result});
-    io::stdout().write_str(fmt!{"Test took %? seconds\n", elapsed});
+    io::stdout().write_str(fmt!("Count is %?\n", result));
+    io::stdout().write_str(fmt!("Test took %? seconds\n", elapsed));
     let thruput = ((size / workers * workers) as float) / (elapsed as float);
-    io::stdout().write_str(fmt!{"Throughput=%f per sec\n", thruput});
+    io::stdout().write_str(fmt!("Throughput=%f per sec\n", thruput));
 }
 
 fn main(args: ~[~str]) {
@@ -64,7 +64,7 @@ fn main(args: ~[~str]) {
         args
     };
 
-    debug!{"%?", args};
+    debug!("%?", args);
     run(args);
 }
 
diff --git a/src/test/bench/pingpong.rs b/src/test/bench/pingpong.rs
index 17830af6869..3cc474df342 100644
--- a/src/test/bench/pingpong.rs
+++ b/src/test/bench/pingpong.rs
@@ -11,7 +11,7 @@ proto! pingpong {
     ping: send {
         ping -> pong
     }
-    
+
     pong: recv {
         pong -> ping
     }
@@ -21,7 +21,7 @@ proto! pingpong_unbounded {
     ping: send {
         ping -> pong
     }
-    
+
     pong: recv {
         pong -> ping
     }
@@ -37,7 +37,7 @@ macro_rules! move_it {
 }
 
 macro_rules! follow {
-    { 
+    {
         $($message:path($($x: ident),+) -> $next:ident $e:expr)+
     } => (
         |m| match move m {
@@ -50,7 +50,7 @@ macro_rules! follow {
         }
     );
 
-    { 
+    {
         $($message:path -> $next:ident $e:expr)+
     } => (
         |m| match move m {
@@ -78,9 +78,9 @@ fn bounded(count: uint) {
         let mut count = count;
         let mut ch = ch;
         while count > 0 {
-            ch = switch(ch, follow! {
+            ch = switch(ch, follow! (
                 ping -> next { server::pong(next) }
-            });
+            ));
 
             count -= 1;
         }
@@ -90,9 +90,9 @@ fn bounded(count: uint) {
     while count > 0 {
         let ch_ = client::ping(ch);
 
-        ch = switch(ch_, follow! {
+        ch = switch(ch_, follow! (
             pong -> next { next }
-        });
+        ));
 
         count -= 1;
     }
@@ -105,9 +105,9 @@ fn unbounded(count: uint) {
         let mut count = count;
         let mut ch = ch;
         while count > 0 {
-            ch = switch(ch, follow! {
+            ch = switch(ch, follow! (
                 ping -> next { server::pong(next) }
-            });
+            ));
 
             count -= 1;
         }
@@ -117,9 +117,9 @@ fn unbounded(count: uint) {
     while count > 0 {
         let ch_ = client::ping(ch);
 
-        ch = switch(ch_, follow! {
+        ch = switch(ch_, follow! (
             pong -> next { next }
-        });
+        ));
 
         count -= 1;
     }
@@ -141,13 +141,13 @@ fn main() {
     let bounded = do timeit { bounded(count) };
     let unbounded = do timeit { unbounded(count) };
 
-    io::println(fmt!{"count: %?\n", count});
-    io::println(fmt!{"bounded:   %? s\t(%? μs/message)",
-                     bounded, bounded * 1000000. / (count as float)});
-    io::println(fmt!{"unbounded: %? s\t(%? μs/message)",
-                     unbounded, unbounded * 1000000. / (count as float)});
+    io::println(fmt!("count: %?\n", count));
+    io::println(fmt!("bounded:   %? s\t(%? μs/message)",
+                     bounded, bounded * 1000000. / (count as float)));
+    io::println(fmt!("unbounded: %? s\t(%? μs/message)",
+                     unbounded, unbounded * 1000000. / (count as float)));
 
-    io::println(fmt!{"\n\
+    io::println(fmt!("\n\
                       bounded is %?%% faster",
-                     (unbounded - bounded) / bounded * 100.});
+                     (unbounded - bounded) / bounded * 100.));
 }
diff --git a/src/test/bench/shootout-ackermann.rs b/src/test/bench/shootout-ackermann.rs
index 291e7c2dba5..f3a558984ea 100644
--- a/src/test/bench/shootout-ackermann.rs
+++ b/src/test/bench/shootout-ackermann.rs
@@ -21,5 +21,5 @@ fn main(args: ~[~str]) {
         args
     };
     let n = int::from_str(args[1]).get();
-    io::println(fmt!{"Ack(3,%d): %d\n", n, ack(3, n)});
+    io::println(fmt!("Ack(3,%d): %d\n", n, ack(3, n)));
 }
diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout-binarytrees.rs
index c9f1ca832a3..37a5d215a7c 100644
--- a/src/test/bench/shootout-binarytrees.rs
+++ b/src/test/bench/shootout-binarytrees.rs
@@ -47,9 +47,9 @@ fn main(args: ~[~str]) {
     let stretch_depth = max_depth + 1;
     let stretch_tree = bottom_up_tree(&stretch_arena, 0, stretch_depth);
 
-    io::println(fmt!{"stretch tree of depth %d\t check: %d",
+    io::println(fmt!("stretch tree of depth %d\t check: %d",
                           stretch_depth,
-                          item_check(stretch_tree)});
+                          item_check(stretch_tree)));
 
     let long_lived_arena = arena::arena();
     let long_lived_tree = bottom_up_tree(&long_lived_arena, 0, max_depth);
@@ -65,12 +65,12 @@ fn main(args: ~[~str]) {
             chk += item_check(temp_tree);
             i += 1;
         }
-        io::println(fmt!{"%d\t trees of depth %d\t check: %d",
+        io::println(fmt!("%d\t trees of depth %d\t check: %d",
                          iterations * 2, depth,
-                         chk});
+                         chk));
         depth += 2;
     }
-    io::println(fmt!{"long lived trees of depth %d\t check: %d",
+    io::println(fmt!("long lived trees of depth %d\t check: %d",
                      max_depth,
-                          item_check(long_lived_tree)});
+                          item_check(long_lived_tree)));
 }
diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout-chameneos-redux.rs
index 05fdf0fb709..bde2c79e218 100644
--- a/src/test/bench/shootout-chameneos-redux.rs
+++ b/src/test/bench/shootout-chameneos-redux.rs
@@ -111,7 +111,7 @@ fn creature(
             }
             option::none => {
                 // log creatures met and evil clones of self
-                let report = fmt!{"%u", creatures_met} + ~" " +
+                let report = fmt!("%u", creatures_met) + ~" " +
                              show_number(evil_clones_met);
                 comm::send(to_rendezvous_log, report);
                 break;
diff --git a/src/test/bench/shootout-fannkuchredux.rs b/src/test/bench/shootout-fannkuchredux.rs
index e5eab3b78f4..330397ddc92 100644
--- a/src/test/bench/shootout-fannkuchredux.rs
+++ b/src/test/bench/shootout-fannkuchredux.rs
@@ -43,7 +43,7 @@ fn fannkuch(n: int) -> int {
         let mut go = true;
         while go {
             if r == n {
-                io::println(fmt!{"%d", checksum});
+                io::println(fmt!("%d", checksum));
                 return flips;
             }
             let p0 = perm1[0];
@@ -68,5 +68,5 @@ fn main(args: ~[~str]) {
     };
 
     let n = int::from_str(args[1]).get();
-    io::println(fmt!{"Pfannkuchen(%d) = %d", n, fannkuch(n)});
+    io::println(fmt!("Pfannkuchen(%d) = %d", n, fannkuch(n)));
 }
diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout-fibo.rs
index 4e8cfff4ad2..1bf7c1e4782 100644
--- a/src/test/bench/shootout-fibo.rs
+++ b/src/test/bench/shootout-fibo.rs
@@ -17,5 +17,5 @@ fn main(args: ~[~str]) {
         args
     };
     let n = int::from_str(args[1]).get();
-    io::println(fmt!{"%d\n", fib(n)});
+    io::println(fmt!("%d\n", fib(n)));
 }
diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs
index d0234022a85..e9054195ee4 100644
--- a/src/test/bench/shootout-k-nucleotide-pipes.rs
+++ b/src/test/bench/shootout-k-nucleotide-pipes.rs
@@ -48,7 +48,7 @@ fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str {
 
    pairs_sorted.each(fn&(kv: (~[u8], float)) -> bool unsafe {
       let (k,v) = kv;
-      buffer += (fmt!{"%s %0.3f\n", str::to_upper(str::unsafe::from_bytes(k)), v});
+      buffer += (fmt!("%s %0.3f\n", str::to_upper(str::unsafe::from_bytes(k)), v));
       return true;
    });
 
@@ -111,15 +111,15 @@ fn make_sequence_processor(sz: uint, from_parent: pipes::port<~[u8]>,
    let buffer = match sz { 
        1u => { sort_and_fmt(freqs, total) }
        2u => { sort_and_fmt(freqs, total) }
-       3u => { fmt!{"%u\t%s", find(freqs, ~"GGT"), ~"GGT"} }
-       4u => { fmt!{"%u\t%s", find(freqs, ~"GGTA"), ~"GGTA"} }
-       6u => { fmt!{"%u\t%s", find(freqs, ~"GGTATT"), ~"GGTATT"} }
-      12u => { fmt!{"%u\t%s", find(freqs, ~"GGTATTTTAATT"), ~"GGTATTTTAATT"} }
-      18u => { fmt!{"%u\t%s", find(freqs, ~"GGTATTTTAATTTATAGT"), ~"GGTATTTTAATTTATAGT"} }
+       3u => { fmt!("%u\t%s", find(freqs, ~"GGT"), ~"GGT") }
+       4u => { fmt!("%u\t%s", find(freqs, ~"GGTA"), ~"GGTA") }
+       6u => { fmt!("%u\t%s", find(freqs, ~"GGTATT"), ~"GGTATT") }
+      12u => { fmt!("%u\t%s", find(freqs, ~"GGTATTTTAATT"), ~"GGTATTTTAATT") }
+      18u => { fmt!("%u\t%s", find(freqs, ~"GGTATTTTAATTTATAGT"), ~"GGTATTTTAATTTATAGT") }
         _ => { ~"" }
    };
 
-   //comm::send(to_parent, fmt!{"yay{%u}", sz});
+   //comm::send(to_parent, fmt!("yay{%u}", sz));
     to_parent.send(buffer);
 }
 
@@ -129,7 +129,7 @@ fn main(args: ~[~str]) {
        // FIXME: Using this compile-time env variable is a crummy way to
        // get to this massive data set, but #include_bin chokes on it (#2598)
        let path = path::connect(
-           env!{"CFG_SRC_DIR"},
+           env!("CFG_SRC_DIR"),
            ~"src/test/bench/shootout-k-nucleotide.data"
            );
        result::get(io::file_reader(path))
diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs
index 467df1148df..08b17f0dfb3 100644
--- a/src/test/bench/shootout-k-nucleotide.rs
+++ b/src/test/bench/shootout-k-nucleotide.rs
@@ -46,7 +46,7 @@ fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str {
 
    pairs_sorted.each(fn&(kv: (~[u8], float)) -> bool unsafe {
       let (k,v) = kv;
-      buffer += (fmt!{"%s %0.3f\n", str::to_upper(str::unsafe::from_bytes(k)), v});
+      buffer += (fmt!("%s %0.3f\n", str::to_upper(str::unsafe::from_bytes(k)), v));
       return true;
    });
 
@@ -109,15 +109,15 @@ fn make_sequence_processor(sz: uint, from_parent: comm::Port<~[u8]>,
    let buffer = match sz { 
        1u => { sort_and_fmt(freqs, total) }
        2u => { sort_and_fmt(freqs, total) }
-       3u => { fmt!{"%u\t%s", find(freqs, ~"GGT"), ~"GGT"} }
-       4u => { fmt!{"%u\t%s", find(freqs, ~"GGTA"), ~"GGTA"} }
-       6u => { fmt!{"%u\t%s", find(freqs, ~"GGTATT"), ~"GGTATT"} }
-      12u => { fmt!{"%u\t%s", find(freqs, ~"GGTATTTTAATT"), ~"GGTATTTTAATT"} }
-      18u => { fmt!{"%u\t%s", find(freqs, ~"GGTATTTTAATTTATAGT"), ~"GGTATTTTAATTTATAGT"} }
+       3u => { fmt!("%u\t%s", find(freqs, ~"GGT"), ~"GGT") }
+       4u => { fmt!("%u\t%s", find(freqs, ~"GGTA"), ~"GGTA") }
+       6u => { fmt!("%u\t%s", find(freqs, ~"GGTATT"), ~"GGTATT") }
+      12u => { fmt!("%u\t%s", find(freqs, ~"GGTATTTTAATT"), ~"GGTATTTTAATT") }
+      18u => { fmt!("%u\t%s", find(freqs, ~"GGTATTTTAATTTATAGT"), ~"GGTATTTTAATTTATAGT") }
         _ => { ~"" }
    };
 
-   //comm::send(to_parent, fmt!{"yay{%u}", sz});
+   //comm::send(to_parent, fmt!("yay{%u}", sz));
    comm::send(to_parent, buffer);
 }
 
@@ -127,7 +127,7 @@ fn main(args: ~[~str]) {
        // FIXME: Using this compile-time env variable is a crummy way to
        // get to this massive data set, but #include_bin chokes on it (#2598)
        let path = path::connect(
-           env!{"CFG_SRC_DIR"},
+           env!("CFG_SRC_DIR"),
            ~"src/test/bench/shootout-k-nucleotide.data"
            );
        result::get(io::file_reader(path))
diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs
index 252832f0cb7..1f380d79269 100644
--- a/src/test/bench/shootout-mandelbrot.rs
+++ b/src/test/bench/shootout-mandelbrot.rs
@@ -117,20 +117,20 @@ fn writer(path: ~str, writech: comm::Chan<comm::Chan<line>>, size: uint)
         }
     };
     cout.write_line(~"P4");
-    cout.write_line(fmt!{"%u %u", size, size});
+    cout.write_line(fmt!("%u %u", size, size));
     let lines = std::map::uint_hash();
     let mut done = 0_u;
     let mut i = 0_u;
     while i < size {
         let aline = comm::recv(p);
         if aline.i == done {
-            debug!{"W %u", aline.i};
+            debug!("W %u", aline.i);
             cout.write(aline.b);
             done += 1_u;
             let mut prev = done;
             while prev <= i {
                 if lines.contains_key(prev) {
-                    debug!{"WS %u", prev};
+                    debug!("WS %u", prev);
                     // FIXME (#2280): this temporary shouldn't be
                     // necessary, but seems to be, for borrowing.
                     let v : ~[u8] = lines.get(prev);
@@ -145,7 +145,7 @@ fn writer(path: ~str, writech: comm::Chan<comm::Chan<line>>, size: uint)
             };
         }
         else {
-            debug!{"S %u", aline.i};
+            debug!("S %u", aline.i);
             lines.insert(aline.i, aline.b);
         };
         i += 1_u;
@@ -177,7 +177,7 @@ fn main(args: ~[~str]) {
     for uint::range(0_u, size) |j| {
         task::spawn(|| chanmb(j, size, ch) );
         if j % yieldevery == 0_u {
-            debug!{"Y %u", j};
+            debug!("Y %u", j);
             task::yield();
         };
     };
diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs
index 0082bc6ad03..ef1e6509ee9 100644
--- a/src/test/bench/shootout-nbody.rs
+++ b/src/test/bench/shootout-nbody.rs
@@ -23,10 +23,10 @@ fn main(args: ~[~str]) {
     };
     let n = int::from_str(args[1]).get();
     let bodies: ~[Body::props] = NBodySystem::make();
-    io::println(fmt!{"%f", NBodySystem::energy(bodies)});
+    io::println(fmt!("%f", NBodySystem::energy(bodies)));
     let mut i = 0;
     while i < n { NBodySystem::advance(bodies, 0.01); i += 1; }
-    io::println(fmt!{"%f", NBodySystem::energy(bodies)});
+    io::println(fmt!("%f", NBodySystem::energy(bodies)));
 }
 
 mod NBodySystem {
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index 225f3d98c0e..588f6bf8ce2 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -63,7 +63,7 @@ fn stress_task(&&id: int) {
         let n = 15;
         assert (fib(n) == fib(n));
         i += 1;
-        error!{"%d: Completed %d iterations", id, i};
+        error!("%d: Completed %d iterations", id, i);
     }
 }
 
@@ -108,8 +108,8 @@ fn main(args: ~[~str]) {
 
                 let elapsed = stop - start;
 
-                out.write_line(fmt!{"%d\t%d\t%s", n, fibn,
-                                    u64::str(elapsed)});
+                out.write_line(fmt!("%d\t%d\t%s", n, fibn,
+                                    u64::str(elapsed)));
             }
         }
     }
diff --git a/src/test/bench/shootout-spectralnorm.rs b/src/test/bench/shootout-spectralnorm.rs
index 69f31b39075..95f2b257400 100644
--- a/src/test/bench/shootout-spectralnorm.rs
+++ b/src/test/bench/shootout-spectralnorm.rs
@@ -69,5 +69,5 @@ fn main(args: ~[~str]) {
         i += 1u;
     }
 
-    io::println(fmt!{"%0.9f\n", float::sqrt(vBv / vv)});
+    io::println(fmt!("%0.9f\n", float::sqrt(vBv / vv)));
 }
diff --git a/src/test/bench/shootout-threadring.rs b/src/test/bench/shootout-threadring.rs
index f3b1850c88c..91b2c6e5dc8 100644
--- a/src/test/bench/shootout-threadring.rs
+++ b/src/test/bench/shootout-threadring.rs
@@ -23,11 +23,11 @@ fn roundtrip(id: int, p: comm::Port<int>, ch: comm::Chan<int>) {
     while (true) {
         match comm::recv(p) {
           1 => {
-            io::println(fmt!{"%d\n", id});
+            io::println(fmt!("%d\n", id));
             return;
           }
           token => {
-            debug!{"%d %d", id, token};
+            debug!("%d %d", id, token);
             comm::send(ch, token - 1);
             if token <= n_threads {
                 return;
diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std-smallintmap.rs
index a9cab862e2e..7f9a55ab167 100644
--- a/src/test/bench/std-smallintmap.rs
+++ b/src/test/bench/std-smallintmap.rs
@@ -45,8 +45,8 @@ fn main(args: ~[~str]) {
 
     let maxf = max as float;
 
-    io::stdout().write_str(fmt!{"insert(): %? seconds\n", checkf});
-    io::stdout().write_str(fmt!{"        : %f op/sec\n", maxf/checkf});
-    io::stdout().write_str(fmt!{"get()   : %? seconds\n", appendf});
-    io::stdout().write_str(fmt!{"        : %f op/sec\n", maxf/appendf});
+    io::stdout().write_str(fmt!("insert(): %? seconds\n", checkf));
+    io::stdout().write_str(fmt!("        : %f op/sec\n", maxf/checkf));
+    io::stdout().write_str(fmt!("get()   : %? seconds\n", appendf));
+    io::stdout().write_str(fmt!("        : %f op/sec\n", maxf/appendf));
 }
diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs
index 7c722442133..ef7442b22f2 100644
--- a/src/test/bench/sudoku.rs
+++ b/src/test/bench/sudoku.rs
@@ -118,9 +118,9 @@ fn solve_grid(g: grid_t) {
 
 fn write_grid(f: io::Writer, g: grid_t) {
     for u8::range(0u8, 9u8) |row| {
-        f.write_str(fmt!{"%u", (*g)[row][0] as uint});
+        f.write_str(fmt!("%u", (*g)[row][0] as uint));
         for u8::range(1u8, 9u8) |col| {
-            f.write_str(fmt!{" %u", (*g)[row][col] as uint});
+            f.write_str(fmt!(" %u", (*g)[row][col] as uint));
         }
         f.write_char('\n');
      }
diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/task-perf-alloc-unwind.rs
index 3c2dfec2d7f..992e1557759 100644
--- a/src/test/bench/task-perf-alloc-unwind.rs
+++ b/src/test/bench/task-perf-alloc-unwind.rs
@@ -17,11 +17,11 @@ fn main() {
 
 fn run(repeat: int, depth: int) {
     for iter::repeat(repeat as uint) {
-        debug!{"starting %.4f", precise_time_s()};
+        debug!("starting %.4f", precise_time_s());
         do task::try {
             recurse_or_fail(depth, none)
         };
-        debug!{"stopping %.4f", precise_time_s()};
+        debug!("stopping %.4f", precise_time_s());
     }
 }
 
@@ -48,7 +48,7 @@ struct r {
 
 fn recurse_or_fail(depth: int, st: option<st>) {
     if depth == 0 {
-        debug!{"unwinding %.4f", precise_time_s()};
+        debug!("unwinding %.4f", precise_time_s());
         fail;
     } else {
         let depth = depth - 1;
diff --git a/src/test/bench/task-perf-one-million.rs b/src/test/bench/task-perf-one-million.rs
index 2b854f83b67..7473132940a 100644
--- a/src/test/bench/task-perf-one-million.rs
+++ b/src/test/bench/task-perf-one-million.rs
@@ -68,5 +68,5 @@ fn main(args: ~[~str]) {
     let sum = match check comm::recv(port) {
       done(sum) => { sum }
     };
-    error!{"How many tasks? %d tasks.", sum};
+    error!("How many tasks? %d tasks.", sum);
 }
diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs
index 2c45896acd9..1fff4a72ca2 100644
--- a/src/test/bench/task-perf-word-count-generic.rs
+++ b/src/test/bench/task-perf-word-count-generic.rs
@@ -82,7 +82,7 @@ impl io::Reader: word_reader {
 fn file_word_reader(filename: ~str) -> word_reader {
     match io::file_reader(filename) {
       result::ok(f) => { f as word_reader }
-      result::err(e) => { fail fmt!{"%?", e} }
+      result::err(e) => { fail fmt!("%?", e) }
     }
 }
 
@@ -101,7 +101,7 @@ fn reduce(&&word: ~str, get: map_reduce::getter<int>) {
 
     loop { match get() { some(_) => { count += 1; } none => { break; } } }
     
-    io::println(fmt!{"%s\t%?", word, count});
+    io::println(fmt!("%s\t%?", word, count));
 }
 
 struct box<T> {
@@ -190,7 +190,7 @@ mod map_reduce {
                     match pipes::recv(ctrl) {
                       ctrl_proto::reducer(c_, ctrl) => {
                         c = some(c_);
-                        move_out!{ctrl}
+                        move_out!(ctrl)
                       }
                     }
                 }
@@ -227,11 +227,11 @@ mod map_reduce {
             while !is_done || ref_count > 0 {
                 match recv(p) {
                   emit_val(v) => {
-                    // error!{"received %d", v};
+                    // error!("received %d", v);
                     return some(v);
                   }
                   done => {
-                    // error!{"all done"};
+                    // error!("all done");
                     is_done = true;
                   }
                   addref => { ref_count += 1; }
@@ -262,7 +262,7 @@ mod map_reduce {
             let (_ready, message, ctrls) = pipes::select(ctrl);
             match option::unwrap(message) {
               ctrl_proto::mapper_done => {
-                // error!{"received mapper terminated."};
+                // error!("received mapper terminated.");
                 num_mappers -= 1;
                 ctrl = ctrls;
               }
@@ -288,7 +288,7 @@ mod map_reduce {
                 }
                 ctrl = vec::append_one(
                     ctrls,
-                    ctrl_proto::server::reducer(move_out!{cc}, c));
+                    ctrl_proto::server::reducer(move_out!(cc), c));
               }
             }
         }
@@ -303,7 +303,7 @@ fn main(argv: ~[~str]) {
     if vec::len(argv) < 2u && !os::getenv(~"RUST_BENCH").is_some() {
         let out = io::stdout();
 
-        out.write_line(fmt!{"Usage: %s <filename> ...", argv[0]});
+        out.write_line(fmt!("Usage: %s <filename> ...", argv[0]));
 
         return;
     }