Folding/ReErased cleanups#150861

rust-bors[bot] merged 6 commits intorust-lang:mainrust-lang/rust:mainfrom

nnethercote:folding-cleanupsnnethercote/rust:folding-cleanupsCopy head branch name to clipboard