Reduce merge conflicts from rustfmt's wrapping#127090

bors merged 1 commit intorust-lang:masterrust-lang/rust:masterfrom

kornelski:wrap-conflictskornelski/rust:wrap-conflictsCopy head branch name to clipboard