Backport some things for rustfmt 1.4.22#4436

calebcartwright merged 4 commits intorust-lang:rustfmt-1.4.22rust-lang/rustfmt:rustfmt-1.4.22from

calebcartwright:rustfmt-1.4.22calebcartwright/rustfmt:rustfmt-1.4.22Copy head branch name to clipboard