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 --- .../ra_syntax/test_data/parser/err/0012_broken_lambda.rast | 4 ++-- crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast | 6 +++--- .../test_data/parser/err/0024_many_type_parens.rast | 12 ++++++------ crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast | 2 +- .../ra_syntax/test_data/parser/err/0039_lambda_recovery.rast | 2 +- .../test_data/parser/fragments/type/ok/0000_result.rast | 2 +- .../parser/inline/ok/0004_value_parameters_no_patterns.rast | 2 +- .../test_data/parser/inline/ok/0018_arb_self_types.rast | 2 +- .../test_data/parser/inline/ok/0028_impl_trait_type.rast | 4 ++-- .../ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast | 2 +- .../parser/inline/ok/0045_param_list_opt_patterns.rast | 2 +- .../parser/inline/ok/0048_path_type_with_bounds.rast | 4 ++-- .../ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast | 2 +- .../test_data/parser/inline/ok/0065_dyn_trait_type.rast | 4 ++-- .../ra_syntax/test_data/parser/inline/ok/0081_for_type.rast | 2 +- .../test_data/parser/inline/ok/0104_path_fn_trait_args.rast | 2 +- .../test_data/parser/inline/ok/0107_method_call_expr.rast | 2 +- .../parser/inline/ok/0138_associated_type_bounds.rast | 2 +- .../test_data/parser/inline/ok/0150_impl_type_params.rast | 2 +- .../test_data/parser/inline/ok/0151_trait_alias.rast | 6 +++--- crates/ra_syntax/test_data/parser/ok/0032_where_for.rast | 2 +- crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast | 4 ++-- .../test_data/parser/ok/0045_block_inner_attrs.rast | 2 +- .../test_data/parser/ok/0050_async_block_as_argument.rast | 2 +- .../ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast | 4 ++-- .../ra_syntax/test_data/parser/ok/0052_for_range_block.rast | 2 +- .../test_data/parser/ok/0054_qual_path_in_type_arg.rast | 2 +- 27 files changed, 42 insertions(+), 42 deletions(-) (limited to 'crates/ra_syntax/test_data') diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast index 0afa24b77..307d9b31b 100644 --- a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast +++ b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast @@ -25,7 +25,7 @@ SOURCE_FILE@0..389 PATH_SEGMENT@29..37 NAME_REF@29..33 IDENT@29..33 "Sink" - TYPE_ARG_LIST@33..37 + GENERIC_ARG_LIST@33..37 L_ANGLE@33..34 LIFETIME_ARG@34..36 LIFETIME@34..36 "'a" @@ -79,7 +79,7 @@ SOURCE_FILE@0..389 PATH_SEGMENT@82..92 NAME_REF@82..85 IDENT@82..85 "Vec" - TYPE_ARG_LIST@85..92 + GENERIC_ARG_LIST@85..92 L_ANGLE@85..86 TYPE_ARG@86..91 PATH_TYPE@86..91 diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast index 3eef848fc..f48ab6e71 100644 --- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..86 PATH_SEGMENT@22..68 NAME_REF@22..29 IDENT@22..29 "RefCell" - TYPE_ARG_LIST@29..68 + GENERIC_ARG_LIST@29..68 L_ANGLE@29..30 "<" TYPE_ARG@30..68 PATH_TYPE@30..68 @@ -24,7 +24,7 @@ SOURCE_FILE@0..86 PATH_SEGMENT@30..68 NAME_REF@30..37 IDENT@30..37 "HashMap" - TYPE_ARG_LIST@37..68 + GENERIC_ARG_LIST@37..68 L_ANGLE@37..38 "<" WHITESPACE@38..47 "\n " TYPE_ARG@47..53 @@ -41,7 +41,7 @@ SOURCE_FILE@0..86 PATH_SEGMENT@63..68 NAME_REF@63..66 IDENT@63..66 "Box" - TYPE_ARG_LIST@66..68 + GENERIC_ARG_LIST@66..68 L_ANGLE@66..67 "<" TYPE_ARG@67..68 ERROR@67..68 diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast index 4c2d1ad68..1cb1e9757 100644 --- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast +++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast @@ -50,7 +50,7 @@ SOURCE_FILE@0..240 PATH_SEGMENT@37..46 NAME_REF@37..42 IDENT@37..42 "Trait" - TYPE_ARG_LIST@42..46 + GENERIC_ARG_LIST@42..46 L_ANGLE@42..43 "<" LIFETIME_ARG@43..45 LIFETIME@43..45 "\'a" @@ -92,7 +92,7 @@ SOURCE_FILE@0..240 PATH_SEGMENT@78..88 NAME_REF@78..81 IDENT@78..81 "Box" - TYPE_ARG_LIST@81..88 + GENERIC_ARG_LIST@81..88 L_ANGLE@81..82 "<" TYPE_ARG@82..88 PAREN_TYPE@82..88 @@ -133,7 +133,7 @@ SOURCE_FILE@0..240 PATH_SEGMENT@111..120 NAME_REF@111..116 IDENT@111..116 "Trait" - TYPE_ARG_LIST@116..120 + GENERIC_ARG_LIST@116..120 L_ANGLE@116..117 "<" LIFETIME_ARG@117..119 LIFETIME@117..119 "\'a" @@ -156,7 +156,7 @@ SOURCE_FILE@0..240 PATH_SEGMENT@135..141 NAME_REF@135..138 IDENT@135..138 "Box" - TYPE_ARG_LIST@138..141 + GENERIC_ARG_LIST@138..141 L_ANGLE@138..139 "<" TYPE_ARG@139..141 PAREN_TYPE@139..141 @@ -235,7 +235,7 @@ SOURCE_FILE@0..240 PATH_SEGMENT@192..215 NAME_REF@192..195 IDENT@192..195 "Box" - TYPE_ARG_LIST@195..215 + GENERIC_ARG_LIST@195..215 L_ANGLE@195..196 "<" TYPE_ARG@196..215 PAREN_TYPE@196..215 @@ -253,7 +253,7 @@ SOURCE_FILE@0..240 PATH_SEGMENT@205..214 NAME_REF@205..210 IDENT@205..210 "Trait" - TYPE_ARG_LIST@210..214 + GENERIC_ARG_LIST@210..214 L_ANGLE@210..211 "<" LIFETIME_ARG@211..213 LIFETIME@211..213 "\'a" diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast index 7e4b11c27..1b08c834e 100644 --- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast @@ -31,7 +31,7 @@ SOURCE_FILE@0..38 PATH_SEGMENT@23..34 NAME_REF@23..31 IDENT@23..31 "OnceCell" - TYPE_ARG_LIST@31..34 + GENERIC_ARG_LIST@31..34 L_ANGLE@31..32 "<" TYPE_ARG@32..33 PATH_TYPE@32..33 diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast index 0678d4278..7a5e115bc 100644 --- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast @@ -62,7 +62,7 @@ SOURCE_FILE@0..83 DOT@66..67 "." NAME_REF@67..70 IDENT@67..70 "max" - TYPE_ARG_LIST@70..77 + GENERIC_ARG_LIST@70..77 COLON2@70..72 "::" L_ANGLE@72..73 "<" TYPE_ARG@73..76 diff --git a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast b/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast index 8831cfa6c..38c15b581 100644 --- a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast +++ b/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast @@ -3,7 +3,7 @@ PATH_TYPE@0..16 PATH_SEGMENT@0..16 NAME_REF@0..6 IDENT@0..6 "Result" - TYPE_ARG_LIST@6..16 + GENERIC_ARG_LIST@6..16 L_ANGLE@6..7 "<" TYPE_ARG@7..10 PATH_TYPE@7..10 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast index ace8ad050..44d92aedb 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast @@ -12,7 +12,7 @@ SOURCE_FILE@0..39 PATH_SEGMENT@9..37 NAME_REF@9..12 IDENT@9..12 "Box" - TYPE_ARG_LIST@12..37 + GENERIC_ARG_LIST@12..37 L_ANGLE@12..13 "<" TYPE_ARG@13..36 PATH_TYPE@13..36 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast index 20b2b6c19..1b31aa95a 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast @@ -53,7 +53,7 @@ SOURCE_FILE@0..69 PATH_SEGMENT@53..62 NAME_REF@53..56 IDENT@53..56 "Box" - TYPE_ARG_LIST@56..62 + GENERIC_ARG_LIST@56..62 L_ANGLE@56..57 "<" TYPE_ARG@57..61 PATH_TYPE@57..61 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast index f45f3cab8..32b2959bd 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast @@ -17,7 +17,7 @@ SOURCE_FILE@0..43 PATH_SEGMENT@14..36 NAME_REF@14..22 IDENT@14..22 "Iterator" - TYPE_ARG_LIST@22..36 + GENERIC_ARG_LIST@22..36 L_ANGLE@22..23 "<" ASSOC_TYPE_ARG@23..35 NAME_REF@23..27 @@ -28,7 +28,7 @@ SOURCE_FILE@0..43 PATH_SEGMENT@28..35 NAME_REF@28..31 IDENT@28..31 "Foo" - TYPE_ARG_LIST@31..35 + GENERIC_ARG_LIST@31..35 L_ANGLE@31..32 "<" LIFETIME_ARG@32..34 LIFETIME@32..34 "\'a" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast index 2185d3c91..b9381abdc 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast @@ -12,7 +12,7 @@ SOURCE_FILE@0..46 PATH_SEGMENT@9..44 NAME_REF@9..10 IDENT@9..10 "B" - TYPE_ARG_LIST@10..44 + GENERIC_ARG_LIST@10..44 L_ANGLE@10..11 "<" LIFETIME_ARG@11..18 LIFETIME@11..18 "\'static" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast index d4235a8b1..c100d1c71 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast @@ -30,7 +30,7 @@ SOURCE_FILE@0..35 PATH_SEGMENT@21..28 NAME_REF@21..24 IDENT@21..24 "Foo" - TYPE_ARG_LIST@24..28 + GENERIC_ARG_LIST@24..28 L_ANGLE@24..25 "<" LIFETIME_ARG@25..27 LIFETIME@25..27 "\'a" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast index 37757ccd4..4d8404e7c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..58 PATH_SEGMENT@12..23 NAME_REF@12..15 IDENT@12..15 "Box" - TYPE_ARG_LIST@15..23 + GENERIC_ARG_LIST@15..23 L_ANGLE@15..16 "<" TYPE_ARG@16..22 DYN_TRAIT_TYPE@16..22 @@ -55,7 +55,7 @@ SOURCE_FILE@0..58 PATH_SEGMENT@39..54 NAME_REF@39..42 IDENT@39..42 "Box" - TYPE_ARG_LIST@42..54 + GENERIC_ARG_LIST@42..54 L_ANGLE@42..43 "<" TYPE_ARG@43..53 DYN_TRAIT_TYPE@43..53 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast index 2bfb52453..de2016f18 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast @@ -60,7 +60,7 @@ SOURCE_FILE@0..91 COLON2@56..58 "::" NAME_REF@58..59 IDENT@58..59 "a" - TYPE_ARG_LIST@59..64 + GENERIC_ARG_LIST@59..64 COLON2@59..61 "::" L_ANGLE@61..62 "<" TYPE_ARG@62..63 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast index 629fea99d..3a7fcfe24 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast @@ -17,7 +17,7 @@ SOURCE_FILE@0..42 PATH_SEGMENT@13..35 NAME_REF@13..21 IDENT@13..21 "Iterator" - TYPE_ARG_LIST@21..35 + GENERIC_ARG_LIST@21..35 L_ANGLE@21..22 "<" ASSOC_TYPE_ARG@22..34 NAME_REF@22..26 @@ -28,7 +28,7 @@ SOURCE_FILE@0..42 PATH_SEGMENT@27..34 NAME_REF@27..30 IDENT@27..30 "Foo" - TYPE_ARG_LIST@30..34 + GENERIC_ARG_LIST@30..34 L_ANGLE@30..31 "<" LIFETIME_ARG@31..33 LIFETIME@31..33 "\'a" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast index e7629ac03..5f4807522 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast @@ -95,7 +95,7 @@ SOURCE_FILE@0..121 PATH_SEGMENT@101..119 NAME_REF@101..110 IDENT@101..110 "PartialEq" - TYPE_ARG_LIST@110..119 + GENERIC_ARG_LIST@110..119 L_ANGLE@110..111 "<" TYPE_ARG@111..118 REFERENCE_TYPE@111..118 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast index 3f53d60c0..1244a5031 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast @@ -12,7 +12,7 @@ SOURCE_FILE@0..29 PATH_SEGMENT@9..27 NAME_REF@9..12 IDENT@9..12 "Box" - TYPE_ARG_LIST@12..27 + GENERIC_ARG_LIST@12..27 L_ANGLE@12..13 "<" TYPE_ARG@13..26 PATH_TYPE@13..26 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast index b2961b0ff..be8365e05 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast @@ -36,7 +36,7 @@ SOURCE_FILE@0..49 DOT@29..30 "." NAME_REF@30..33 IDENT@30..33 "bar" - TYPE_ARG_LIST@33..38 + GENERIC_ARG_LIST@33..38 COLON2@33..35 "::" L_ANGLE@35..36 "<" TYPE_ARG@36..37 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast index 157513565..e0a82df75 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast @@ -18,7 +18,7 @@ SOURCE_FILE@0..59 PATH_SEGMENT@16..39 NAME_REF@16..24 IDENT@16..24 "Iterator" - TYPE_ARG_LIST@24..39 + GENERIC_ARG_LIST@24..39 L_ANGLE@24..25 "<" ASSOC_TYPE_ARG@25..38 NAME_REF@25..29 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast index 8f197a19d..12194abda 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast @@ -22,7 +22,7 @@ SOURCE_FILE@0..29 PATH_SEGMENT@19..25 NAME_REF@19..22 IDENT@19..22 "Bar" - TYPE_ARG_LIST@22..25 + GENERIC_ARG_LIST@22..25 L_ANGLE@22..23 "<" TYPE_ARG@23..24 PATH_TYPE@23..24 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast index cc220e534..dac50410e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast @@ -20,7 +20,7 @@ SOURCE_FILE@0..83 PATH_SEGMENT@13..17 NAME_REF@13..14 IDENT@13..14 "T" - TYPE_ARG_LIST@14..17 + GENERIC_ARG_LIST@14..17 L_ANGLE@14..15 "<" TYPE_ARG@15..16 PATH_TYPE@15..16 @@ -52,7 +52,7 @@ SOURCE_FILE@0..83 PATH_SEGMENT@32..36 NAME_REF@32..33 IDENT@32..33 "T" - TYPE_ARG_LIST@33..36 + GENERIC_ARG_LIST@33..36 L_ANGLE@33..34 "<" TYPE_ARG@34..35 PATH_TYPE@34..35 @@ -115,7 +115,7 @@ SOURCE_FILE@0..83 PATH_SEGMENT@77..81 NAME_REF@77..78 IDENT@77..78 "T" - TYPE_ARG_LIST@78..81 + GENERIC_ARG_LIST@78..81 L_ANGLE@78..79 "<" TYPE_ARG@79..80 PATH_TYPE@79..80 diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast index 10da87c71..d59548f21 100644 --- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast +++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast @@ -49,7 +49,7 @@ SOURCE_FILE@0..116 PATH_SEGMENT@65..81 NAME_REF@65..76 IDENT@65..76 "Deserialize" - TYPE_ARG_LIST@76..81 + GENERIC_ARG_LIST@76..81 L_ANGLE@76..77 "<" LIFETIME_ARG@77..80 LIFETIME@77..80 "\'de" diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast index 1d75ed08f..0e0c8c9dc 100644 --- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast @@ -249,7 +249,7 @@ SOURCE_FILE@0..3813 PATH_SEGMENT@653..663 NAME_REF@653..657 IDENT@653..657 "Cell" - TYPE_ARG_LIST@657..663 + GENERIC_ARG_LIST@657..663 L_ANGLE@657..658 "<" TYPE_ARG@658..662 PATH_TYPE@658..662 @@ -1588,7 +1588,7 @@ SOURCE_FILE@0..3813 PATH_SEGMENT@2888..2901 NAME_REF@2888..2893 IDENT@2888..2893 "union" - TYPE_ARG_LIST@2893..2901 + GENERIC_ARG_LIST@2893..2901 L_ANGLE@2893..2894 "<" LIFETIME_ARG@2894..2900 LIFETIME@2894..2900 "\'union" diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast index 139ce9046..bd152ffa3 100644 --- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast @@ -141,7 +141,7 @@ SOURCE_FILE@0..686 PATH_SEGMENT@589..600 NAME_REF@589..594 IDENT@589..594 "Event" - TYPE_ARG_LIST@594..600 + GENERIC_ARG_LIST@594..600 L_ANGLE@594..595 "<" TYPE_ARG@595..599 PATH_TYPE@595..599 diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast index 798e81ca6..48e1f07d1 100644 --- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast +++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast @@ -32,7 +32,7 @@ SOURCE_FILE@0..95 PATH_SEGMENT@28..48 NAME_REF@28..34 IDENT@28..34 "Future" - TYPE_ARG_LIST@34..48 + GENERIC_ARG_LIST@34..48 L_ANGLE@34..35 "<" ASSOC_TYPE_ARG@35..47 NAME_REF@35..41 diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast index 2cc849784..706ccdc39 100644 --- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast +++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast @@ -172,7 +172,7 @@ SOURCE_FILE@0..519 PATH_SEGMENT@159..166 NAME_REF@159..162 IDENT@159..162 "Foo" - TYPE_ARG_LIST@162..166 + GENERIC_ARG_LIST@162..166 L_ANGLE@162..163 "<" LIFETIME_ARG@163..165 LIFETIME@163..165 "\'a" @@ -490,7 +490,7 @@ SOURCE_FILE@0..519 PATH_SEGMENT@505..513 NAME_REF@505..507 IDENT@505..507 "Rc" - TYPE_ARG_LIST@507..513 + GENERIC_ARG_LIST@507..513 L_ANGLE@507..508 "<" TYPE_ARG@508..512 PATH_TYPE@508..512 diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast index a30000398..fd4f4f242 100644 --- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast +++ b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast @@ -50,7 +50,7 @@ SOURCE_FILE@0..80 DOT@43..44 "." NAME_REF@44..47 IDENT@44..47 "sum" - TYPE_ARG_LIST@47..54 + GENERIC_ARG_LIST@47..54 COLON2@47..49 "::" L_ANGLE@49..50 "<" TYPE_ARG@50..53 diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast index e3997ac5b..0d48c7e81 100644 --- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast @@ -16,7 +16,7 @@ SOURCE_FILE@0..88 PATH_SEGMENT@10..23 NAME_REF@10..13 IDENT@10..13 "Foo" - TYPE_ARG_LIST@13..23 + GENERIC_ARG_LIST@13..23 L_ANGLE@13..14 "<" TYPE_ARG@14..22 PATH_TYPE@14..22 -- 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_syntax/test_data/parser/inline/ok/0039_type_arg.rast | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'crates/ra_syntax/test_data') diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast index b9381abdc..69e98b9d6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast @@ -27,7 +27,8 @@ SOURCE_FILE@0..46 COMMA@23..24 "," WHITESPACE@24..25 " " CONST_ARG@25..26 - INT_NUMBER@25..26 "1" + LITERAL@25..26 + INT_NUMBER@25..26 "1" COMMA@26..27 "," WHITESPACE@27..28 " " CONST_ARG@28..33 -- cgit v1.2.3