Skip to content

Use heuristics to recover parsing of missing ; - #65640

Merged
bors merged 3 commits into
rust-lang:masterfrom
estebank:recover-missing-semi
Oct 29, 2019
Merged

Use heuristics to recover parsing of missing ;#65640
bors merged 3 commits into
rust-lang:masterfrom
estebank:recover-missing-semi

Conversation

@estebank

@estebankestebank commented Oct 20, 2019

Copy link
Copy Markdown
Contributor
  • Detect , and : typos where ; was intended.
  • When the next token could have been the start of a new statement,
    detect a missing semicolon.

Fix#48160, fix#44767 (after adding note about statements).

@rust-highfive

rust-highfive commented Oct 20, 2019

Copy link
Copy Markdown
Contributor

r? @petrochenkov

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 20, 2019
@estebank

estebank commented Oct 20, 2019

Copy link
Copy Markdown
ContributorAuthor

Still needs a bit of a clean up, but the idea is to detect some common typos that can occur during development and the lack of a semicolon, which is also quite common when writing code.

@rust-highfive

This comment has been minimized.

Sign in to view
@CentrilCentril self-assigned this Oct 20, 2019
Centril
Centril reviewed Oct 20, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser/diagnostics.rs Outdated
Comment threadsrc/libsyntax/parse/parser/diagnostics.rs Outdated
Comment threadsrc/libsyntax/parse/parser/diagnostics.rs Outdated
Comment threadsrc/libsyntax/parse/token.rs Outdated
Comment threadsrc/libsyntax/parse/parser/diagnostics.rs Outdated
Comment threadsrc/libsyntax/parse/parser/diagnostics.rs Outdated
Comment threadsrc/libsyntax/parse/parser/item.rs Outdated
@estebank
estebankforce-pushed the recover-missing-semi branch from 1b45a9b to dd05f9fCompareOctober 22, 2019 18:34
@rust-highfive

This comment has been minimized.

Sign in to view
@estebankestebank changed the title [wip] Use heuristics to recover parsing of missing ;Use heuristics to recover parsing of missing ;Oct 22, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@RalfJung

RalfJung commented Oct 22, 2019

Copy link
Copy Markdown
Member

Could not resolve host: rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com

@bors retry

@borsbors 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 Oct 22, 2019
@petrochenkovpetrochenkov removed their assignment Oct 22, 2019
@estebank
estebankforce-pushed the recover-missing-semi branch from 44947a8 to 7232f47CompareOctober 23, 2019 23:19
@estebank

estebank commented Oct 24, 2019

Copy link
Copy Markdown
ContributorAuthor

r? @Centril

Centril
Centril reviewed Oct 24, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser/diagnostics.rs Outdated
Comment threadsrc/libsyntax/parse/parser/diagnostics.rs Outdated

@CentrilCentrilOct 24, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logic here seems very similar to the case in my comment above -- a refactoring opportunity?

Comment threadsrc/libsyntax/parse/parser/diagnostics.rs Outdated
@CentrilCentril 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 24, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@estebank
estebankforce-pushed the recover-missing-semi branch from de4d5fb to 01741d2CompareOctober 25, 2019 00:57
@rust-highfive

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@estebank
estebankforce-pushed the recover-missing-semi branch from 01741d2 to 1c1778bCompareOctober 25, 2019 18:21
@estebankestebank 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 Oct 25, 2019
estebank
estebank commented Oct 25, 2019
View reviewed changes
Comment threadsrc/test/ui/parser/recover-missing-semi.stderr Outdated

@estebankestebankOct 25, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the look of this error, but it is slightly misleading because it could have been any of the other expected tokens, but given it was followed by a "token capable of starting statement", I feel comfortable to ignore the other possibilities. What do you think?

@CentrilCentrilOct 26, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable as a heuristic. You could optionally add a note below for the additional expected tokens. I'll leave that up to you.

JeanMertz
JeanMertz reviewed Oct 26, 2019
View reviewed changes
Comment threadsrc/test/ui/macros/issue-54441.stderr Outdated

@JeanMertzJeanMertzOct 26, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the change above this one the word here is removed in this PR (“ ^^ expected fn here”), while it is still present in this change.

Is that as intended?

@estebankestebankOct 28, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated these as well, but they affect a huge amount of tests, I'll leave it as a separate PR.

@Centril

Centril commented Oct 26, 2019

Copy link
Copy Markdown
Contributor

r=me with or without the additional note and "here".

@CentrilCentril 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 Oct 26, 2019
@estebank
Use heuristics to recover parsing of missing ;
d673d0a
- Detect `,` and `:` typos where `;` was intended.
- When the next token could have been the start of a new statement,
detect a missing semicolon.
@estebank
Tweak unexpected token wording
1b0836d
@estebank
review comments
e8016c2
@estebank
estebankforce-pushed the recover-missing-semi branch 2 times, most recently from 3a7e597 to e8016c2CompareOctober 28, 2019 18:10
@estebank

estebank commented Oct 28, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=Centril

@bors

bors commented Oct 28, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit e8016c2 has been approved by Centril

@borsbors 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 Oct 28, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 28, 2019
@Centril
Rollup merge ofrust-lang#65640- estebank:recover-missing-semi, r=Ce…
2fe6f22
…ntril
Use heuristics to recover parsing of missing `;`
- Detect `,` and `:` typos where `;` was intended.
- When the next token could have been the start of a new statement,
detect a missing semicolon.
Fixrust-lang#48160, fixrust-lang#44767 (after adding note about statements).
@CentrilCentril mentioned this pull request Oct 28, 2019
Merged
bors added a commit that referenced this pull request Oct 28, 2019
@bors
Auto merge of#65907- Centril:rollup-9i8ev23, r=Centril
cac6821
Rollup of 9 pull requests
Successful merges:
- #65563 (Add long error explanation for E0587)
- #65640 (Use heuristics to recover parsing of missing `;`)
- #65643 (Correct handling of type flags with `ConstValue::Placeholder`)
- #65825 (rustc: use IndexVec<DefIndex, T> instead of Vec<T>.)
- #65858 (suggest `const_in_array_repeat_expression` flag)
- #65877 (doc: introduce `once` in `iter::chain` document)
- #65887 (doc: mention `get(_mut)` in Vec)
- #65891 (self-profiling: Record something more useful for crate metadata generation event.)
- #65893 (Output previous stable error messaging when using stable build.)
Failed merges:
r? @ghost
@bors
bors merged commit e8016c2 into rust-lang:masterOct 29, 2019
@bors

bors commented Oct 29, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #65907) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 29, 2019
@estebank
estebank deleted the recover-missing-semi branch November 9, 2023 05:18
@snowyukittysnowyukitty mentioned this pull request Jul 23, 2026
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers
@JeanMertzJeanMertzJeanMertz left review comments
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@CentrilCentril

Labels

S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

parser should recover from seeing , when ; is expected Confusing parse error with let bindings

7 participants

@estebank@rust-highfive@RalfJung@bors@Centril@JeanMertz@petrochenkov