Always emit unclosed delimiter diagnostics #58903

estebank · 2019-03-03T20:15:26Z

Fix #58886.

rust-highfive · 2019-03-03T20:15:29Z

r? @petrochenkov

(rust_highfive has picked a reviewer for you, use r? to override)

Centril · 2019-03-03T22:16:19Z

@estebank Does this regression exist on the current beta compiler? If so we should beta backport.

estebank · 2019-03-04T00:40:31Z

@Centril I thought beta was spared, but alas, it wasn't.

Centril · 2019-03-04T00:43:48Z

@estebank Aw; crap... 😭; At least we caught it before it went to stable 🎉!

src/libsyntax/parse/parser.rs

petrochenkov · 2019-03-05T19:30:08Z

@bors r+

bors · 2019-03-05T19:30:09Z

📌 Commit cc077bcd2f625101eee450c0e0083210d2e51af1 has been approved by petrochenkov

estebank · 2019-03-07T02:35:55Z

@bors p=52

Fix rust-lang#58856.

estebank · 2019-03-07T03:10:48Z

@petrochenkov subsuming #58863 into this PR to avoid merge conflict.

estebank · 2019-03-07T03:21:59Z

@bors r=petrochenkov

bors · 2019-03-07T03:21:59Z

📌 Commit 551ea65 has been approved by petrochenkov

estebank · 2019-03-07T19:43:03Z

src/test/ui/issues/issue-58856-2.stderr

+LL |     }
+   |      - expected one of 11 possible tokens here
+LL | }
+   | ^ unexpected token


Finally identified what is causing these: when reaching the end of the current TokenTree, self.bump() will advance to a close token corresponding to the opening delimiter. There are two options: 1) attempt to rewrite the TokenTree representation that the Parser has once we suggest a close delim (high potential for bad lurking bugs), or 2) catch this specific case in expect_one_of, but that might be too magical.

pietroalbini · 2019-03-08T06:40:17Z

@bors p=2

bors · 2019-03-08T08:39:21Z

⌛ Testing commit 551ea65 with merge b58a006...

Always emit unclosed delimiter diagnostics Fix #58886.

bors · 2019-03-08T11:43:31Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: petrochenkov
Pushing b58a006 to master...

pnkfelix · 2019-03-14T15:08:39Z

discussed at T-compiler meeting. beta-accepted.

…i-obk Don't fatal when calling `expect_one_of` when recovering arg in `parse_seq` In `parse_seq`, when parsing a sequence of token-separated items, if we don't see a separator, we try to parse another item eagerly in order to give a good diagnostic and recover from a missing separator: https://github.com/rust-lang/rust/blob/d1a0fa5ed3ffe52d72f761d3c95cbeb0a9cdfe66/compiler/rustc_parse/src/parser/mod.rs#L900-L901 If parsing the item itself calls `expect_one_of`, then we will fatal because of rust-lang#58903: https://github.com/rust-lang/rust/blob/d1a0fa5ed3ffe52d72f761d3c95cbeb0a9cdfe66/compiler/rustc_parse/src/parser/mod.rs#L513-L516 For `precise_capturing` feature I implemented, we do end up calling `expected_one_of`: https://github.com/rust-lang/rust/blob/d1a0fa5ed3ffe52d72f761d3c95cbeb0a9cdfe66/compiler/rustc_parse/src/parser/ty.rs#L712-L714 This leads the compiler to fatal *before* having emitted the first error, leading to absolutely no useful information for the user about what happened in the parser. This PR makes it so that we stop doing that. Fixes rust-lang#124195

Rollup merge of rust-lang#124169 - compiler-errors:parser-fatal, r=oli-obk Don't fatal when calling `expect_one_of` when recovering arg in `parse_seq` In `parse_seq`, when parsing a sequence of token-separated items, if we don't see a separator, we try to parse another item eagerly in order to give a good diagnostic and recover from a missing separator: https://github.com/rust-lang/rust/blob/d1a0fa5ed3ffe52d72f761d3c95cbeb0a9cdfe66/compiler/rustc_parse/src/parser/mod.rs#L900-L901 If parsing the item itself calls `expect_one_of`, then we will fatal because of rust-lang#58903: https://github.com/rust-lang/rust/blob/d1a0fa5ed3ffe52d72f761d3c95cbeb0a9cdfe66/compiler/rustc_parse/src/parser/mod.rs#L513-L516 For `precise_capturing` feature I implemented, we do end up calling `expected_one_of`: https://github.com/rust-lang/rust/blob/d1a0fa5ed3ffe52d72f761d3c95cbeb0a9cdfe66/compiler/rustc_parse/src/parser/ty.rs#L712-L714 This leads the compiler to fatal *before* having emitted the first error, leading to absolutely no useful information for the user about what happened in the parser. This PR makes it so that we stop doing that. Fixes rust-lang#124195

