Tweak parsing recovery of enums, for exprs and match arm patterns #117565

estebank · 2023-11-04T03:56:46Z

Tweak recovery of for (pat in expr) {} for more accurate spans.

When encountering match arm (pat if expr) => {}, recover and suggest removing parentheses. Fix #100825.

When encountering malformed enums, try more localized per-variant parse recovery.

Move parser recovery tests to subdirectory.

rustbot · 2023-11-04T03:56:54Z

r? @petrochenkov

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

compiler/rustc_parse/src/parser/expr.rs

oli-obk · 2023-11-04T11:21:39Z

r? @Nilstrieb for parser recovery stuff

Nilstrieb

This PR is quite big and changes a lot of things, making it hard to follow and doesn't allow merging the parts that are good already. It also makes it harder to see which test changes are caused by which code changes. Can you split it up into several PRs for the different parts, like enums, for loops and match arms?

tests/ui/parser/issues/issue-104088.rs

compiler/rustc_parse/src/parser/expr.rs

estebank · 2023-11-07T00:02:41Z

I split the commits as much as possible. I didn't bother making the test comments be accurate for each commit, but did include the .stderr changes corresponding to each of them.

Nilstrieb

Thanks for splitting, that makes it a lot easier to review. I've already reviewed the first 4 commits and they look good. I'll review the rest later.
If you want those merged already (making your job rebasing this easier) you can split them into a separate PR and r=me it. Or you can wait here if you prefer.

…=Nilstrieb Tweak error and move tests r? `@Nilstrieb` Split off rust-lang#117565.

Rollup merge of rust-lang#117990 - estebank:issue-100825-part-deux, r=Nilstrieb Tweak error and move tests r? `@Nilstrieb` Split off rust-lang#117565.

Nilstrieb

finally got around to review it fully, thanks for the patience and sorry for the delay, partially missing time and partially also just forgetting about it 💀

one suggestion for an improvement but that can be a follow up

Splitting up the PR into the many commits was definitely very helpful, thanks. For the future, I think you could have gone further and split every semantic change "pattern changes", "for loop changes", "enum changes", would have also made it easier to see the final UI test diff.

Nilstrieb · 2023-11-28T18:20:33Z

compiler/rustc_parse/src/parser/expr.rs

