Backport one last PR for beta 3#31552

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

alexcrichton:beta-nextalexcrichton/rust:beta-nextCopy head branch name to clipboard