rust-highfive assigned petrochenkov Mar 3, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 3, 2019

estebank added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 4, 2019

This comment has been minimized.

Sign in to view

estebank force-pushed the forgetful-delims branch 2 times, most recently from 5d4334c to 163191a Compare March 4, 2019 03:15

This comment has been minimized.

Sign in to view

estebank force-pushed the forgetful-delims branch from 163191a to a3da7da Compare March 4, 2019 03:41

estebank changed the title ~~Emit unclosed delimiter diagnostics or panic if this hasn't happened~~ Emit unclosed delimiter diagnostics Mar 4, 2019

estebank changed the title ~~Emit unclosed delimiter diagnostics~~ Always emit unclosed delimiter diagnostics Mar 4, 2019

petrochenkov reviewed Mar 4, 2019

View reviewed changes

src/libsyntax/parse/parser.rs Outdated Show resolved Hide resolved

petrochenkov reviewed Mar 4, 2019

View reviewed changes

src/libsyntax/parse/parser.rs Outdated Show resolved Hide resolved

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 4, 2019

estebank force-pushed the forgetful-delims branch from 2efe0a8 to fdde883 Compare March 4, 2019 21:01

estebank added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 4, 2019

This comment has been minimized.

Sign in to view

estebank force-pushed the forgetful-delims branch from fdde883 to cc077bc Compare March 4, 2019 21:42

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2019

estebank mentioned this pull request Mar 6, 2019

Parsing bug in 02/22 nightly #58962

Closed

Do not panic on missing close paren

2ec7d0b

Fix rust-lang#58856.

estebank added 7 commits March 6, 2019 18:46

Panic when unmatched delimiters aren't emitted

c70a516

Emit missing unclosed delimiter errors

51d0e86

Collect unclosed delimiters in parent parser

ac6cc2d

Always emit mismatched delim errors, never panic

f156d92

Add regression test for rust-lang#58886

3818f8b

Simplify code

6f0f2fc

Rely on drop to emit unclosed delims

551ea65

estebank force-pushed the forgetful-delims branch from cc077bc to 551ea65 Compare March 7, 2019 03:09

estebank mentioned this pull request Mar 7, 2019

Do not panic on missing close paren #58863

Closed

Centril added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 7, 2019

estebank commented Mar 7, 2019

View reviewed changes

bors added a commit that referenced this pull request Mar 8, 2019

Auto merge of #58903 - estebank:forgetful-delims, r=petrochenkov

b58a006

Always emit unclosed delimiter diagnostics Fix #58886.

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 8, 2019

bors merged commit 551ea65 into rust-lang:master Mar 8, 2019

euclio mentioned this pull request Mar 8, 2019

x.py build passing with parse error in file #58826

Closed

pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Mar 14, 2019

pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 16, 2019

ehuss mentioned this pull request Oct 9, 2021

Compiling a Rocket application on the 2015 edition doesn't emit errors #89699

Closed

estebank deleted the forgetful-delims branch November 9, 2023 05:20

compiler-errors mentioned this pull request Apr 19, 2024

Don't fatal when calling expect_one_of when recovering arg in parse_seq #124169

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Always emit unclosed delimiter diagnostics #58903

Always emit unclosed delimiter diagnostics #58903

estebank commented Mar 3, 2019

rust-highfive commented Mar 3, 2019

Centril commented Mar 3, 2019

estebank commented Mar 4, 2019

Centril commented Mar 4, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

petrochenkov commented Mar 5, 2019

bors commented Mar 5, 2019

estebank commented Mar 7, 2019

estebank commented Mar 7, 2019 •

edited

Loading

estebank commented Mar 7, 2019

bors commented Mar 7, 2019

estebank Mar 7, 2019

pietroalbini commented Mar 8, 2019

bors commented Mar 8, 2019

bors commented Mar 8, 2019

pnkfelix commented Mar 14, 2019

Always emit unclosed delimiter diagnostics #58903

Always emit unclosed delimiter diagnostics #58903

Conversation

estebank commented Mar 3, 2019

rust-highfive commented Mar 3, 2019

Centril commented Mar 3, 2019

estebank commented Mar 4, 2019

Centril commented Mar 4, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

petrochenkov commented Mar 5, 2019

bors commented Mar 5, 2019

estebank commented Mar 7, 2019

estebank commented Mar 7, 2019 • edited Loading

estebank commented Mar 7, 2019

bors commented Mar 7, 2019

estebank Mar 7, 2019

Choose a reason for hiding this comment

pietroalbini commented Mar 8, 2019

bors commented Mar 8, 2019

bors commented Mar 8, 2019

pnkfelix commented Mar 14, 2019

estebank commented Mar 7, 2019 •

edited

Loading