diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-07-01 08:53:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-01 08:53:06 +0200 |
| commit | 04a3969af7c2c8bea18ce53339dbb4802438577c (patch) | |
| tree | a24cbf8bfa7d4a45ea15babb81e57b8636df6797 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | c471e0715666bfa0184030af96ae7b45e81aa0b7 (diff) | |
| parent | 4061fd9e4e415f4c09b221895039c7c9d9d8eb9e (diff) | |
| download | rust-04a3969af7c2c8bea18ce53339dbb4802438577c.tar.gz rust-04a3969af7c2c8bea18ce53339dbb4802438577c.zip | |
Rollup merge of #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.
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions