---

yaml
---
r: 125691
b: refs/heads/try
c: 820a558
h: refs/heads/master
i:
  125689: 699fff2
  125687: eba3edb
v: v3

Author: treeman

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: f2fa55903e378368ed9173560f03a0ef16e371c2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
-refs/heads/try: 18717fcf6886b803e04bbe21689fd61becab1015
+refs/heads/try: 820a55857a132a14f5a69960f7cfbeec39b5360f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libsyntax/ext/format.rs

@@ -216,10 +216,10 @@ impl<'a, 'b> Context<'a, 'b> {
     }
 
     fn describe_num_args(&self) -> String {
-        if self.args.len() == 1 {
-            "there is 1 argument".to_string()
-        } else {
-            format!("there are {} arguments", self.args.len())
+        match self.args.len() {
+            0 => "no arguments given".to_string(),
+            1 => "there is 1 argument".to_string(),
+            x => format!("there are {} arguments", x),
         }
     }
 

branches/try/src/test/compile-fail/ifmt-bad-arg.rs

@@ -32,13 +32,17 @@ fn main() {
     // bad number of arguments, see #15780
 
     format!("{0}");
-    //^~ ERROR invalid reference to argument `0` (there are 0 arguments)
+    //~^ ERROR invalid reference to argument `0` (no arguments given)
 
     format!("{0} {1}", 1);
-    //^~ ERROR invalid reference to argument `1` (there is 1 argument)
+    //~^ ERROR invalid reference to argument `1` (there is 1 argument)
 
     format!("{0} {1} {2}", 1, 2);
-    //^~ ERROR invalid reference to argument `2` (there are 2 arguments)
+    //~^ ERROR invalid reference to argument `2` (there are 2 arguments)
+
+    format!("{0} {1}");
+    //~^ ERROR invalid reference to argument `0` (no arguments given)
+    //~^^ ERROR invalid reference to argument `1` (no arguments given)
 
     // bad syntax of the format string