Skip to content

Reduce amount of errors given unclosed delimiter - #65838

Merged
bors merged 2 commits into
rust-lang:masterfrom
estebank:resilient-recovery
Nov 4, 2019
Merged

Reduce amount of errors given unclosed delimiter#65838
bors merged 2 commits into
rust-lang:masterfrom
estebank:resilient-recovery

Conversation

@estebank

@estebankestebank commented Oct 26, 2019

Copy link
Copy Markdown
Contributor

When in a file with a non-terminated item, catch the error and consume
the block instead of trying to recover it on a more granular way in order to
reduce the amount of unrelated errors that would be fixed after adding
the missing closing brace. Also point out the possible location of the
missing closing brace.

Fix#63690.

@rust-highfive

rust-highfive commented Oct 26, 2019

Copy link
Copy Markdown
Contributor

r? @eddyb

(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 26, 2019
estebank
estebank commented Oct 26, 2019
View reviewed changes
Comment threadsrc/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr Outdated
@estebank

estebank commented Oct 26, 2019

Copy link
Copy Markdown
ContributorAuthor

r? @Centril@petrochenkov

@rust-highfiverust-highfive assigned Centril and unassigned eddybOct 26, 2019
Centril
Centril reviewed Oct 26, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
Comment threadsrc/libsyntax/parse/mod.rs Outdated
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/parser/diagnostics.rs Outdated
Comment threadsrc/libsyntax/parse/parser/item.rs Outdated

@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.

Btw... this function and friends are a mess; I tried to convert this to use the list parsing utilities before but the success was not complete; I'll probably give it a go some time in the future.

Comment threadsrc/test/ui/did_you_mean/issue-40006.rs Outdated
Comment threadsrc/test/ui/parser/issue-62973.stderr Outdated
Comment threadsrc/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr Outdated
@Centril

Centril commented Oct 26, 2019

Copy link
Copy Markdown
Contributor

cc @matklad

@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
Centril
Centril reviewed Oct 26, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
@CentrilCentril 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 27, 2019
@estebankestebank changed the title Reduce ammount of errors given unclosed delimiterReduce amount of errors given unclosed delimiterOct 29, 2019
Centril
Centril reviewed Oct 29, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/mod.rs Outdated
Comment threadsrc/librustc_passes/entry.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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@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 29, 2019
@Centril

Centril commented Oct 30, 2019

Copy link
Copy Markdown
Contributor

Thanks; this looks good. r=me with commits reasonably squashed in some manner (into one or as you see fit).

@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 30, 2019
@estebank
Reduce ammount of errors given unclosed delimiter
053a095
When in a file with a non-terminated item, catch the error and consume
the block instead of trying to recover it more granularly in order to
reduce the amount of unrelated errors that would be fixed after adding
the missing closing brace. Also point out the possible location of the
missing closing brace.
@estebank
Do not complain about missing fn main() in some cases
454e2aa
@estebank

estebank commented Oct 30, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=Centril

@bors

bors commented Oct 30, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 454e2aa 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 30, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Nov 1, 2019
@tmandry
Rollup merge ofrust-lang#65838- estebank:resilient-recovery, r=Centril
6ea6cdc
Reduce amount of errors given unclosed delimiter
When in a file with a non-terminated item, catch the error and consume
the block instead of trying to recover it on a more granular way in order to
reduce the amount of unrelated errors that would be fixed after adding
the missing closing brace. Also point out the possible location of the
missing closing brace.
Fixrust-lang#63690.
@tmandrytmandry mentioned this pull request Nov 1, 2019
Closed
tmandry added a commit to tmandry/rust that referenced this pull request Nov 1, 2019
@tmandry
Rollup merge ofrust-lang#65838- estebank:resilient-recovery, r=Centril
17fed43
Reduce amount of errors given unclosed delimiter
When in a file with a non-terminated item, catch the error and consume
the block instead of trying to recover it on a more granular way in order to
reduce the amount of unrelated errors that would be fixed after adding
the missing closing brace. Also point out the possible location of the
missing closing brace.
Fixrust-lang#63690.
@tmandrytmandry mentioned this pull request Nov 1, 2019
Closed
@bors

bors commented Nov 4, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 454e2aa with merge f49f388...

bors added a commit that referenced this pull request Nov 4, 2019
@bors
Auto merge of#65838- estebank:resilient-recovery, r=Centril
f49f388
Reduce amount of errors given unclosed delimiter
When in a file with a non-terminated item, catch the error and consume
the block instead of trying to recover it on a more granular way in order to
reduce the amount of unrelated errors that would be fixed after adding
the missing closing brace. Also point out the possible location of the
missing closing brace.
Fix#63690.
@bors

bors commented Nov 4, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing f49f388 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Nov 4, 2019
@bors
bors merged commit 454e2aa into rust-lang:masterNov 4, 2019
This was referenced Nov 4, 2019
Merged
Merged
Merged
@estebank
estebank deleted the resilient-recovery branch November 9, 2023 05:18
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@CentrilCentril

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Diagnostics could be better for unclosed delimiters

5 participants

@estebank@rust-highfive@Centril@bors@eddyb