Merge #2243

2243: Move body queries to hir_def r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 19 insertions, 19 deletions

diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index 4952bd189..f06191963 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -40,24 +40,24 @@ pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> {
 // E.g. for after the break in `if break {}`, this should not match
 pub(super) const ATOM_EXPR_FIRST: TokenSet =
     LITERAL_FIRST.union(paths::PATH_FIRST).union(token_set![
-        L_PAREN,
-        L_CURLY,
-        L_BRACK,
-        PIPE,
-        MOVE_KW,
-        BOX_KW,
-        IF_KW,
-        WHILE_KW,
-        MATCH_KW,
-        UNSAFE_KW,
-        RETURN_KW,
-        BREAK_KW,
-        CONTINUE_KW,
+        T!['('],
+        T!['{'],
+        T!['['],
+        T![|],
+        T![move],
+        T![box],
+        T![if],
+        T![while],
+        T![match],
+        T![unsafe],
+        T![return],
+        T![break],
+        T![continue],
+        T![async],
+        T![try],
+        T![loop],
+        T![for],
         LIFETIME,
-        ASYNC_KW,
-        TRY_KW,
-        LOOP_KW,
-        FOR_KW,
     ]);
 
 const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW];
diff --git a/crates/ra_parser/src/token_set.rs b/crates/ra_parser/src/token_set.rs
index 6dc061889..2a6952c01 100644
--- a/crates/ra_parser/src/token_set.rs
+++ b/crates/ra_parser/src/token_set.rs
@@ -30,8 +30,8 @@ const fn mask(kind: SyntaxKind) -> u128 {
 
 #[macro_export]
 macro_rules! token_set {
-    ($($t:ident),*) => { TokenSet::empty()$(.union(TokenSet::singleton($t)))* };
-    ($($t:ident),* ,) => { token_set!($($t),*) };
+    ($($t:expr),*) => { TokenSet::empty()$(.union(TokenSet::singleton($t)))* };
+    ($($t:expr),* ,) => { token_set!($($t),*) };
 }
 
 #[test]