[beta] backports#159384

rust-bors[bot] merged 6 commits into

rust-lang:betarust-lang/rust:betafrom

Mark-Simulacrum:beta-backportsMark-Simulacrum/rust:beta-backportsCopy head branch name to clipboard