`rustfmt` no longer builds after rust-lang/rust#74073

[rust-highfive]

Hello, this is your friendly neighborhood mergebot.
After merging PR #74073, I observed that the tool rustfmt no longer builds.
A follow-up PR to the repository https://github.com/rust-lang/rustfmt is needed to fix the fallout.

cc @Manishearth, do you think you would have time to do the follow-up work?
If so, that would be great!

And nominating for compiler team prioritization.

[Manishearth]

#74073 (comment)

[calebcartwright]

@topecongiro @Xanewok not sure if either have you had a chance to look at this latest broken toolstate, but I'm a bit puzzled 🤔

I have not been able to reproduce the compile errors like I've always been able to do with previous broken toolstate issues for rustfmt, and have tested with the below toolchains and can successfully compile the same version of rustfmt successfully with each:

• nightly-2020-07-09-x86_64-unknown-linux-gnu
• nightly-2020-07-08-x86_64-unknown-linux-gnu
• nightly-2020-07-07-x86_64-unknown-linux-gnu
• nightly-2020-07-06-x86_64-unknown-linux-gnu
• nightly-2020-07-05-x86_64-unknown-linux-gnu

Also checked on Windows (x86_64-pc-windows-msvc)

And AFAICT both rustfmt and rls components are available via rustup
https://rust-lang.github.io/rustup-components-history/

Am I missing something?

[topecongiro]

@calebcartwright I could not reproduce the build error either.

@Manishearth Is there a link to the entire build log?

[Manishearth]

Yes, https://github.com/rust-lang-ci/rust/runs/839815076, pick one of the builds that says "tools"

[calebcartwright]

Thanks @Manishearth that was helpful

@topecongiro you've probably found it already, but here's some direct links to where the rustfmt build starts

https://github.com/rust-lang-ci/rust/runs/839579965#step:22:7922 (linux)
https://github.com/rust-lang-ci/rust/runs/839580000#step:22:7214 (windows)

One thing that jumps out to me is the different commit from the logs vs. what I'm seeing with the toolchain from rustup

note: rustc 1.46.0-nightly (0c03aee8b 2020-07-05) running on x86_64-unknown-linux-gnu

$ rustc --version
rustc 1.46.0-nightly (2753fab7c 2020-07-05)

Maybe we're lucky and it got fixed before the nightly publish that day 😆 (it didn't)

Here's a more recent run where the build is still failing
https://github.com/rust-lang-ci/rust/runs/852886590?check_suite_focus=true#step:22:7214

[oli-obk]

This only reproduces with debug assertions enabled while building rustc.

[da-x]

x.py build tools/rustfmt works after I apply https://github.com/da-x/rust/pull/new/fix-74081 . Should send a PR?

[da-x]

PR: #74240