diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 14:26:15 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-30 14:26:15 +0100 |
commit | ee00679331b87dacc5fe608f153be160c1cb144c (patch) | |
tree | f80ef7823490a6904b3f7bf57a4609ca4c4743dc /crates/ra_parser | |
parent | 96c3ff1c573f97e5089fc0ba01ede6fe43693668 (diff) | |
parent | eb2f8063444b11257111f4f8ade990ec810e0361 (diff) |
Merge #5591
5591: Rename TypeAliasDef -> TypeAlias 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.rs | 4 | ||||
-rw-r--r-- | crates/ra_parser/src/syntax_kind/generated.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs index 3b73e5346..664b23f6a 100644 --- a/crates/ra_parser/src/grammar/items.rs +++ b/crates/ra_parser/src/grammar/items.rs | |||
@@ -180,7 +180,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul | |||
180 | // unsafe const fn bar() {} | 180 | // unsafe const fn bar() {} |
181 | T![fn] => { | 181 | T![fn] => { |
182 | fn_def(p); | 182 | fn_def(p); |
183 | m.complete(p, FN_DEF); | 183 | m.complete(p, FN); |
184 | } | 184 | } |
185 | 185 | ||
186 | // test unsafe_trait | 186 | // test unsafe_trait |
@@ -380,7 +380,7 @@ fn type_def(p: &mut Parser, m: Marker) { | |||
380 | types::type_(p); | 380 | types::type_(p); |
381 | } | 381 | } |
382 | p.expect(T![;]); | 382 | p.expect(T![;]); |
383 | m.complete(p, TYPE_ALIAS_DEF); | 383 | m.complete(p, TYPE_ALIAS); |
384 | } | 384 | } |
385 | 385 | ||
386 | pub(crate) fn mod_item(p: &mut Parser, m: Marker) { | 386 | pub(crate) fn mod_item(p: &mut Parser, m: Marker) { |
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs index 4f35e0baa..b84c3fc79 100644 --- a/crates/ra_parser/src/syntax_kind/generated.rs +++ b/crates/ra_parser/src/syntax_kind/generated.rs | |||
@@ -126,7 +126,7 @@ pub enum SyntaxKind { | |||
126 | STRUCT_DEF, | 126 | STRUCT_DEF, |
127 | UNION_DEF, | 127 | UNION_DEF, |
128 | ENUM_DEF, | 128 | ENUM_DEF, |
129 | FN_DEF, | 129 | FN, |
130 | RET_TYPE, | 130 | RET_TYPE, |
131 | EXTERN_CRATE, | 131 | EXTERN_CRATE, |
132 | MODULE, | 132 | MODULE, |
@@ -135,7 +135,7 @@ pub enum SyntaxKind { | |||
135 | CONST_DEF, | 135 | CONST_DEF, |
136 | TRAIT_DEF, | 136 | TRAIT_DEF, |
137 | IMPL_DEF, | 137 | IMPL_DEF, |
138 | TYPE_ALIAS_DEF, | 138 | TYPE_ALIAS, |
139 | MACRO_CALL, | 139 | MACRO_CALL, |
140 | TOKEN_TREE, | 140 | TOKEN_TREE, |
141 | MACRO_DEF, | 141 | MACRO_DEF, |