Reduce amount of errors given unclosed delimiter #65838
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
estebank
commented
Oct 26, 2019
src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr
Outdated
Show resolved
Hide resolved
Centril
reviewed
Oct 26, 2019
src/libsyntax/parse/parser/item.rs
Outdated
| @@ -1520,14 +1522,15 @@ impl<'a> Parser<'a> { | |||
| if self.eat(&token::OpenDelim(token::Brace)) { | |||
| while self.token != token::CloseDelim(token::Brace) { | |||
| let field = self.parse_struct_decl_field().map_err(|e| { | |||
| self.recover_stmt(); | |||
| self.consume_block(token::Brace, false); | |||
There was a problem hiding this comment.
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.
src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr
Show resolved
Hide resolved
|
cc @matklad |
Centril
added
S-waiting-on-author
Centril
reviewed
Oct 26, 2019
This comment has been minimized.
This comment has been minimized.
estebank
force-pushed
the
resilient-recovery
branch
from
177db47
to
482e245
Compare
Centril
added
S-waiting-on-review
estebank
changed the title
estebank
force-pushed
the
resilient-recovery
branch
from
bd19be1
to
ba25cfe
Compare
Centril
reviewed
Oct 29, 2019
Centril
added
S-waiting-on-author
This comment has been minimized.
This comment has been minimized.
estebank
force-pushed
the
resilient-recovery
branch
from
ba25cfe
to
d6a0b3c
Compare
estebank
added
S-waiting-on-review
|
Thanks; this looks good. r=me with commits reasonably squashed in some manner (into one or as you see fit). |
Centril
added
S-waiting-on-author
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
force-pushed
the
resilient-recovery
branch
from
d6a0b3c
to
454e2aa
Compare
|
@bors r=Centril |
|
📌 Commit 454e2aa has been approved by |
bors
added
S-waiting-on-bors
tmandry
added a commit
to tmandry/rust
that referenced
this pull request
Nov 1, 2019
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 rust-lang#63690.
tmandry
added a commit
to tmandry/rust
that referenced
this pull request
Nov 1, 2019
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 rust-lang#63690.
bors
added a commit
that referenced
this pull request
Nov 4, 2019
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.
|
☀️ Test successful - checks-azure |
This was referenced Nov 4, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.