diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-10-01 05:55:28 +0200 |
|---|---|---|
| committer | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-10-01 05:55:28 +0200 |
| commit | e04690440b6d77b4da9bfcf593a641133033ae44 (patch) | |
| tree | 94907d958cdf40701ae67947d2942989fcea91a6 /src/libsyntax/parse/parser.rs | |
| parent | 49780d21b63e0557627e185ed71c84e33eed0c4b (diff) | |
| download | rust-e04690440b6d77b4da9bfcf593a641133033ae44.tar.gz rust-e04690440b6d77b4da9bfcf593a641133033ae44.zip | |
syntax: de-closure-ify `check_or_expected`.
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 0369e0a9e15..95f84d5cb33 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -549,29 +549,29 @@ impl<'a> Parser<'a> { } } - fn check_or_expected(&mut self, ok: bool, mk_type: impl FnOnce() -> TokenType) -> bool { + fn check_or_expected(&mut self, ok: bool, typ: TokenType) -> bool { if ok { true } else { - self.expected_tokens.push(mk_type()); + self.expected_tokens.push(typ); false } } crate fn check_ident(&mut self) -> bool { - self.check_or_expected(self.token.is_ident(), || TokenType::Ident) + self.check_or_expected(self.token.is_ident(), TokenType::Ident) } fn check_path(&mut self) -> bool { - self.check_or_expected(self.token.is_path_start(), || TokenType::Path) + self.check_or_expected(self.token.is_path_start(), TokenType::Path) } fn check_type(&mut self) -> bool { - self.check_or_expected(self.token.can_begin_type(), || TokenType::Type) + self.check_or_expected(self.token.can_begin_type(), TokenType::Type) } fn check_const_arg(&mut self) -> bool { - self.check_or_expected(self.token.can_begin_const_arg(), || TokenType::Const) + self.check_or_expected(self.token.can_begin_const_arg(), TokenType::Const) } /// Checks to see if the next token is either `+` or `+=`. @@ -579,7 +579,7 @@ impl<'a> Parser<'a> { fn check_plus(&mut self) -> bool { self.check_or_expected( self.token.is_like_plus(), - || TokenType::Token(token::BinOp(token::Plus)), + TokenType::Token(token::BinOp(token::Plus)), ) } |
