Convert uses of #fmt to #ifmt. Issue #855

5 files changed, 12 insertions, 13 deletions

diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout-binarytrees.rs
index d6a44e6eb82..d0896241c9e 100644
--- a/src/test/bench/shootout-binarytrees.rs
+++ b/src/test/bench/shootout-binarytrees.rs
@@ -28,7 +28,7 @@ fn main() {
     } else { max_depth = n; }
     let stretch_depth = max_depth + 1;
     let stretch_tree = bottom_up_tree(0, stretch_depth);
-    log #fmt["stretch tree of depth %d\t check: %d", stretch_depth,
+    log #ifmt["stretch tree of depth %d\t check: %d", stretch_depth,
              item_check(stretch_tree)];
     let long_lived_tree = bottom_up_tree(0, max_depth);
     let depth = min_depth;
@@ -43,10 +43,10 @@ fn main() {
             chk += item_check(temp_tree);
             i += 1;
         }
-        log #fmt["%d\t trees of depth %d\t check: %d", iterations * 2, depth,
+        log #ifmt["%d\t trees of depth %d\t check: %d", iterations * 2, depth,
                  chk];
         depth += 2;
     }
-    log #fmt["long lived trees of depth %d\t check: %d", max_depth,
+    log #ifmt["long lived trees of depth %d\t check: %d", max_depth,
              item_check(long_lived_tree)];
 }
diff --git a/src/test/bench/shootout-fannkuchredux.rs b/src/test/bench/shootout-fannkuchredux.rs
index 8e7b2cbe269..bc0433edcdc 100644
--- a/src/test/bench/shootout-fannkuchredux.rs
+++ b/src/test/bench/shootout-fannkuchredux.rs
@@ -58,5 +58,5 @@ fn fannkuch(n: int) -> int {
 
 fn main(args: [str]) {
     let n = 7;
-    log #fmt["Pfannkuchen(%d) = %d", n, fannkuch(n)];
+    log #ifmt["Pfannkuchen(%d) = %d", n, fannkuch(n)];
 }
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index 9a09e9d0bd0..08764bbf5cf 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -69,7 +69,7 @@ fn stress_task(id: int) {
         let n = 15;
         assert (fib(n) == fib(n));
         i += 1;
-        log_err #fmt["%d: Completed %d iterations", id, i];
+        log_err #ifmt["%d: Completed %d iterations", id, i];
     }
 }
 
@@ -108,9 +108,8 @@ fn main(argv: [str]) {
                     let elapsed = stop - start;
 
                     out.write_line(
-                        istr::from_estr(
-                            #fmt["%d\t%d\t%s", n, fibn,
-                                 istr::to_estr(u64::str(elapsed))]));
+                            #ifmt["%d\t%d\t%s", n, fibn,
+                                 u64::str(elapsed)]);
                 }
             }
         }
diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs
index 0f1db55e886..9e67911fc87 100644
--- a/src/test/bench/task-perf-word-count-generic.rs
+++ b/src/test/bench/task-perf-word-count-generic.rs
@@ -128,7 +128,7 @@ mod map_reduce {
             while !is_done || ref_count > 0 {
                 alt recv(p) {
                   emit_val(v) {
-                    // log_err #fmt("received %d", v);
+                    // log_err #ifmt("received %d", v);
                     ret some(v);
                   }
                   done. {
@@ -203,7 +203,7 @@ fn main(argv: [str]) {
         let out = io::stdout();
 
         out.write_line(
-            istr::from_estr(#fmt["Usage: %s <filename> ...", argv[0]]));
+            #ifmt["Usage: %s <filename> ...", istr::from_estr(argv[0])]);
 
         // TODO: run something just to make sure the code hasn't
         // broken yet. This is the unit test mode of this program.
diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs
index eb193d61af7..bb976d23e16 100644
--- a/src/test/bench/task-perf-word-count.rs
+++ b/src/test/bench/task-perf-word-count.rs
@@ -124,7 +124,7 @@ mod map_reduce {
             while !is_done || ref_count > 0 {
                 alt recv(p) {
                   emit_val(v) {
-                    // log_err #fmt("received %d", v);
+                    // log_err #ifmt("received %d", v);
                     ret some(v);
                   }
                   done. {
@@ -198,8 +198,8 @@ fn main(argv: [str]) {
     if vec::len(argv) < 2u {
         let out = io::stdout();
 
-        out.write_line(istr::from_estr(
-            #fmt["Usage: %s <filename> ...", argv[0]]));
+        out.write_line(
+            #ifmt["Usage: %s <filename> ...", istr::from_estr(argv[0])]);
 
         // TODO: run something just to make sure the code hasn't
         // broken yet. This is the unit test mode of this program.