]> git.lizzy.rs Git - rust.git/commit - src/tools/clippy
Rollup merge of #69211 - petrochenkov:prevtok, r=Centril
authorMazdak Farrokhzad <twingoow@gmail.com>
Tue, 18 Feb 2020 21:16:28 +0000 (22:16 +0100)
committerGitHub <noreply@github.com>
Tue, 18 Feb 2020 21:16:28 +0000 (22:16 +0100)
commit1cf0194b4636b734d4b42e54c9325467da82a7fd
tree0d3b398393c017f39367879e2fa811a07ceb715d
parentb864d23f3484aad297e998f3cd50a4277122d070
parent950845c5b1079c83e56db0ca2b4bb8fe050ee2f5
Rollup merge of #69211 - petrochenkov:prevtok, r=Centril

parser: Simplify treatment of macro variables in `Parser::bump`

Follow-up to https://github.com/rust-lang/rust/pull/69006.

Token normalization for `$ident` and `$lifetime` is merged directly into `bump`.
Special "unknown macro variable" diagnostic for unexpected `$`s is removed as preventing legal code from compiling (as a result `bump` also doesn't call itself recursively anymore and can't make `prev_token` inconsistent).

r? @Centril
src/librustc_parse/parser/item.rs