From cdc435f0081dbfd2be1790043f9b2e11735a5df2 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Sat, 19 Oct 2013 16:02:38 +0200
Subject: [PATCH] Update to use the new format! macro

---
 cat/cat.rs           | 6 +++---
 printenv/printenv.rs | 4 ++--
 yes/yes.rs           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cat/cat.rs b/cat/cat.rs
index b8cf6a4c2..3f3e063de 100644
--- a/cat/cat.rs
+++ b/cat/cat.rs
@@ -46,7 +46,7 @@ fn main() {
         println("cat 1.0.0");
         println("");
         println("Usage:");
-        println(fmt!("  %s [OPTION]... [FILE]...", program));
+        println(format!("  {0:s} [OPTION]... [FILE]...", program));
         println("");
         print(groups::usage("Concatenate FILE(s), or standard input, to standard output.", opts));
         println("");
@@ -116,7 +116,7 @@ pub fn exec(files: ~[~str], number: NumberingMode, show_nonprint: bool, show_end
                 let buf = reader.read_bytes(2);
                 for byte in buf.iter() {
                     if at_line_start && (number == NumberAll || (number == NumberNonEmpty && !is_newline_char(*byte))) {
-                        writer.write_str(fmt!("%6u  ", counter));
+                        writer.write_str(format!("{0:6u}  ", counter));
                         counter += 1;
                         at_line_start = false;
                     }
@@ -178,7 +178,7 @@ fn open(path: ~str) -> Option<@Reader> {
     match std::io::file_reader(&std::path::Path::new(path.as_slice())) {
         Ok(fd) => return Some(fd),
         Err(e) => {
-            stderr().write_line(fmt!("cat: %s: %s", path, e));
+            stderr().write_line(format!("cat: {0:s}: {1:s}", path, e));
             os::set_exit_status(1);
         }
     }
diff --git a/printenv/printenv.rs b/printenv/printenv.rs
index 33a4a4a95..ca980415c 100644
--- a/printenv/printenv.rs
+++ b/printenv/printenv.rs
@@ -38,7 +38,7 @@ fn main() {
         println("printenv 1.0.0");
         println("");
         println("Usage:");
-        println(fmt!("  %s [VARIABLE]... [OPTION]...", program));
+        println(format!("  {0:s} [VARIABLE]... [OPTION]...", program));
         println("");
         print(groups::usage("Prints the given environment VARIABLE(s), otherwise prints them all.", opts));
         return;
@@ -59,7 +59,7 @@ pub fn exec(args: ~[~str], separator: &str) {
     if args.is_empty() {
         let vars = os::env();
         for (env_var, value) in vars.move_iter() {
-            print(fmt!("%s=%s", env_var, value));
+            print(format!("{0:s}={1:s}", env_var, value));
             print(separator);
         }
         return;
diff --git a/yes/yes.rs b/yes/yes.rs
index a60eb29e8..49680ff90 100644
--- a/yes/yes.rs
+++ b/yes/yes.rs
@@ -37,7 +37,7 @@ fn main() {
         println("yes 1.0.0");
         println("");
         println("Usage:");
-        println(fmt!("  %s [STRING]... [OPTION]...", program));
+        println(format!("  {0:s} [STRING]... [OPTION]...", program));
         println("");
         print(groups::usage("Repeatedly output a line with all specified STRING(s), or 'y'.", opts));
         return;