[beta-1.85] backports#136391

bors merged 5 commits into

rust-lang:betarust-lang/rust:betafrom

ehuss:rust-1.85-beta-backportsehuss/rust:rust-1.85-beta-backportsCopy head branch name to clipboard