about summary refs log tree commit diff
path: root/src/test/ui/parser/issues
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-08-04 22:24:59 +0200
committerGitHub <noreply@github.com>2022-08-04 22:24:59 +0200
commitf6ea143f939934e2c3a6068feff4bd066cc19ff4 (patch)
treea040cd4dae8a569d2cf143e438917749ea1319b8 /src/test/ui/parser/issues
parent3830ecaa8db798d2727cbdfa4ddf314ff938f268 (diff)
parent9d5c74e16ae4bca9efb0fbc5c4818200ea8b5980 (diff)
downloadrust-f6ea143f939934e2c3a6068feff4bd066cc19ff4.tar.gz
rust-f6ea143f939934e2c3a6068feff4bd066cc19ff4.zip
Rollup merge of #98796 - compiler-errors:no-semi-if-comma, r=estebank
Do not exclusively suggest `;` when `,` is also a choice

Fixes #96791
Diffstat (limited to 'src/test/ui/parser/issues')
-rw-r--r--src/test/ui/parser/issues/issue-88770.rs2
-rw-r--r--src/test/ui/parser/issues/issue-88770.stderr16
2 files changed, 6 insertions, 12 deletions
diff --git a/src/test/ui/parser/issues/issue-88770.rs b/src/test/ui/parser/issues/issue-88770.rs
index bf89033f560..bb69951c7b4 100644
--- a/src/test/ui/parser/issues/issue-88770.rs
+++ b/src/test/ui/parser/issues/issue-88770.rs
@@ -3,7 +3,7 @@
 // error-pattern:this file contains an unclosed delimiter
 // error-pattern:expected one of
 // error-pattern:missing `in` in `for` loop
-// error-pattern:expected `;`, found `e`
+// error-pattern:expected one of `!`, `)`, `,`, `.`, `::`, `;`, `?`, `{`, or an operator, found `e`
 
 fn m(){print!("",(c for&g
 u
diff --git a/src/test/ui/parser/issues/issue-88770.stderr b/src/test/ui/parser/issues/issue-88770.stderr
index c7e24155d16..4e3a21613ec 100644
--- a/src/test/ui/parser/issues/issue-88770.stderr
+++ b/src/test/ui/parser/issues/issue-88770.stderr
@@ -48,19 +48,13 @@ error: expected one of `!`, `)`, `,`, `.`, `::`, `?`, `{`, or an operator, found
 LL | fn m(){print!("",(c for&g
    |                     ^^^ expected one of 8 possible tokens
 
-error: expected `;`, found `e`
-  --> $DIR/issue-88770.rs:10:2
+error: expected one of `!`, `)`, `,`, `.`, `::`, `;`, `?`, `{`, or an operator, found `e`
+  --> $DIR/issue-88770.rs:11:1
    |
 LL | e
-   |  ^ help: add `;` here
+   |  - expected one of 9 possible tokens
 LL | e
-   | - unexpected token
+   | ^ unexpected token
 
-error: expected one of `!`, `,`, `.`, `::`, `?`, `{`, or an operator, found `)`
-  --> $DIR/issue-88770.rs:11:3
-   |
-LL | e
-   |   ^ expected one of 7 possible tokens
-
-error: aborting due to 7 previous errors
+error: aborting due to 6 previous errors