diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-31 17:50:43 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-31 17:50:43 +0100 |
commit | 5d9145ce10c7dff6caa397b7a6c561848399e4f9 (patch) | |
tree | 8db83308ee58e07dcfd5071462460a8a50f1ce91 /crates/ra_parser | |
parent | 0392a894b7284b13a88a13171e6b8b29764921be (diff) | |
parent | c1c97b289662501cea93fdc10760e08702ff5950 (diff) |
Merge #5629
5629: Finalize Path 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/type_args.rs | 4 | ||||
-rw-r--r-- | crates/ra_parser/src/syntax_kind/generated.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_parser/src/grammar/type_args.rs b/crates/ra_parser/src/grammar/type_args.rs index 2d61f9d80..aef7cd6fb 100644 --- a/crates/ra_parser/src/grammar/type_args.rs +++ b/crates/ra_parser/src/grammar/type_args.rs | |||
@@ -22,7 +22,7 @@ pub(super) fn opt_type_arg_list(p: &mut Parser, colon_colon_required: bool) { | |||
22 | } | 22 | } |
23 | } | 23 | } |
24 | p.expect(T![>]); | 24 | p.expect(T![>]); |
25 | m.complete(p, TYPE_ARG_LIST); | 25 | m.complete(p, GENERIC_ARG_LIST); |
26 | } | 26 | } |
27 | 27 | ||
28 | // test type_arg | 28 | // test type_arg |
@@ -52,7 +52,7 @@ fn type_arg(p: &mut Parser) { | |||
52 | m.complete(p, CONST_ARG); | 52 | m.complete(p, CONST_ARG); |
53 | } | 53 | } |
54 | k if k.is_literal() => { | 54 | k if k.is_literal() => { |
55 | p.bump(k); | 55 | expressions::literal(p); |
56 | m.complete(p, CONST_ARG); | 56 | m.complete(p, CONST_ARG); |
57 | } | 57 | } |
58 | _ => { | 58 | _ => { |
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs index 2830c0d74..c3670fb62 100644 --- a/crates/ra_parser/src/syntax_kind/generated.rs +++ b/crates/ra_parser/src/syntax_kind/generated.rs | |||
@@ -235,7 +235,7 @@ pub enum SyntaxKind { | |||
235 | LIFETIME_PARAM, | 235 | LIFETIME_PARAM, |
236 | TYPE_PARAM, | 236 | TYPE_PARAM, |
237 | CONST_PARAM, | 237 | CONST_PARAM, |
238 | TYPE_ARG_LIST, | 238 | GENERIC_ARG_LIST, |
239 | LIFETIME_ARG, | 239 | LIFETIME_ARG, |
240 | TYPE_ARG, | 240 | TYPE_ARG, |
241 | ASSOC_TYPE_ARG, | 241 | ASSOC_TYPE_ARG, |