diff options
| author | Esteban Küber <esteban@kuber.com.ar> | 2019-09-01 15:09:05 -0700 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2019-09-01 15:10:30 -0700 |
| commit | 4dec571ec69e14673b4e185e9881e4b71cd42aaa (patch) | |
| tree | 3829cd712ef5319935eade0293d46877154f67fc /src/test | |
| parent | fba38ac27e2ade309f4c2504a6d6cd3556972a28 (diff) | |
| download | rust-4dec571ec69e14673b4e185e9881e4b71cd42aaa.tar.gz rust-4dec571ec69e14673b4e185e9881e4b71cd42aaa.zip | |
Be accurate on `format!` parse error expectations
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/codemap_tests/bad-format-args.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/codemap_tests/bad-format-args.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/type/ascription/issue-54516.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/type/ascription/issue-54516.stderr | 4 |
4 files changed, 6 insertions, 6 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 diff --git a/src/test/ui/type/ascription/issue-54516.rs b/src/test/ui/type/ascription/issue-54516.rs index 6d65760e299..b53bfe5df03 100644 --- a/src/test/ui/type/ascription/issue-54516.rs +++ b/src/test/ui/type/ascription/issue-54516.rs @@ -2,5 +2,5 @@ use std::collections::BTreeMap; fn main() { println!("{}", std::mem:size_of::<BTreeMap<u32, u32>>()); - //~^ ERROR expected token: `,` + //~^ ERROR expected one of } diff --git a/src/test/ui/type/ascription/issue-54516.stderr b/src/test/ui/type/ascription/issue-54516.stderr index a846f3bc320..97942904a0f 100644 --- a/src/test/ui/type/ascription/issue-54516.stderr +++ b/src/test/ui/type/ascription/issue-54516.stderr @@ -1,8 +1,8 @@ -error: expected token: `,` +error: expected one of `!`, `,`, or `::`, found `(` --> $DIR/issue-54516.rs:4:58 | LL | println!("{}", std::mem:size_of::<BTreeMap<u32, u32>>()); - | - ^ expected `,` + | - ^ expected one of `!`, `,`, or `::` here | | | help: maybe write a path separator here: `::` | |