Do not consume semicolon twice while parsing local statement #51629
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
| @@ -4700,7 +4700,7 @@ impl<'a> Parser<'a> { | |||
| if macro_legacy_warnings && self.token != token::Semi { | |||
| self.warn_missing_semicolon(); | |||
| } else { | |||
| self.expect_one_of(&[token::Semi], &[])?; | |||
| self.expect_one_of(&[], &[token::Semi])?; | |||
There was a problem hiding this comment.
OK, this was non-obvious, but it looks like there are no cases in which this would change observable behavior.
"No ;", "1 ;", "2 ;" and ">2 ;" should all be treated same due to contexts in which parse_full_stmt is used.
|
@bors r+ rollup |
|
📌 Commit cafe9d0 has been approved by |
bors
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Jun 22, 2018
…ocal-span, r=petrochenkov
Do not consume semicolon twice while parsing local statement
The span for a `let` statement includes multiple semicolons. For example,
```rust
let x = 2;;;
// ^^^^^^^^^^^ The span for the above statement.
```
This PR fixes it.
cc rust-lang/rustfmt#2791.
bors
added a commit
that referenced
this pull request
Jun 22, 2018
Rollup of 6 pull requests Successful merges: - #51158 (Mention spec and indented blocks in doctest docs) - #51629 (Do not consume semicolon twice while parsing local statement) - #51637 (Update zx_cprng_draw_new on Fuchsia) - #51664 (make more libsyntax methods public) - #51666 (Disable probestack when GCOV profiling is being used) - #51703 (Recognize the extra "LLVM tools versions" argument to build-manifest.) Failed merges: r? @ghost
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.
The span for a
letstatement includes multiple semicolons. For example,This PR fixes it.
cc rust-lang/rustfmt#2791.