Fix parsing of erroneously placed semicolons #125276
Merged
+42
−7
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
rustbot
added
S-waiting-on-review
gurry
reviewed
May 20, 2024
gurry
reviewed
May 20, 2024
gurry
reviewed
May 20, 2024
Don't worry and welome to rustc :) |
gurry
suggested changes
May 20, 2024
| items.push(item); | ||
| last = items.last().map(|x| &**x); |
There was a problem hiding this comment.
A ref on top of a deref seems redundant. Maybe replace &**x with just *x
There was a problem hiding this comment.
Reborrowing to convert the Option<&P<Item>> into an Option<&Item>. as_deref doesn't work here.
gurry
suggested changes
May 20, 2024
| while let Some(item) = self.parse_item(ForceCollect::No)? { | ||
| self.maybe_consume_incorrect_semicolon(Some(&item)); | ||
|
|
||
| // There shouldn't be any semicolons before or afer items. |
There was a problem hiding this comment.
Suggested change
| // There shouldn't be any semicolons before or afer items. | |
| // There shouldn't be any stray semicolons before or afer items. |
fmease
reviewed
May 20, 2024
| // `parse_item` consumes the appropriate semicolons so any leftover is an error. | ||
| let mut last = None; | ||
| loop { | ||
| while self.maybe_consume_incorrect_semicolon(last) {} // Eat all bad semicolons |
There was a problem hiding this comment.
Can't we just do the following and remove the local binding last outright?
Suggested change
| while self.maybe_consume_incorrect_semicolon(last) {} // Eat all bad semicolons | |
| while self.maybe_consume_incorrect_semicolon(items.last().as_deref()) {} // Eat all bad semicolons |
fmease
added
S-waiting-on-author
|
@rustbot ready |
rustbot
added
S-waiting-on-review
fmease
approved these changes
May 20, 2024
|
@rustbot ready |
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
May 21, 2024
Fix parsing of erroneously placed semicolons This closes rust-lang#124935, is a continuation of rust-lang#125245 after rebasing rust-lang#125117. Thanks `@gurry` for your code and sorry for making it confusing :P r? fmease
fmease
added a commit
to fmease/rust
that referenced
this pull request
May 21, 2024
Fix parsing of erroneously placed semicolons This closes rust-lang#124935, is a continuation of rust-lang#125245 after rebasing rust-lang#125117. Thanks ``@gurry`` for your code and sorry for making it confusing :P r? fmease
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 21, 2024
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#122665 (Add some tests for public-private dependencies.) - rust-lang#123122 (Fix incorrect suggestion for undeclared hrtb lifetimes in where clauses.) - rust-lang#125276 (Fix parsing of erroneously placed semicolons) - rust-lang#125310 (Move ~100 tests from tests/ui to subdirs) - rust-lang#125357 (Migrate `run-make/rustdoc-scrape-examples-multiple` to `rmake.rs`) - rust-lang#125369 (Don't do cc detection for synthetic targets) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 21, 2024
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#123122 (Fix incorrect suggestion for undeclared hrtb lifetimes in where clauses.) - rust-lang#123492 (add pull request template asking for relevant tracking issues) - rust-lang#125276 (Fix parsing of erroneously placed semicolons) - rust-lang#125310 (Move ~100 tests from tests/ui to subdirs) - rust-lang#125357 (Migrate `run-make/rustdoc-scrape-examples-multiple` to `rmake.rs`) - rust-lang#125369 (Don't do cc detection for synthetic targets) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 21, 2024
Rollup merge of rust-lang#125276 - dev-ardi:no-main-diag, r=fmease Fix parsing of erroneously placed semicolons This closes rust-lang#124935, is a continuation of rust-lang#125245 after rebasing rust-lang#125117. Thanks ```@gurry``` for your code and sorry for making it confusing :P r? fmease
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.
This closes #124935, is a continuation of #125245 after rebasing #125117.
Thanks @gurry for your code and sorry for making it confusing :P
r? fmease