[beta] backports#156579

rust-bors[bot] merged 2 commits into

rust-lang:betarust-lang/rust:betafrom

cuviper:beta-nextcuviper/rust:beta-nextCopy head branch name to clipboard