miri no longer builds after rust-lang/rust#97802

[rust-highfive]

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

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

[Enselic]

Fixed by rust-lang/miri#2532

[RalfJung]

Duplicate of #101344.

[ChrisDenton]

This doesn't look like a duplicate?

https://github.com/rust-lang-ci/rust/runs/8164066860?check_suite_focus=true#step:25:7879

error[E0532]: expected unit struct, unit variant or constant, found struct variant `EntryFnType::Main`
   --> src\tools\miri\src\eval.rs:280:9
    |
280 |         EntryFnType::Main => {
    |         ^^^^^^^^^^^^^^^^^ help: use struct pattern syntax instead: `EntryFnType::Main { /* fields */ }`
    |
   ::: D:\a\rust\rust\compiler\rustc_session\src\config.rs:803:5
    |
803 |     Main {
    |     ---- `EntryFnType::Main` defined here

[RalfJung]

Yeah there are multiple things breaking Miri, but having multiple issues with the exact same title does not help. This breakage here already has a PR starting to fix it. And since the ICE does not happen on Miri CI we can probably even land it...