From 28ef4c375a9f56d69daf885504aea3df7012bb81 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 15:36:21 +0200 Subject: Rename TypeParamList -> GenericParamList --- .../ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast | 4 ++-- .../test_data/parser/inline/ok/0005_function_type_params.rast | 2 +- .../test_data/parser/inline/ok/0007_type_param_bounds.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast | 4 ++-- .../test_data/parser/inline/ok/0045_param_list_opt_patterns.rast | 2 +- .../test_data/parser/inline/ok/0073_type_item_type_params.rast | 2 +- .../test_data/parser/inline/ok/0076_function_where_clause.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast | 6 +++--- .../test_data/parser/inline/ok/0090_type_param_default.rast | 2 +- .../test_data/parser/inline/ok/0114_tuple_struct_where.rast | 4 ++-- .../parser/inline/ok/0122_generic_lifetime_type_attribute.rast | 2 +- .../test_data/parser/inline/ok/0138_associated_type_bounds.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast | 2 +- .../ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast | 2 +- crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast | 6 +++--- 15 files changed, 22 insertions(+), 22 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline') diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast index 9cae1e8cc..b0f2b5888 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..54 WHITESPACE@2..3 " " NAME@3..12 IDENT@3..12 "for_trait" - TYPE_PARAM_LIST@12..15 + GENERIC_PARAM_LIST@12..15 L_ANGLE@12..13 "<" TYPE_PARAM@13..14 NAME@13..14 @@ -19,7 +19,7 @@ SOURCE_FILE@0..54 WHITESPACE@23..27 "\n " WHERE_PRED@27..49 FOR_KW@27..30 "for" - TYPE_PARAM_LIST@30..34 + GENERIC_PARAM_LIST@30..34 L_ANGLE@30..31 "<" LIFETIME_PARAM@31..33 LIFETIME@31..33 "\'a" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast index 1b56e20d5..8e0252ce7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..28 WHITESPACE@2..3 " " NAME@3..6 IDENT@3..6 "foo" - TYPE_PARAM_LIST@6..23 + GENERIC_PARAM_LIST@6..23 L_ANGLE@6..7 "<" TYPE_PARAM@7..22 NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast index 7cb9e1d55..49aca06b0 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..35 WHITESPACE@6..7 " " NAME@7..8 IDENT@7..8 "S" - TYPE_PARAM_LIST@8..33 + GENERIC_PARAM_LIST@8..33 L_ANGLE@8..9 "<" TYPE_PARAM@9..32 NAME@9..10 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast index 884ab2dbf..8f20ccaa3 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..101 WHITESPACE@5..6 " " NAME@6..7 IDENT@6..7 "T" - TYPE_PARAM_LIST@7..10 + GENERIC_PARAM_LIST@7..10 L_ANGLE@7..8 "<" TYPE_PARAM@8..9 NAME@8..9 @@ -57,7 +57,7 @@ SOURCE_FILE@0..101 WHITESPACE@47..48 " " NAME@48..49 IDENT@48..49 "X" - TYPE_PARAM_LIST@49..69 + GENERIC_PARAM_LIST@49..69 L_ANGLE@49..50 "<" TYPE_PARAM@50..68 NAME@50..51 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 fbf2e7c67..d4235a8b1 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 @@ -4,7 +4,7 @@ SOURCE_FILE@0..35 WHITESPACE@2..3 " " NAME@3..6 IDENT@3..6 "foo" - TYPE_PARAM_LIST@6..30 + GENERIC_PARAM_LIST@6..30 L_ANGLE@6..7 "<" TYPE_PARAM@7..29 NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast index 0123cb108..00cce69e6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..21 WHITESPACE@4..5 " " NAME@5..11 IDENT@5..11 "Result" - TYPE_PARAM_LIST@11..14 + GENERIC_PARAM_LIST@11..14 L_ANGLE@11..12 "<" TYPE_PARAM@12..13 NAME@12..13 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast index cfa4c05f5..96217a7fd 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..29 WHITESPACE@2..3 " " NAME@3..6 IDENT@3..6 "foo" - TYPE_PARAM_LIST@6..9 + GENERIC_PARAM_LIST@6..9 L_ANGLE@6..7 "<" TYPE_PARAM@7..8 NAME@7..8 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 175ec9844..e7629ac03 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 @@ -9,7 +9,7 @@ SOURCE_FILE@0..121 WHITESPACE@8..9 " " FOR_TYPE@9..27 FOR_KW@9..12 "for" - TYPE_PARAM_LIST@12..16 + GENERIC_PARAM_LIST@12..16 L_ANGLE@12..13 "<" LIFETIME_PARAM@13..15 LIFETIME@13..15 "\'a" @@ -39,7 +39,7 @@ SOURCE_FILE@0..121 WHITESPACE@37..38 " " FOR_TYPE@38..80 FOR_KW@38..41 "for" - TYPE_PARAM_LIST@41..45 + GENERIC_PARAM_LIST@41..45 L_ANGLE@41..42 "<" LIFETIME_PARAM@42..44 LIFETIME@42..44 "\'a" @@ -84,7 +84,7 @@ SOURCE_FILE@0..121 WHITESPACE@92..93 " " FOR_TYPE@93..119 FOR_KW@93..96 "for" - TYPE_PARAM_LIST@96..100 + GENERIC_PARAM_LIST@96..100 L_ANGLE@96..97 "<" LIFETIME_PARAM@97..99 LIFETIME@97..99 "\'a" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast index cee2bc906..1d24619c3 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..19 WHITESPACE@6..7 " " NAME@7..8 IDENT@7..8 "S" - TYPE_PARAM_LIST@8..17 + GENERIC_PARAM_LIST@8..17 L_ANGLE@8..9 "<" TYPE_PARAM@9..16 NAME@9..10 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast index 01d717d6b..0b1ec5b27 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..53 WHITESPACE@6..7 " " NAME@7..11 IDENT@7..11 "Test" - TYPE_PARAM_LIST@11..14 + GENERIC_PARAM_LIST@11..14 L_ANGLE@11..12 "<" TYPE_PARAM@12..13 NAME@12..13 @@ -45,7 +45,7 @@ SOURCE_FILE@0..53 WHITESPACE@40..41 " " NAME@41..45 IDENT@41..45 "Test" - TYPE_PARAM_LIST@45..48 + GENERIC_PARAM_LIST@45..48 L_ANGLE@45..46 "<" TYPE_PARAM@46..47 NAME@46..47 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast index f4008cfdc..edac8d5d9 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..64 WHITESPACE@2..3 " " NAME@3..6 IDENT@3..6 "foo" - TYPE_PARAM_LIST@6..49 + GENERIC_PARAM_LIST@6..49 L_ANGLE@6..7 "<" LIFETIME_PARAM@7..29 ATTR@7..26 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 1ad03e005..157513565 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 @@ -4,7 +4,7 @@ SOURCE_FILE@0..59 WHITESPACE@2..3 " " NAME@3..12 IDENT@3..12 "print_all" - TYPE_PARAM_LIST@12..40 + GENERIC_PARAM_LIST@12..40 L_ANGLE@12..13 "<" TYPE_PARAM@13..39 NAME@13..14 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast index 4b9b8e0ab..6981ef971 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..24 WHITESPACE@6..7 " " NAME@7..8 IDENT@7..8 "S" - TYPE_PARAM_LIST@8..22 + GENERIC_PARAM_LIST@8..22 L_ANGLE@8..9 "<" CONST_PARAM@9..21 CONST_KW@9..14 "const" 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 77e12cad6..07e555d63 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 @@ -1,7 +1,7 @@ SOURCE_FILE@0..29 IMPL_DEF@0..28 IMPL_KW@0..4 "impl" - TYPE_PARAM_LIST@4..18 + GENERIC_PARAM_LIST@4..18 L_ANGLE@4..5 "<" CONST_PARAM@5..17 CONST_KW@5..10 "const" 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 48d73a4e7..e2a770a37 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 @@ -4,7 +4,7 @@ SOURCE_FILE@0..83 WHITESPACE@5..6 " " NAME@6..7 IDENT@6..7 "Z" - TYPE_PARAM_LIST@7..10 + GENERIC_PARAM_LIST@7..10 L_ANGLE@7..8 "<" TYPE_PARAM@8..9 NAME@8..9 @@ -36,7 +36,7 @@ SOURCE_FILE@0..83 WHITESPACE@24..25 " " NAME@25..26 IDENT@25..26 "Z" - TYPE_PARAM_LIST@26..29 + GENERIC_PARAM_LIST@26..29 L_ANGLE@26..27 "<" TYPE_PARAM@27..28 NAME@27..28 @@ -87,7 +87,7 @@ SOURCE_FILE@0..83 WHITESPACE@57..58 " " NAME@58..59 IDENT@58..59 "Z" - TYPE_PARAM_LIST@59..62 + GENERIC_PARAM_LIST@59..62 L_ANGLE@59..60 "<" TYPE_PARAM@60..61 NAME@60..61 -- cgit v1.2.3