A handful of cleanups for rustc/mir#54788

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

ljedrz:cleanup_rustc_mirljedrz/rust-1:cleanup_rustc_mirCopy head branch name to clipboard