diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-31 16:09:31 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-31 16:09:31 +0100 |
commit | 7325283c6977e078513b5b21aa173775e2b22e12 (patch) | |
tree | 7be8b4fbc2e7470bf7891d81b3812eb572bb0d1c /crates/ra_parser | |
parent | ad239f6197bda31f7a9b904b5ccb25c93cbc701a (diff) | |
parent | 633aace41108b74fe6c93c5ab04272067db033f9 (diff) |
Merge #5624
5624: Finalize expressions grammar r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_parser')
-rw-r--r-- | crates/ra_parser/src/grammar/expressions/atom.rs | 2 | ||||
-rw-r--r-- | crates/ra_parser/src/syntax_kind/generated.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs index 706a2f796..0b01d3bc6 100644 --- a/crates/ra_parser/src/grammar/expressions/atom.rs +++ b/crates/ra_parser/src/grammar/expressions/atom.rs | |||
@@ -250,7 +250,7 @@ fn lambda_expr(p: &mut Parser) -> CompletedMarker { | |||
250 | p.error("expected expression"); | 250 | p.error("expected expression"); |
251 | } | 251 | } |
252 | } | 252 | } |
253 | m.complete(p, LAMBDA_EXPR) | 253 | m.complete(p, CLOSURE_EXPR) |
254 | } | 254 | } |
255 | 255 | ||
256 | // test if_expr | 256 | // test if_expr |
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs index 64ab18217..2830c0d74 100644 --- a/crates/ra_parser/src/syntax_kind/generated.rs +++ b/crates/ra_parser/src/syntax_kind/generated.rs | |||
@@ -173,7 +173,7 @@ pub enum SyntaxKind { | |||
173 | ARRAY_EXPR, | 173 | ARRAY_EXPR, |
174 | PAREN_EXPR, | 174 | PAREN_EXPR, |
175 | PATH_EXPR, | 175 | PATH_EXPR, |
176 | LAMBDA_EXPR, | 176 | CLOSURE_EXPR, |
177 | IF_EXPR, | 177 | IF_EXPR, |
178 | WHILE_EXPR, | 178 | WHILE_EXPR, |
179 | CONDITION, | 179 | CONDITION, |