Search for struct body span after any generic arguments #5274
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
Fixes 5273
Previously, rustfmt searched for the start of a struct body after the
opening `{`. In most cases this works just fine, but const values can
also be defined between `{ }`, which lead to issues when rewriting the
struct body.
Now, rustfmt will search for the `{` after the generic argument list to
guarantee that the `{` it finds is the start of the struct body.
|
Yup the where clause is is available on the Generics. I'm surprised that the span on the struct doesn't encompass the where clause as well. |
1 similar comment
|
Yup the where clause is is available on the Generics. I'm surprised that the span on the struct doesn't encompass the where clause as well. |
I know it seems odd at first blush for the span of the containing node to not extend to the end of the span of one its child nodes, but remember with certain item definitions there can be an awful lot of non-generics content between the end of the generics and the start of the where clause, which is why the spans are structured they way that they are |
This was referenced Apr 3, 2022
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 #5273
Previously, rustfmt searched for the start of a struct body after the opening
{. In most cases this works just fine, but const values can also be defined inside{ }, which lead to issues when rewriting the struct body (as highlighted by the linked issue).Now, rustfmt will search for the
{after the generic argument list to guarantee that the{it finds is the start of the struct body.