Remove hacks in `make_token_stream`.#96543

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

nnethercote:rm-make_token_stream-hacksnnethercote/rust:rm-make_token_stream-hacksCopy head branch name to clipboard