[beta] backport rollup#119719

bors merged 7 commits into

rust-lang:betarust-lang/rust:betafrom

Mark-Simulacrum:beta-nextMark-Simulacrum/rust:beta-nextCopy head branch name to clipboard