[beta] backports#42161

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

brson:beta-nextbrson/rust:beta-nextCopy head branch name to clipboard