Reformat apollo-router crate with rustfmt 2024 edition #6854
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
✅ Docs preview has no changesThe preview was not built because there were no changes. Build ID: e8904def6b03cfe1ecabceea |
|
@SimonSapin, please consider creating a changeset entry in |
IvanGoncharov
approved these changes
Feb 24, 2025
Velfi
approved these changes
Feb 24, 2025
abernix
reviewed
Feb 27, 2025
There was a problem hiding this comment.
I would propose that we:
- Add the commit from this PR (
10dfa657cc3ddcb356dbdbccd70e8c2741614ab8) to.git-blame-ignore-revsat the root of the repository sogit blameusage is not impacted: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-and-understanding-files#ignore-commits-in-the-blame-view - DON'T Squash this PR, but instead True-Merge.
|
As expected this has conflicts now so I’m gonna:
|
Starting with Rust 1.85, the language edition 2024 is available. With it also comes the [rustfmt style edition 2024](https://doc.rust-lang.org/edition-guide/rust-2024/rustfmt-style-edition.html), with several changes to code formatting such as import sorting. By default the style edition matches the language edition, but both can be configured separately. While we cannot use the new language edition yet in the apollo-router crate (GREsau/schemars#376), this PR changes to the new style edition. Aside from `apollo-router/rustfmt.toml` it is entirely generated by this command matching CI configuration: ``` cargo +nightly fmt -- --config imports_granularity=Item,group_imports=StdExternalCrate ``` (Unfortunately, import granularity and grouping config is still unstable in rustfmt.)
SimonSapin
force-pushed
the
simon/style24
branch
from
10dfa65 to
4db2bc0
Compare
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.
Starting with Rust 1.85, the language edition 2024 is available. With it also comes the rustfmt style edition 2024, with several changes to code formatting such as import sorting. By default the style edition matches the language edition, but both can be configured separately. While we cannot use the new language edition yet in the apollo-router crate (GREsau/schemars#376), this PR changes to the new style edition. Aside from
apollo-router/rustfmt.tomlit is entirely generated by this command matching CI configuration:(Unfortunately, import granularity and grouping config is still unstable in rustfmt.)