fix: preserve blank lines when removing empty statements consistently#6853
Open
utakotoba wants to merge 2 commits intorust-lang:mainfrom
Open
fix: preserve blank lines when removing empty statements consistently#6853utakotoba wants to merge 2 commits intorust-lang:mainfrom
utakotoba wants to merge 2 commits intorust-lang:mainfrom
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
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.
fixes #6816
Summary
Fix formatting around empty statements (
;) so removing them does not break surrounding blank lines or comment placement. Before this change,rustfmtcould behave inconsistently when an empty statement appeared by itself or before a trailing comment (described in original issue).Fix
Improved the handling of removed empty statements by preserving following same-line comments, aligning blank-line behavior with
rustfmt's standard vertical spacing, avoiding incorrect comment recovery on stripped semicolons.In practice, it is consistent for the following three cases:
;, removes that line and lets normal newline handling apply; <comment>, removes only the redundant;and keeps the comment correctly indented on its own line