about summary refs log tree commit diff
path: root/src/test/ui/codemap_tests
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2019-09-01 15:09:05 -0700
committerEsteban Küber <esteban@kuber.com.ar>2019-09-01 15:10:30 -0700
commit4dec571ec69e14673b4e185e9881e4b71cd42aaa (patch)
tree3829cd712ef5319935eade0293d46877154f67fc /src/test/ui/codemap_tests
parentfba38ac27e2ade309f4c2504a6d6cd3556972a28 (diff)
downloadrust-4dec571ec69e14673b4e185e9881e4b71cd42aaa.tar.gz
rust-4dec571ec69e14673b4e185e9881e4b71cd42aaa.zip
Be accurate on `format!` parse error expectations
Diffstat (limited to 'src/test/ui/codemap_tests')
-rw-r--r--src/test/ui/codemap_tests/bad-format-args.rs2
-rw-r--r--src/test/ui/codemap_tests/bad-format-args.stderr4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/codemap_tests/bad-format-args.rs b/src/test/ui/codemap_tests/bad-format-args.rs
index 9f901857744..dff248344a5 100644
--- a/src/test/ui/codemap_tests/bad-format-args.rs
+++ b/src/test/ui/codemap_tests/bad-format-args.rs
@@ -1,5 +1,5 @@
 fn main() {
     format!(); //~ ERROR requires at least a format string argument
     format!("" 1); //~ ERROR expected token: `,`
-    format!("", 1 1); //~ ERROR expected token: `,`
+    format!("", 1 1); //~ ERROR expected one of
 }
diff --git a/src/test/ui/codemap_tests/bad-format-args.stderr b/src/test/ui/codemap_tests/bad-format-args.stderr
index 5b01314d8ad..3372ef6dea1 100644
--- a/src/test/ui/codemap_tests/bad-format-args.stderr
+++ b/src/test/ui/codemap_tests/bad-format-args.stderr
@@ -12,11 +12,11 @@ error: expected token: `,`
 LL |     format!("" 1);
    |                ^ expected `,`
 
-error: expected token: `,`
+error: expected one of `,`, `.`, `?`, or an operator, found `1`
   --> $DIR/bad-format-args.rs:4:19
    |
 LL |     format!("", 1 1);
-   |                   ^ expected `,`
+   |                   ^ expected one of `,`, `.`, `?`, or an operator here
 
 error: aborting due to 3 previous errors