fix: Always bump in the parser in err_and_bump()
#20180
Merged
+50
−8
Conversation
This file contains hidden or 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
Even when at curly braces, otherwise the parser can get stuck. This has happened in the past in rust-lang#18625, but it was just worked around instead of handling the root of the problem. Now this happened again in rust-lang#20171. IMO we can't let `err_and_bump()` not bump, that's too confusing and invites errors. We can (as I did) workaround the worse recovery instead.
rustbot
added
the
S-waiting-on-review
Veykril
approved these changes
Jul 6, 2025
There was a problem hiding this comment.
I believe the rationale here was for blocks to be always balanced or something like that, though I don't quite recall things here. See #4680 (comment) for some context.
But that is for the assumption of incremental reparsing, which I believe is something we do not do these days at all and is probably still broken given it used to fail fuzzing. So this sounds reasonable to me
|
@Veykril can you merge this please? You approved but not merged. |
|
You should be able to merge it as well no? |
I don't want to self-merge usually. |
rustbot
removed
the
S-waiting-on-review
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.
Even when at curly braces, otherwise the parser can get stuck.
This has happened in the past in #18625, but it was just worked around instead of handling the root of the problem. Now this happened again in #20171. IMO we can't let
err_and_bump()not bump, that's too confusing and invites errors. We can (as I did) workaround the worse recovery instead.Fixes #20171.