From: Corey Farwell <coreyf@rwell.org>
Date: Sat, 23 Sep 2017 04:29:16 +0000 (-0400)
Subject: Rollup merge of #44745 - alexcrichton:no-delim-none, r=estebank
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=a1637b7570e0c6f40f738f98e1643d5fed30775e;hp=a1637b7570e0c6f40f738f98e1643d5fed30775e;p=rust.git

Rollup merge of #44745 - alexcrichton:no-delim-none, r=estebank

rustc: Don't use DelimToken::None if possible

This commit fixes a regression from #44601 where lowering attribute to HIR now
involves expanding interpolated tokens to their actual tokens. In that commit
all interpolated tokens were surrounded with a `DelimToken::None` group of
tokens, but this ended up causing regressions like #44730 where the various
attribute parsers in `syntax/attr.rs` weren't ready to cope with
`DelimToken::None`. Instead of fixing the parser in `attr.rs` this commit
instead opts to just avoid the `DelimToken::None` in the first place, ensuring
that the token stream should look the same as it did before where possible.

Closes #44730
---