5 files changed, 47 insertions, 47 deletions
diff --git a/src/test/compile-fail/ifmt-bad-arg.rs b/src/test/compile-fail/ifmt-bad-arg.rs
index 875ad0d2b62..273394794a9 100644
--- a/src/test/compile-fail/ifmt-bad-arg.rs
+++ b/src/test/compile-fail/ifmt-bad-arg.rs
@@ -9,66 +9,66 @@
 // except according to those terms.
 
 fn main() {
-    // bad arguments to the ifmt! call
+    // bad arguments to the format! call
 
-    ifmt!();                //~ ERROR: expects at least one
-    ifmt!("{}");            //~ ERROR: invalid reference to argument
+    format!();                //~ ERROR: requires at least a format string
+    format!("{}");            //~ ERROR: invalid reference to argument
 
-    ifmt!("{1}", 1);        //~ ERROR: invalid reference to argument `1`
+    format!("{1}", 1);        //~ ERROR: invalid reference to argument `1`
                             //~^ ERROR: argument never used
-    ifmt!("{foo}");         //~ ERROR: no argument named `foo`
+    format!("{foo}");         //~ ERROR: no argument named `foo`
 
-    ifmt!("{}", 1, 2);               //~ ERROR: argument never used
-    ifmt!("{1}", 1, 2);              //~ ERROR: argument never used
-    ifmt!("{}", 1, foo=2);           //~ ERROR: named argument never used
-    ifmt!("{foo}", 1, foo=2);        //~ ERROR: argument never used
-    ifmt!("", foo=2);                //~ ERROR: named argument never used
+    format!("{}", 1, 2);               //~ ERROR: argument never used
+    format!("{1}", 1, 2);              //~ ERROR: argument never used
+    format!("{}", 1, foo=2);           //~ ERROR: named argument never used
+    format!("{foo}", 1, foo=2);        //~ ERROR: argument never used
+    format!("", foo=2);                //~ ERROR: named argument never used
 
-    ifmt!("{0:d} {0:s}", 1);         //~ ERROR: redeclared with type `s`
-    ifmt!("{foo:d} {foo:s}", foo=1); //~ ERROR: redeclared with type `s`
+    format!("{0:d} {0:s}", 1);         //~ ERROR: redeclared with type `s`
+    format!("{foo:d} {foo:s}", foo=1); //~ ERROR: redeclared with type `s`
 
-    ifmt!("{foo}", foo=1, foo=2);    //~ ERROR: duplicate argument
-    ifmt!("#");                      //~ ERROR: `#` reference used
-    ifmt!("", foo=1, 2);             //~ ERROR: positional arguments cannot follow
-    ifmt!("" 1);                     //~ ERROR: expected token: `,`
-    ifmt!("", 1 1);                  //~ ERROR: expected token: `,`
+    format!("{foo}", foo=1, foo=2);    //~ ERROR: duplicate argument
+    format!("#");                      //~ ERROR: `#` reference used
+    format!("", foo=1, 2);             //~ ERROR: positional arguments cannot follow
+    format!("" 1);                     //~ ERROR: expected token: `,`
+    format!("", 1 1);                  //~ ERROR: expected token: `,`
 
-    ifmt!("{0, select, a{} a{} other{}}", "a");    //~ ERROR: duplicate selector
-    ifmt!("{0, plural, =1{} =1{} other{}}", 1u);   //~ ERROR: duplicate selector
-    ifmt!("{0, plural, one{} one{} other{}}", 1u); //~ ERROR: duplicate selector
+    format!("{0, select, a{} a{} other{}}", "a");    //~ ERROR: duplicate selector
+    format!("{0, plural, =1{} =1{} other{}}", 1u);   //~ ERROR: duplicate selector
+    format!("{0, plural, one{} one{} other{}}", 1u); //~ ERROR: duplicate selector
 
     // bad syntax of the format string
 
-    ifmt!("{"); //~ ERROR: unterminated format string
-    ifmt!("\\ "); //~ ERROR: invalid escape
-    ifmt!("\\"); //~ ERROR: expected an escape
+    format!("{"); //~ ERROR: unterminated format string
+    format!("\\ "); //~ ERROR: invalid escape
+    format!("\\"); //~ ERROR: expected an escape
 
-    ifmt!("{0, }", 1); //~ ERROR: expected method
-    ifmt!("{0, foo}", 1); //~ ERROR: unknown method
-    ifmt!("{0, select}", "a"); //~ ERROR: must be followed by
-    ifmt!("{0, plural}", 1); //~ ERROR: must be followed by
+    format!("{0, }", 1); //~ ERROR: expected method
+    format!("{0, foo}", 1); //~ ERROR: unknown method
+    format!("{0, select}", "a"); //~ ERROR: must be followed by
+    format!("{0, plural}", 1); //~ ERROR: must be followed by
 
-    ifmt!("{0, select, a{{}", 1); //~ ERROR: must be terminated
-    ifmt!("{0, select, {} other{}}", "a"); //~ ERROR: empty selector
-    ifmt!("{0, select, other{} other{}}", "a"); //~ ERROR: multiple `other`
-    ifmt!("{0, plural, offset: other{}}", "a"); //~ ERROR: must be an integer
-    ifmt!("{0, plural, offset 1 other{}}", "a"); //~ ERROR: be followed by `:`
-    ifmt!("{0, plural, =a{} other{}}", "a"); //~ ERROR: followed by an integer
-    ifmt!("{0, plural, a{} other{}}", "a"); //~ ERROR: unexpected plural
-    ifmt!("{0, select, a{}}", "a"); //~ ERROR: must provide an `other`
-    ifmt!("{0, plural, =1{}}", "a"); //~ ERROR: must provide an `other`
+    format!("{0, select, a{{}", 1); //~ ERROR: must be terminated
+    format!("{0, select, {} other{}}", "a"); //~ ERROR: empty selector
+    format!("{0, select, other{} other{}}", "a"); //~ ERROR: multiple `other`
+    format!("{0, plural, offset: other{}}", "a"); //~ ERROR: must be an integer
+    format!("{0, plural, offset 1 other{}}", "a"); //~ ERROR: be followed by `:`
+    format!("{0, plural, =a{} other{}}", "a"); //~ ERROR: followed by an integer
+    format!("{0, plural, a{} other{}}", "a"); //~ ERROR: unexpected plural
+    format!("{0, select, a{}}", "a"); //~ ERROR: must provide an `other`
+    format!("{0, plural, =1{}}", "a"); //~ ERROR: must provide an `other`
 
-    ifmt!("{0, plural, other{{0:s}}}", "a"); //~ ERROR: previously used as
-    ifmt!("{:s} {0, plural, other{}}", "a"); //~ ERROR: argument used to
-    ifmt!("{0, select, other{}} \
-           {0, plural, other{}}", "a");
+    format!("{0, plural, other{{0:s}}}", "a"); //~ ERROR: previously used as
+    format!("{:s} {0, plural, other{}}", "a"); //~ ERROR: argument used to
+    format!("{0, select, other{}} \
+             {0, plural, other{}}", "a");
     //~^ ERROR: declared with multiple formats
 
     // It should be illegal to use implicit placement arguments nested inside of
     // format strings because otherwise the "internal pointer of which argument
     // is next" would be invalidated if different cases had different numbers of
     // arguments.
-    ifmt!("{0, select, other{{}}}", "a"); //~ ERROR: cannot use implicit
-    ifmt!("{0, plural, other{{}}}", 1); //~ ERROR: cannot use implicit
-    ifmt!("{0, plural, other{{1:.*d}}}", 1, 2); //~ ERROR: cannot use implicit
+    format!("{0, select, other{{}}}", "a"); //~ ERROR: cannot use implicit
+    format!("{0, plural, other{{}}}", 1); //~ ERROR: cannot use implicit
+    format!("{0, plural, other{{1:.*d}}}", 1, 2); //~ ERROR: cannot use implicit
 }
