Reduce kw::Empty usage, part 5#139848

bors merged 3 commits intorust-lang:masterrust-lang/rust:masterfrom

nnethercote:kw-Empty-5nnethercote/rust:kw-Empty-5Copy head branch name to clipboard