about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2013-09-12 19:36:58 -0700
committerAlex Crichton <alex@alexcrichton.com>2013-09-15 01:09:00 -0700
commitcfe3db810b7991ef1144afaed4156ddc2586efef (patch)
tree070edc52983621820a65909f2b091d8bc152f43b /src/test
parent36872e4180331e4a7f00329abe7972488ce216cf (diff)
downloadrust-cfe3db810b7991ef1144afaed4156ddc2586efef.tar.gz
rust-cfe3db810b7991ef1144afaed4156ddc2586efef.zip
Reduce the amount of complexity in format!
This renames the syntax-extension file to format from ifmt, and it also reduces
the amount of complexity inside by defining all other macros in terms of
format_args!
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/ifmt-bad-arg.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/test/compile-fail/ifmt-bad-arg.rs b/src/test/compile-fail/ifmt-bad-arg.rs
index 5da73a495f6..35085feaf15 100644
--- a/src/test/compile-fail/ifmt-bad-arg.rs
+++ b/src/test/compile-fail/ifmt-bad-arg.rs
@@ -11,7 +11,6 @@
 fn main() {
     // bad arguments to the format! call
 
-    format!();                //~ ERROR: requires at least a format string
     format!("{}");            //~ ERROR: invalid reference to argument
 
     format!("{1}", 1);        //~ ERROR: invalid reference to argument `1`
@@ -30,8 +29,6 @@ fn main() {
     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: `,`
 
     format!("{0, select, a{} a{} other{}}", "a");    //~ ERROR: duplicate selector
     format!("{0, plural, =1{} =1{} other{}}", 1u);   //~ ERROR: duplicate selector
@@ -74,4 +71,9 @@ fn main() {
 
     format!("foo } bar"); //~ ERROR: unmatched `}` found
     format!("foo }"); //~ ERROR: unmatched `}` found
+
+    // FIXME(#5794) the spans on these errors are pretty terrible
+    //format!();
+    //format!("" 1);
+    //format!("", 1 1);
 }