fix: Fmt struct field patters with cfgs - #6983
Open
kostekIV wants to merge 2 commits into
Open
Conversation
kostekIV
commented
Jul 27, 2026
| // The same, but with leading comments on the fields. | ||
| fn example_with_comments() { | ||
| let Foo { | ||
| // comment on shorthand field |
Author
There was a problem hiding this comment.
above the cfg because of this issue I encountered while fixing this issue - #6984
ytmimi
requested changes
Jul 27, 2026
Contributor
Comment on lines
+472
to
+476
| let combine_shape = if context.config.style_edition() >= StyleEdition::Edition2027 { | ||
| shape | ||
| } else { | ||
| nested_shape | ||
| }; |
Contributor
There was a problem hiding this comment.
Yeah, this change would need to be gated.
Collaborator
|
Reminder, once the PR becomes ready for a review, use |
Author
|
@rustbot ready |
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
#5982 and #5920.
Desription
the non-shorthand branch passed the block-indented nested_shape to combine_strs_with_missing_comments. That call decides where the whole field lands relative to its attribute, so it should use the field's own shape (exactly as the shorthand branch already does.
Question
Not sure if this change requires the edition gate or not? As a default I have gated it behind 2027 edition.