diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 16:39:56 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-30 16:39:56 +0100 |
commit | 0c8944314cb323416c8ad6ad27347ca056c5a91c (patch) | |
tree | 2a31c4bdfb62fe00b5109366155b0b4a40bf471d /crates/ra_parser | |
parent | 2496628c56415f4456803e4487f90bad96337d57 (diff) | |
parent | 1ae4721c9cfea746fce59a816b1c266bf373d6cf (diff) |
Merge #5601
5601: Finalize union 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/items/adt.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/items/adt.rs b/crates/ra_parser/src/grammar/items/adt.rs index 0e96bf77e..ec06e2d45 100644 --- a/crates/ra_parser/src/grammar/items/adt.rs +++ b/crates/ra_parser/src/grammar/items/adt.rs | |||
@@ -11,7 +11,7 @@ pub(super) fn struct_def(p: &mut Parser, m: Marker) { | |||
11 | pub(super) fn union_def(p: &mut Parser, m: Marker) { | 11 | pub(super) fn union_def(p: &mut Parser, m: Marker) { |
12 | assert!(p.at_contextual_kw("union")); | 12 | assert!(p.at_contextual_kw("union")); |
13 | p.bump_remap(T![union]); | 13 | p.bump_remap(T![union]); |
14 | struct_or_union(p, m, T![union], UNION_DEF); | 14 | struct_or_union(p, m, T![union], UNION); |
15 | } | 15 | } |
16 | 16 | ||
17 | fn struct_or_union(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) { | 17 | fn struct_or_union(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) { |
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs index 8586758b4..7efdeeac6 100644 --- a/crates/ra_parser/src/syntax_kind/generated.rs +++ b/crates/ra_parser/src/syntax_kind/generated.rs | |||
@@ -124,7 +124,7 @@ pub enum SyntaxKind { | |||
124 | R_DOLLAR, | 124 | R_DOLLAR, |
125 | SOURCE_FILE, | 125 | SOURCE_FILE, |
126 | STRUCT_DEF, | 126 | STRUCT_DEF, |
127 | UNION_DEF, | 127 | UNION, |
128 | ENUM_DEF, | 128 | ENUM_DEF, |
129 | FN, | 129 | FN, |
130 | RET_TYPE, | 130 | RET_TYPE, |