Use TokenTree::get_span
Clean up delimiter matching
Merge pull request #198 from bjz/generator-cleanups

Generator cleanups