diff --git a/src/test/compile-fail/ifmt-bad-plural.rs b/src/test/compile-fail/ifmt-bad-plural.rs
index 76a697b174f..21c2d4b5934 100644
--- a/src/test/compile-fail/ifmt-bad-plural.rs
+++ b/src/test/compile-fail/ifmt-bad-plural.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 fn main() {
-    ifmt!("{0, plural, other{}}", "a");
+    format!("{0, plural, other{}}", "a");
     //~^ ERROR: expected uint but found
 }
diff --git a/src/test/compile-fail/ifmt-bad-select.rs b/src/test/compile-fail/ifmt-bad-select.rs
index abe3b6ed65a..8a72b7920d7 100644
--- a/src/test/compile-fail/ifmt-bad-select.rs
+++ b/src/test/compile-fail/ifmt-bad-select.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 fn main() {
-    ifmt!("{0, select, other{}}", 2);
+    format!("{0, select, other{}}", 2);
     //~^ ERROR: expected &str but found integral
 }
diff --git a/src/test/compile-fail/ifmt-unimpl.rs b/src/test/compile-fail/ifmt-unimpl.rs
index 427f5ea562c..830b041bbc7 100644
--- a/src/test/compile-fail/ifmt-unimpl.rs
+++ b/src/test/compile-fail/ifmt-unimpl.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 fn main() {
-    ifmt!("{:d}", "3");
+    format!("{:d}", "3");
     //~^ ERROR: failed to find an implementation of trait std::fmt::Signed
 }
diff --git a/src/test/compile-fail/ifmt-unknown-trait.rs b/src/test/compile-fail/ifmt-unknown-trait.rs
index 85556f9501a..d90b3d3cf81 100644
--- a/src/test/compile-fail/ifmt-unknown-trait.rs
+++ b/src/test/compile-fail/ifmt-unknown-trait.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 fn main() {
-    ifmt!("{:notimplemented}", "3");
+    format!("{:notimplemented}", "3");
     //~^ ERROR: unknown format trait `notimplemented`
 }