Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#127090 - kornelski:wrap-conflicts, r=fee1-dead Reduce merge conflicts from rustfmt's wrapping Imports in this file are changed by many different features. Rustfmt insists on reformatting and rewrapping the imports every time they change, which causes chronic merge conflicts. I've split the big import into multiple smaller ones, so that different features will conflict less often.
- Loading branch information