Update rustfmt, pull in a few commits from the `rustup` branch

rust-lang / rls

Repository for the Rust Language Server (aka RLS)

Other

3.53k stars 257 forks source link

Update rustfmt, pull in a few commits from the `rustup` branch #1751

Closed calebcartwright closed 2 years ago

calebcartwright commented 2 years ago

r? @Xanewok

Was originally just planning to bump the rustfmt reference to a more recent hash, but seems like some other changes/fixes hadn't made into the master branch either yet and so were pulled in as well

calebcartwright commented 2 years ago

The ICE on Windows is interesting, though I feel like some of these cross-internal builds can be borderline pathological. Suspect it would be resolved with a bump of cargo and cargo-utils, any concerns with that?

bors commented 2 years ago

:umbrella: The latest upstream changes (presumably #1753) made this pull request unmergeable. Please resolve the merge conflicts.