nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-29 11:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use impl PartialEq<TokenKind> for Token more.

Browse Source 
This lets us compare a `Token` with a `TokenKind`. It's used a lot, but
can be used even more, avoiding the need for some `.kind` uses.
This commit is contained in:
Nicholas Nethercote 2024-08-09 17:44:47 +10:00
parent 57af02c9c4
commit 7b2299a2d2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/parse/macros/mod.rs
View File

@ -84,9 +84,7 @@ pub(crate) struct ParsedMacroArgs {
fn check_keyword<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option<MacroArg> { fn check_keyword<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option<MacroArg> {
for &keyword in RUST_KW.iter() { for &keyword in RUST_KW.iter() {
if parser.token.is_keyword(keyword) if parser.token.is_keyword(keyword)
&& parser.look_ahead(1, |t| { && parser.look_ahead(1, |t| *t == TokenKind::Eof || *t == TokenKind::Comma)
t.kind == TokenKind::Eof || t.kind == TokenKind::Comma
})
{ {
parser.bump(); parser.bump();
return Some(MacroArg::Keyword( return Some(MacroArg::Keyword(
@ -131,7 +129,7 @@ pub(crate) fn parse_macro_args(
Some(arg) => { Some(arg) => {
args.push(arg); args.push(arg);
parser.bump(); parser.bump();
if parser.token.kind == TokenKind::Eof && args.len() == 2 { if parser.token == TokenKind::Eof && args.len() == 2 {
vec_with_semi = true; vec_with_semi = true;
break; break;
} }
@ -150,7 +148,7 @@ pub(crate) fn parse_macro_args(
parser.bump(); parser.bump();
if parser.token.kind == TokenKind::Eof { if parser.token == TokenKind::Eof {
trailing_comma = true; trailing_comma = true;
break; break;
} }