[beta] backports#83516

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

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