Commit 6090c57
authored
Rollup merge of #81501 - calebcartwright:update-rustfmt, r=sanxiyn
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 [#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))2 files changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4442 | 4442 | | |
4443 | 4443 | | |
4444 | 4444 | | |
4445 | | - | |
| 4445 | + | |
4446 | 4446 | | |
4447 | 4447 | | |
4448 | 4448 | | |
| |||
- CHANGELOG.md+38-1
- Cargo.lock+1-1
- Cargo.toml+1-1
- Configurations.md+60-2
- src/config/config_type.rs+21-2
- src/config/mod.rs+70-2
- src/config/options.rs+15-1
- src/expr.rs+13-3
- src/imports.rs+122-33
- src/items.rs+18-10
- src/lib.rs+1
- src/modules.rs+1-5
- src/reorder.rs+10-5
- src/spanned.rs+2-1
- src/test/mod.rs+38
- src/utils.rs+8
- tests/source/configs/group_imports/StdExternalCrate-merge_imports.rs+1-1
- tests/source/configs/imports_layout/merge_mixed.rs+1-1
- tests/source/const_generics.rs+12
- tests/source/impls.rs+8
- tests/source/imports_granularity_crate.rs+4-1
- tests/source/imports_granularity_item.rs+6
- tests/source/imports_granularity_module.rs+18
- tests/source/issue-3750.rs+1-1
- tests/source/issue-4646.rs+20
- tests/source/issue-4656/format_me_please.rs+2
- tests/source/issue-4656/lib.rs+7
- tests/source/issue-4656/lib2.rs+3
- tests/source/issue_3868.rs+13
- tests/source/issue_4675.rs+8
- tests/source/merge_imports_true_compat.rs+4
- tests/target/configs/group_imports/StdExternalCrate-merge_imports.rs+1-1
- tests/target/configs/imports_layout/merge_mixed.rs+1-1
- tests/target/const_generics.rs+13
- tests/target/impls.rs+8
- tests/target/imports_granularity_crate.rs+4-1
- tests/target/imports_granularity_item.rs+13
- tests/target/imports_granularity_module.rs+20
- tests/target/issue-3750.rs+1-1
- tests/target/issue-4310.rs+9
- tests/target/issue-4646.rs+20
- tests/target/issue-4656/format_me_please.rs+1
- tests/target/issue-4656/lib.rs+7
- tests/target/issue-4656/lib2.rs+3
- tests/target/issue_3868.rs+9
- tests/target/issue_4675.rs+8
- tests/target/merge_imports_true_compat.rs+3
0 commit comments