+    }
+
+    fn parse_match_arm_pat_and_guard(&mut self) -> PResult<'a, (P<Pat>, Option<P<Expr>>)> {
+        if self.token.kind == token::OpenDelim(Delimiter::Parenthesis) {


To make it obvious that the only semantic difference is in the error path, I'd prefer to move the call to parse_pat_allow_top_alt out of the if and move the if down to the error case.
This doesn't have to block the PR and can be done as a follow-up (it wouldn't be too bad if it never happens either, but it would be nice to have it).`

compiler/rustc_parse/src/parser/expr.rs

Nilstrieb · 2023-11-28T18:33:20Z

compiler/rustc_parse/src/parser/expr.rs

@@ -1,3 +1,4 @@
+// ignore-tidy-filelength


:(

(not really something this PR has to fix though, but it may be nice to split this file up further in the future, maybe by moving out more diagnostic paths)

Nilstrieb · 2023-11-28T18:38:19Z

Didn't follow all the recovery paths super closely, but I think I got the high level idea and it looks good. Specifically looked out for happy-path regressions, doesn't look like it had any.
So with that
@bors r+

bors · 2023-11-28T18:38:22Z

📌 Commit b4b5981 has been approved by Nilstrieb

It is now in the queue for this repository.

Tweak parsing recovery of enums, for exprs and match arm patterns Tweak recovery of `for (pat in expr) {}` for more accurate spans. When encountering `match` arm `(pat if expr) => {}`, recover and suggest removing parentheses. Fix rust-lang#100825. When encountering malformed enums, try more localized per-variant parse recovery. Move parser recovery tests to subdirectory.

When encountering match arm (pat if expr) => {}, recover and suggest removing parentheses. Fix rust-lang#100825.

Use the same approach used for match arm patterns.

estebank · 2023-11-29T20:13:05Z

@bors r=Nilstrieb

bors · 2023-11-29T20:13:07Z

📌 Commit 88453aa has been approved by Nilstrieb

It is now in the queue for this repository.

bors · 2023-11-29T20:15:23Z

⌛ Testing commit 88453aa with merge cc74eaa...

Tweak parsing recovery of enums, for exprs and match arm patterns Tweak recovery of `for (pat in expr) {}` for more accurate spans. When encountering `match` arm `(pat if expr) => {}`, recover and suggest removing parentheses. Fix rust-lang#100825. When encountering malformed enums, try more localized per-variant parse recovery. Move parser recovery tests to subdirectory.

bors · 2023-11-29T20:17:20Z

💔 Test failed - checks-actions

compiler-errors · 2023-11-29T20:25:10Z

@bors retry

rust-log-analyzer · 2023-11-29T20:40:25Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

bors · 2023-11-30T02:14:04Z

⌛ Testing commit 88453aa with merge 74fccd0...

bors · 2023-11-30T04:49:33Z

☀️ Test successful - checks-actions
Approved by: Nilstrieb
Pushing 74fccd0 to master...

rust-timer · 2023-11-30T06:11:03Z

Finished benchmarking commit (74fccd0): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.3%	[0.3%, 0.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.8%	[2.7%, 4.9%]	2
Improvements ✅ (primary)	-3.6%	[-3.6%, -3.6%]	1
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	-3.6%	[-3.6%, -3.6%]	1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 672.348s -> 673.65s (0.19%)
Artifact size: 313.40 MiB -> 313.41 MiB (0.00%)

rustbot assigned petrochenkov Nov 4, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 4, 2023

This comment has been minimized.

Sign in to view

oli-obk requested changes Nov 4, 2023

View reviewed changes

compiler/rustc_parse/src/parser/expr.rs Outdated Show resolved Hide resolved

rustbot assigned Nilstrieb and unassigned petrochenkov Nov 4, 2023

Nilstrieb requested changes Nov 5, 2023

View reviewed changes

tests/ui/parser/issues/issue-104088.rs Show resolved Hide resolved

compiler/rustc_parse/src/parser/expr.rs Outdated Show resolved Hide resolved

rustbot 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 Nov 5, 2023

estebank force-pushed the issue-100825 branch from 8c4ef89 to 6c90f92 Compare November 6, 2023 23:43

This comment was marked as resolved.

Sign in to view

estebank force-pushed the issue-100825 branch from 31f08e9 to 2fa7a9a Compare November 6, 2023 23:58

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 Nov 6, 2023

estebank force-pushed the issue-100825 branch from bcb830a to 9ad3697 Compare November 16, 2023 16:59

Nilstrieb reviewed Nov 16, 2023

View reviewed changes

estebank mentioned this pull request Nov 16, 2023

Tweak error and move tests #117990

Merged

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 16, 2023

Rollup merge of rust-lang#117990 - estebank:issue-100825-part-deux, r…

a5d7f8b

…=Nilstrieb Tweak error and move tests r? `@Nilstrieb` Split off rust-lang#117565.

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 17, 2023

Unrolled build for rust-lang#117990

36c774c

Rollup merge of rust-lang#117990 - estebank:issue-100825-part-deux, r=Nilstrieb Tweak error and move tests r? `@Nilstrieb` Split off rust-lang#117565.

estebank force-pushed the issue-100825 branch from 9ad3697 to b4b5981 Compare November 17, 2023 19:00

Nilstrieb approved these changes Nov 28, 2023

View reviewed changes

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 Nov 28, 2023

estebank added 8 commits November 29, 2023 18:47

Account for (pat if expr) => {}

c473189

When encountering match arm (pat if expr) => {}, recover and suggest removing parentheses. Fix rust-lang#100825.

Change how for (x in foo) {} is handled

0ff331b

Use the same approach used for match arm patterns.

Fix test and move to more appropriate directory

bd1feb8

Fix tidy

147faa5

review comment: rework parse_for_head to reduce branching

1575e6e

Always emit help when failing to parse enum variant

4e52438

fix rebase

cb08634

Avoid unnecessary pattern parse errors on ref box

88453aa

estebank force-pushed the issue-100825 branch from cfa2921 to 88453aa Compare November 29, 2023 18:47

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 29, 2023

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

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 Nov 29, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 30, 2023

bors merged commit 74fccd0 into rust-lang:master Nov 30, 2023
12 checks passed

rustbot added this to the 1.76.0 milestone Nov 30, 2023

bors mentioned this pull request Nov 30, 2023

Tweak unclosed generics errors #117922

Merged

matthiaskrgr mentioned this pull request Jan 9, 2024

ICE: None in compiler/rustc_mir_build/src/build/matches/mod.rs #119786

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tweak parsing recovery of enums, for exprs and match arm patterns #117565

Tweak parsing recovery of enums, for exprs and match arm patterns #117565

estebank commented Nov 4, 2023 •

edited

rustbot commented Nov 4, 2023

This comment has been minimized.

oli-obk commented Nov 4, 2023

Nilstrieb left a comment

This comment was marked as resolved.

estebank commented Nov 7, 2023

Nilstrieb left a comment

Nilstrieb left a comment

Nilstrieb Nov 28, 2023

Nilstrieb Nov 28, 2023

Nilstrieb commented Nov 28, 2023

bors commented Nov 28, 2023

estebank commented Nov 29, 2023

bors commented Nov 29, 2023

bors commented Nov 29, 2023

bors commented Nov 29, 2023

compiler-errors commented Nov 29, 2023

rust-log-analyzer commented Nov 29, 2023

bors commented Nov 30, 2023

bors commented Nov 30, 2023

rust-timer commented Nov 30, 2023

Tweak parsing recovery of enums, for exprs and match arm patterns #117565

Tweak parsing recovery of enums, for exprs and match arm patterns #117565

Conversation

estebank commented Nov 4, 2023 • edited

rustbot commented Nov 4, 2023

This comment has been minimized.

oli-obk commented Nov 4, 2023

Nilstrieb left a comment

Choose a reason for hiding this comment

This comment was marked as resolved.

estebank commented Nov 7, 2023

Nilstrieb left a comment

Choose a reason for hiding this comment

Nilstrieb left a comment

Choose a reason for hiding this comment

Nilstrieb Nov 28, 2023

Choose a reason for hiding this comment

Nilstrieb Nov 28, 2023

Choose a reason for hiding this comment

Nilstrieb commented Nov 28, 2023

bors commented Nov 28, 2023

estebank commented Nov 29, 2023

bors commented Nov 29, 2023

bors commented Nov 29, 2023

bors commented Nov 29, 2023

compiler-errors commented Nov 29, 2023

rust-log-analyzer commented Nov 29, 2023

bors commented Nov 30, 2023

bors commented Nov 30, 2023

rust-timer commented Nov 30, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

estebank commented Nov 4, 2023 •

edited