1.x: Rename merge_imports to imports_granularity and add a Module option.
#4634
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
…tion. This renames the existing `true`/`false` options to `Crate`/`Never`, then adds a new `Module` option which causes imports to be grouped together by their originating module.
There was a problem hiding this comment.
Thanks for this! Always nice to not have to cherry-pick these myself 😄 Couple suggested config text tweaks that I missed on the other PR, but otherwise good to go.
As an FYI, I changed the target release milestone as an unrelated bug has surfaced and I want to get a fix out for that bug with as few other changes as possible in case we need to expedite the release of the fix.
Shouldn't impact the overall timeline on getting this landed on nightly (can release this shortly after), but just wanted to explain the reasoning for the milestone change
Configurations.md
Outdated
| @@ -1615,13 +1615,56 @@ pub enum Foo {} | |||
| pub enum Foo {} | |||
| ``` | |||
|
|
|||
| ## `imports_granularity` | |||
|
|
|||
| Merge together related imports based on their paths. | |||
There was a problem hiding this comment.
Oops, think we missed updating this text in the other PR. Should tweak this to better reflect that the option isn't strictly a merge
Configurations.md
Outdated
|
|
||
| #### `Preserve` (default): | ||
|
|
||
| Do not perform any merging and preserve the original structure written by the developer. |
There was a problem hiding this comment.
Same theme here, maybe something more like:
Suggested change
| Do not perform any merging and preserve the original structure written by the developer. | |
| Do not change the granularity of any imports and preserve the original structure written by the developer. |
calebcartwright
changed the base branch from
rustfmt-1.4.31
to
rustfmt-1.4.33
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Jan 30, 2021
…anxiyn update rustfmt to v1.4.34 Short summary: Various formatting fixes (several const generic related) and introduction of `imports_granularity` config option Long summary copied from changelog: #### Changed - `merge_imports` configuration has been deprecated in favor of the new `imports_granularity` option. Any existing usage of `merge_imports` will be automatically mapped to the corresponding value on `imports_granularity` with a warning message printed to encourage users to update their config files. #### Added - New `imports_granularity` option has been added which succeeds `merge_imports`. This new option supports several additional variants which allow users to merge imports at different levels (crate or module), and even flatten imports to have a single use statement per item. ([PR rust-lang/rustfmt#4634](rust-lang/rustfmt#4634), [PR rust-lang/rustfmt#4639](rust-lang/rustfmt#4639)) See the section on the configuration site for more information https://rust-lang.github.io/rustfmt/?version=v1.4.33&search=#imports_granularity #### Fixed - Fix erroneous removal of `const` keyword on const trait impl ([rust-lang/rustfmt#4084](rust-lang/rustfmt#4084)) - Fix incorrect span usage wit const generics in supertraits ([rust-lang/rustfmt#4204](rust-lang/rustfmt#4204)) - Use correct span for const generic params ([rust-lang/rustfmt#4263](rust-lang/rustfmt#4263)) - Correct span on const generics to include type bounds ([rust-lang/rustfmt#4310](rust-lang/rustfmt#4310)) - Idempotence issue on blocks containing only empty statements ([rust-lang/rustfmt#4627](rust-lang/rustfmt#4627) and [rust-lang#3868](rust-lang/rustfmt#3868)) - Fix issue with semicolon placement on required functions that have a trailing comment that ends in a line-style comment before the semicolon ([rust-lang/rustfmt#4646](rust-lang/rustfmt#4646)) - Avoid shared interned cfg_if symbol since rustfmt can re-initialize the rustc_ast globals on multiple inputs ([rust-lang/rustfmt#4656](rust-lang/rustfmt#4656)) - Don't insert trailing comma on (base-less) rest in struct literals within macros ([rust-lang/rustfmt#4675](rust-lang/rustfmt#4675))
NiklasEi
added a commit
to NiklasEi/bevy
that referenced
this pull request
Feb 19, 2021
NiklasEi
added a commit
to NiklasEi/bevy
that referenced
this pull request
Feb 19, 2021
cart
pushed a commit
to bevyengine/bevy
that referenced
this pull request
Feb 19, 2021
anchpop
pushed a commit
to anchpop/bevy
that referenced
this pull request
Apr 2, 2021
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.
Backport of #4600 to 1.x. I presume that a rustfmt-1.4.32 branch needs to be created, though.