diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-06-05 01:17:07 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-06-06 14:04:02 +0300 |
| commit | aa6fba98ae717d6090cdd5d0569114adfc825680 (patch) | |
| tree | bbc8aed18256400f2873cddccc7a5553e993d408 /src/libsyntax_ext | |
| parent | c0c57acd7b8061697d196fd800a7ff3151c37f38 (diff) | |
| download | rust-aa6fba98ae717d6090cdd5d0569114adfc825680.tar.gz rust-aa6fba98ae717d6090cdd5d0569114adfc825680.zip | |
syntax: Use `Token` in `Parser`
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/asm.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax_ext/assert.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax_ext/format.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax_ext/asm.rs b/src/libsyntax_ext/asm.rs index 83c4c809de3..b015815ac9c 100644 --- a/src/libsyntax_ext/asm.rs +++ b/src/libsyntax_ext/asm.rs @@ -260,7 +260,7 @@ fn parse_inline_asm<'a>( loop { // MOD_SEP is a double colon '::' without space in between. // When encountered, the state must be advanced twice. - match (&p.token, state.next(), state.next().next()) { + match (&p.token.kind, state.next(), state.next().next()) { (&token::Colon, StateNone, _) | (&token::ModSep, _, StateNone) => { p.bump(); diff --git a/src/libsyntax_ext/assert.rs b/src/libsyntax_ext/assert.rs index 8a297a5c9bc..e5e422c4d9c 100644 --- a/src/libsyntax_ext/assert.rs +++ b/src/libsyntax_ext/assert.rs @@ -103,7 +103,7 @@ fn parse_assert<'a>( // // Parse this as an actual message, and suggest inserting a comma. Eventually, this should be // turned into an error. - let custom_message = if let token::Literal(token::Lit { kind: token::Str, .. }) = parser.token { + let custom_message = if let token::Literal(token::Lit { kind: token::Str, .. }) = parser.token.kind { let mut err = cx.struct_span_warn(parser.span, "unexpected string literal"); let comma_span = cx.source_map().next_point(parser.prev_span); err.span_suggestion_short( diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs index b5be45547cf..0eaac544e33 100644 --- a/src/libsyntax_ext/format.rs +++ b/src/libsyntax_ext/format.rs @@ -149,7 +149,7 @@ fn parse_args<'a>( } // accept trailing commas if named || (p.token.is_ident() && p.look_ahead(1, |t| *t == token::Eq)) { named = true; - let ident = if let token::Ident(i, _) = p.token { + let ident = if let token::Ident(i, _) = p.token.kind { p.bump(); i } else { |
