From 91781c7ce8201b28afd56b4e35eba47e076a8498 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 31 Jul 2020 18:29:29 +0200 Subject: Rename TypeArgList -> GenericArgList --- crates/ra_parser/src/grammar/type_args.rs | 2 +- crates/ra_parser/src/syntax_kind/generated.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/ra_parser/src') diff --git a/crates/ra_parser/src/grammar/type_args.rs b/crates/ra_parser/src/grammar/type_args.rs index 2d61f9d80..8f88d51db 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) { } } p.expect(T![>]); - m.complete(p, TYPE_ARG_LIST); + m.complete(p, GENERIC_ARG_LIST); } // test type_arg 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 { LIFETIME_PARAM, TYPE_PARAM, CONST_PARAM, - TYPE_ARG_LIST, + GENERIC_ARG_LIST, LIFETIME_ARG, TYPE_ARG, ASSOC_TYPE_ARG, -- cgit v1.2.3 From ddf08daddf7e86d67e8d2e5596f8013b376dd522 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 31 Jul 2020 18:46:07 +0200 Subject: Fix const arguments grammar --- crates/ra_parser/src/grammar/type_args.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_parser/src') diff --git a/crates/ra_parser/src/grammar/type_args.rs b/crates/ra_parser/src/grammar/type_args.rs index 8f88d51db..aef7cd6fb 100644 --- a/crates/ra_parser/src/grammar/type_args.rs +++ b/crates/ra_parser/src/grammar/type_args.rs @@ -52,7 +52,7 @@ fn type_arg(p: &mut Parser) { m.complete(p, CONST_ARG); } k if k.is_literal() => { - p.bump(k); + expressions::literal(p); m.complete(p, CONST_ARG); } _ => { -- cgit v1.2.3