Simplify `TokenStream` some more#57486

Merged

bors merged 4 commits intorust-lang:masterfrom

nnethercote:simplify-TokenStream-more

Jan 19, 2019

Commits on Jan 13, 2019

Commits on Jan 14, 2019

Make `TokenStream` use `Option`.
nnethercote
committed