diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 14:39:55 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-30 14:39:55 +0100 |
commit | 97fb5daf723c520b0361ade3e44f130257b1fe96 (patch) | |
tree | 82f372ea7b9560cf8fbf861203460fe2aa2d4c88 /crates/ra_parser | |
parent | ee00679331b87dacc5fe608f153be160c1cb144c (diff) | |
parent | 28ef4c375a9f56d69daf885504aea3df7012bb81 (diff) |
Merge #5592
5592: Rename TypeParamList -> GenericParamList 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/type_params.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/type_params.rs b/crates/ra_parser/src/grammar/type_params.rs index d1330d4b9..90dabb4c0 100644 --- a/crates/ra_parser/src/grammar/type_params.rs +++ b/crates/ra_parser/src/grammar/type_params.rs | |||
@@ -36,7 +36,7 @@ fn type_param_list(p: &mut Parser) { | |||
36 | } | 36 | } |
37 | } | 37 | } |
38 | p.expect(T![>]); | 38 | p.expect(T![>]); |
39 | m.complete(p, TYPE_PARAM_LIST); | 39 | m.complete(p, GENERIC_PARAM_LIST); |
40 | } | 40 | } |
41 | 41 | ||
42 | fn lifetime_param(p: &mut Parser, m: Marker) { | 42 | fn lifetime_param(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 b84c3fc79..b83690865 100644 --- a/crates/ra_parser/src/syntax_kind/generated.rs +++ b/crates/ra_parser/src/syntax_kind/generated.rs | |||
@@ -230,7 +230,7 @@ pub enum SyntaxKind { | |||
230 | NAME_REF, | 230 | NAME_REF, |
231 | LET_STMT, | 231 | LET_STMT, |
232 | EXPR_STMT, | 232 | EXPR_STMT, |
233 | TYPE_PARAM_LIST, | 233 | GENERIC_PARAM_LIST, |
234 | LIFETIME_PARAM, | 234 | LIFETIME_PARAM, |
235 | TYPE_PARAM, | 235 | TYPE_PARAM, |
236 | CONST_PARAM, | 236 | CONST_PARAM, |