Auto merge of #76160 - scileo:format-recovery, r=petrochenkov

bors · bors · commit 365b13c0e71f · 2020-09-02T19:29:27.000Z
Improve recovery on malformed format call The token following a format expression should be a comma. However, when it is replaced with a similar token (such as a dot), then the corresponding error is emitted, but the token is treated as a comma, and the parsing step continues. r? @petrochenkov
diff --git a/tests/ui/issue-3145.rs b/tests/ui/issue-3145.rs
@@ -1,3 +1,3 @@
 fn main() {
-    println!("{}" a); //~ERROR expected token: `,`
+    println!("{}" a); //~ERROR expected `,`, found `a`
 }
diff --git a/tests/ui/issue-3145.stderr b/tests/ui/issue-3145.stderr
@@ -1,7 +1,7 @@
-error: expected token: `,`
+error: expected `,`, found `a`
   --> $DIR/issue-3145.rs:2:19
    |
-LL |     println!("{}" a); //~ERROR expected token: `,`
+LL |     println!("{}" a); //~ERROR expected `,`, found `a`
    |                   ^ expected `,`
 
 error: aborting due to previous error

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`fn main() {`
`2`		- println!("{}" a); //~ERROR expected token: `,`
	`2`	+ println!("{}" a); //~ERROR expected `,`, found `a`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		-error: expected token: `,`
	`1`	+error: expected `,`, found `a`
`2`	`2`	`--> $DIR/issue-3145.rs:2:19`
`3`	`3`	`\|`
`4`		-LL \| println!("{}" a); //~ERROR expected token: `,`
	`4`	+LL \| println!("{}" a); //~ERROR expected `,`, found `a`
`5`	`5`	\| ^ expected `,`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`