diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-27 17:42:37 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-27 17:42:37 +0100 |
commit | dddc4c6370ab8e7684352302a5ff282673c6e8ec (patch) | |
tree | 07b240aeff385331e1e39cb68b068b5b780ce11b /crates/parser/src/grammar/expressions | |
parent | 6f6580dec764e136148f3fe55c203a9452176bdd (diff) | |
parent | 4b989009e3839cfc6f021d1552a46561cee6cde2 (diff) |
Merge #5899
5899: Add track_env_var to the proc macro server
r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/parser/src/grammar/expressions')
-rw-r--r-- | crates/parser/src/grammar/expressions/atom.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs index ba6dd2fbc..66a92a4e1 100644 --- a/crates/parser/src/grammar/expressions/atom.rs +++ b/crates/parser/src/grammar/expressions/atom.rs | |||
@@ -15,7 +15,7 @@ use super::*; | |||
15 | // let _ = b"e"; | 15 | // let _ = b"e"; |
16 | // let _ = br"f"; | 16 | // let _ = br"f"; |
17 | // } | 17 | // } |
18 | pub(crate) const LITERAL_FIRST: TokenSet = token_set![ | 18 | pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ |
19 | TRUE_KW, | 19 | TRUE_KW, |
20 | FALSE_KW, | 20 | FALSE_KW, |
21 | INT_NUMBER, | 21 | INT_NUMBER, |
@@ -25,8 +25,8 @@ pub(crate) const LITERAL_FIRST: TokenSet = token_set![ | |||
25 | STRING, | 25 | STRING, |
26 | RAW_STRING, | 26 | RAW_STRING, |
27 | BYTE_STRING, | 27 | BYTE_STRING, |
28 | RAW_BYTE_STRING | 28 | RAW_BYTE_STRING, |
29 | ]; | 29 | ]); |
30 | 30 | ||
31 | pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> { | 31 | pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> { |
32 | if !p.at_ts(LITERAL_FIRST) { | 32 | if !p.at_ts(LITERAL_FIRST) { |
@@ -39,7 +39,7 @@ pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> { | |||
39 | 39 | ||
40 | // E.g. for after the break in `if break {}`, this should not match | 40 | // E.g. for after the break in `if break {}`, this should not match |
41 | pub(super) const ATOM_EXPR_FIRST: TokenSet = | 41 | pub(super) const ATOM_EXPR_FIRST: TokenSet = |
42 | LITERAL_FIRST.union(paths::PATH_FIRST).union(token_set![ | 42 | LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ |
43 | T!['('], | 43 | T!['('], |
44 | T!['{'], | 44 | T!['{'], |
45 | T!['['], | 45 | T!['['], |
@@ -59,9 +59,9 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet = | |||
59 | T![loop], | 59 | T![loop], |
60 | T![for], | 60 | T![for], |
61 | LIFETIME, | 61 | LIFETIME, |
62 | ]); | 62 | ])); |
63 | 63 | ||
64 | const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW, R_DOLLAR]; | 64 | const EXPR_RECOVERY_SET: TokenSet = TokenSet::new(&[LET_KW, R_DOLLAR]); |
65 | 65 | ||
66 | pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> { | 66 | pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> { |
67 | if let Some(m) = literal(p) { | 67 | if let Some(m) = literal(p) { |