[beta] backport#113938

bors merged 3 commits intorust-lang:betarust-lang/rust:betafrom

Mark-Simulacrum:beta-backportMark-Simulacrum/rust:beta-backportCopy head branch name to clipboard