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 --- .../test_data/parser/ok/0001_struct_item.rast | 2 +- .../parser/ok/0018_struct_type_params.rast | 30 +++++++++++----------- .../ra_syntax/test_data/parser/ok/0019_enums.rast | 2 +- .../parser/ok/0020_type_param_bounds.rast | 20 +++++++-------- .../test_data/parser/ok/0032_where_for.rast | 4 +-- .../test_data/parser/ok/0035_weird_exprs.rast | 2 +- .../test_data/parser/ok/0036_fully_qualified.rast | 2 +- .../test_data/parser/ok/0051_parameter_attrs.rast | 8 +++--- .../parser/ok/0065_plus_after_fn_trait_bound.rast | 2 +- .../test_data/parser/ok/0067_where_for_pred.rast | 26 +++++++++---------- 10 files changed, 49 insertions(+), 49 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/ok') diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast index 705f7e001..cf801aedd 100644 --- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..32 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/ok/0018_struct_type_params.rast b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast index 451634e3f..3ee208fff 100644 --- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..290 WHITESPACE@6..7 " " NAME@7..9 IDENT@7..9 "S1" - TYPE_PARAM_LIST@9..12 + GENERIC_PARAM_LIST@9..12 L_ANGLE@9..10 "<" TYPE_PARAM@10..11 NAME@10..11 @@ -17,7 +17,7 @@ SOURCE_FILE@0..290 WHITESPACE@20..21 " " NAME@21..23 IDENT@21..23 "S2" - TYPE_PARAM_LIST@23..26 + GENERIC_PARAM_LIST@23..26 L_ANGLE@23..24 "<" TYPE_PARAM@24..25 NAME@24..25 @@ -39,7 +39,7 @@ SOURCE_FILE@0..290 WHITESPACE@39..40 " " NAME@40..42 IDENT@40..42 "S3" - TYPE_PARAM_LIST@42..45 + GENERIC_PARAM_LIST@42..45 L_ANGLE@42..43 "<" TYPE_PARAM@43..44 NAME@43..44 @@ -67,7 +67,7 @@ SOURCE_FILE@0..290 WHITESPACE@64..65 " " NAME@65..67 IDENT@65..67 "S4" - TYPE_PARAM_LIST@67..69 + GENERIC_PARAM_LIST@67..69 L_ANGLE@67..68 "<" R_ANGLE@68..69 ">" SEMICOLON@69..70 ";" @@ -77,7 +77,7 @@ SOURCE_FILE@0..290 WHITESPACE@77..78 " " NAME@78..80 IDENT@78..80 "S5" - TYPE_PARAM_LIST@80..84 + GENERIC_PARAM_LIST@80..84 L_ANGLE@80..81 "<" LIFETIME_PARAM@81..83 LIFETIME@81..83 "\'a" @@ -89,7 +89,7 @@ SOURCE_FILE@0..290 WHITESPACE@92..93 " " NAME@93..95 IDENT@93..95 "S6" - TYPE_PARAM_LIST@95..100 + GENERIC_PARAM_LIST@95..100 L_ANGLE@95..96 "<" LIFETIME_PARAM@96..99 LIFETIME@96..98 "\'a" @@ -102,7 +102,7 @@ SOURCE_FILE@0..290 WHITESPACE@108..109 " " NAME@109..111 IDENT@109..111 "S7" - TYPE_PARAM_LIST@111..119 + GENERIC_PARAM_LIST@111..119 L_ANGLE@111..112 "<" LIFETIME_PARAM@112..118 LIFETIME@112..114 "\'a" @@ -117,7 +117,7 @@ SOURCE_FILE@0..290 WHITESPACE@127..128 " " NAME@128..130 IDENT@128..130 "S8" - TYPE_PARAM_LIST@130..141 + GENERIC_PARAM_LIST@130..141 L_ANGLE@130..131 "<" LIFETIME_PARAM@131..139 LIFETIME@131..133 "\'a" @@ -135,7 +135,7 @@ SOURCE_FILE@0..290 WHITESPACE@149..150 " " NAME@150..152 IDENT@150..152 "S9" - TYPE_PARAM_LIST@152..165 + GENERIC_PARAM_LIST@152..165 L_ANGLE@152..153 "<" LIFETIME_PARAM@153..164 LIFETIME@153..155 "\'a" @@ -154,7 +154,7 @@ SOURCE_FILE@0..290 WHITESPACE@173..174 " " NAME@174..177 IDENT@174..177 "S10" - TYPE_PARAM_LIST@177..182 + GENERIC_PARAM_LIST@177..182 L_ANGLE@177..178 "<" LIFETIME_PARAM@178..180 LIFETIME@178..180 "\'a" @@ -167,7 +167,7 @@ SOURCE_FILE@0..290 WHITESPACE@190..191 " " NAME@191..194 IDENT@191..194 "S11" - TYPE_PARAM_LIST@194..202 + GENERIC_PARAM_LIST@194..202 L_ANGLE@194..195 "<" LIFETIME_PARAM@195..197 LIFETIME@195..197 "\'a" @@ -183,7 +183,7 @@ SOURCE_FILE@0..290 WHITESPACE@210..211 " " NAME@211..214 IDENT@211..214 "S12" - TYPE_PARAM_LIST@214..232 + GENERIC_PARAM_LIST@214..232 L_ANGLE@214..215 "<" LIFETIME_PARAM@215..222 LIFETIME@215..217 "\'a" @@ -207,7 +207,7 @@ SOURCE_FILE@0..290 WHITESPACE@241..242 " " NAME@242..245 IDENT@242..245 "S13" - TYPE_PARAM_LIST@245..248 + GENERIC_PARAM_LIST@245..248 L_ANGLE@245..246 "<" TYPE_PARAM@246..247 NAME@246..247 @@ -220,7 +220,7 @@ SOURCE_FILE@0..290 WHITESPACE@256..257 " " NAME@257..260 IDENT@257..260 "S14" - TYPE_PARAM_LIST@260..266 + GENERIC_PARAM_LIST@260..266 L_ANGLE@260..261 "<" TYPE_PARAM@261..262 NAME@261..262 @@ -238,7 +238,7 @@ SOURCE_FILE@0..290 WHITESPACE@274..275 " " NAME@275..278 IDENT@275..278 "S15" - TYPE_PARAM_LIST@278..288 + GENERIC_PARAM_LIST@278..288 L_ANGLE@278..279 "<" LIFETIME_PARAM@279..281 LIFETIME@279..281 "\'a" diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast index f767e9e19..993f28c4d 100644 --- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast +++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast @@ -15,7 +15,7 @@ SOURCE_FILE@0..182 WHITESPACE@17..18 " " NAME@18..20 IDENT@18..20 "E2" - TYPE_PARAM_LIST@20..23 + GENERIC_PARAM_LIST@20..23 L_ANGLE@20..21 "<" TYPE_PARAM@21..22 NAME@21..22 diff --git a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast index 4fb4baf56..5100e6a48 100644 --- a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast +++ b/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..250 WHITESPACE@6..7 " " NAME@7..8 IDENT@7..8 "A" - TYPE_PARAM_LIST@8..11 + GENERIC_PARAM_LIST@8..11 L_ANGLE@8..9 "<" TYPE_PARAM@9..10 NAME@9..10 @@ -17,7 +17,7 @@ SOURCE_FILE@0..250 WHITESPACE@19..20 " " NAME@20..21 IDENT@20..21 "B" - TYPE_PARAM_LIST@21..25 + GENERIC_PARAM_LIST@21..25 L_ANGLE@21..22 "<" TYPE_PARAM@22..24 NAME@22..23 @@ -32,7 +32,7 @@ SOURCE_FILE@0..250 WHITESPACE@33..34 " " NAME@34..35 IDENT@34..35 "C" - TYPE_PARAM_LIST@35..42 + GENERIC_PARAM_LIST@35..42 L_ANGLE@35..36 "<" TYPE_PARAM@36..41 NAME@36..37 @@ -50,7 +50,7 @@ SOURCE_FILE@0..250 WHITESPACE@50..51 " " NAME@51..52 IDENT@51..52 "D" - TYPE_PARAM_LIST@52..62 + GENERIC_PARAM_LIST@52..62 L_ANGLE@52..53 "<" TYPE_PARAM@53..60 NAME@53..54 @@ -71,7 +71,7 @@ SOURCE_FILE@0..250 WHITESPACE@70..71 " " NAME@71..72 IDENT@71..72 "E" - TYPE_PARAM_LIST@72..85 + GENERIC_PARAM_LIST@72..85 L_ANGLE@72..73 "<" TYPE_PARAM@73..83 NAME@73..74 @@ -95,7 +95,7 @@ SOURCE_FILE@0..250 WHITESPACE@93..94 " " NAME@94..95 IDENT@94..95 "F" - TYPE_PARAM_LIST@95..115 + GENERIC_PARAM_LIST@95..115 L_ANGLE@95..96 "<" TYPE_PARAM@96..114 NAME@96..97 @@ -127,7 +127,7 @@ SOURCE_FILE@0..250 WHITESPACE@123..124 " " NAME@124..125 IDENT@124..125 "G" - TYPE_PARAM_LIST@125..142 + GENERIC_PARAM_LIST@125..142 L_ANGLE@125..126 "<" TYPE_PARAM@126..141 NAME@126..127 @@ -158,7 +158,7 @@ SOURCE_FILE@0..250 WHITESPACE@150..151 " " NAME@151..152 IDENT@151..152 "H" - TYPE_PARAM_LIST@152..179 + GENERIC_PARAM_LIST@152..179 L_ANGLE@152..153 "<" TYPE_PARAM@153..178 NAME@153..154 @@ -199,7 +199,7 @@ SOURCE_FILE@0..250 WHITESPACE@187..188 " " NAME@188..189 IDENT@188..189 "I" - TYPE_PARAM_LIST@189..198 + GENERIC_PARAM_LIST@189..198 L_ANGLE@189..190 "<" TYPE_PARAM@190..192 NAME@190..191 @@ -222,7 +222,7 @@ SOURCE_FILE@0..250 WHITESPACE@206..207 " " NAME@207..208 IDENT@207..208 "K" - TYPE_PARAM_LIST@208..249 + GENERIC_PARAM_LIST@208..249 L_ANGLE@208..209 "<" LIFETIME_PARAM@209..215 LIFETIME@209..211 "\'a" 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 1b2325a2d..10da87c71 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 @@ -4,7 +4,7 @@ SOURCE_FILE@0..116 WHITESPACE@2..3 " " NAME@3..21 IDENT@3..21 "test_serialization" - TYPE_PARAM_LIST@21..26 + GENERIC_PARAM_LIST@21..26 L_ANGLE@21..22 "<" TYPE_PARAM@22..25 NAME@22..25 @@ -38,7 +38,7 @@ SOURCE_FILE@0..116 TYPE_BOUND@56..81 FOR_TYPE@56..81 FOR_KW@56..59 "for" - TYPE_PARAM_LIST@59..64 + GENERIC_PARAM_LIST@59..64 L_ANGLE@59..60 "<" LIFETIME_PARAM@60..63 LIFETIME@60..63 "\'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 2e36b54bc..ea54651b7 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 @@ -1565,7 +1565,7 @@ SOURCE_FILE@0..3813 WHITESPACE@2856..2857 " " NAME@2857..2862 IDENT@2857..2862 "union" - TYPE_PARAM_LIST@2862..2870 + GENERIC_PARAM_LIST@2862..2870 L_ANGLE@2862..2863 "<" LIFETIME_PARAM@2863..2869 LIFETIME@2863..2869 "\'union" diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast index a5f09e364..c4da317b9 100644 --- a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast +++ b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast @@ -9,7 +9,7 @@ SOURCE_FILE@0..157 WHITESPACE@68..69 " " NAME@69..72 IDENT@69..72 "foo" - TYPE_PARAM_LIST@72..85 + GENERIC_PARAM_LIST@72..85 L_ANGLE@72..73 "<" TYPE_PARAM@73..84 NAME@73..74 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 9a173b002..8081eefbc 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 @@ -137,7 +137,7 @@ SOURCE_FILE@0..519 WHITESPACE@132..133 " " NAME@133..136 IDENT@133..136 "foo" - TYPE_PARAM_LIST@136..168 + GENERIC_PARAM_LIST@136..168 L_ANGLE@136..137 "<" TYPE_PARAM@137..167 NAME@137..138 @@ -341,7 +341,7 @@ SOURCE_FILE@0..519 WHITESPACE@342..343 " " NAME@343..345 IDENT@343..345 "g3" - TYPE_PARAM_LIST@345..349 + GENERIC_PARAM_LIST@345..349 L_ANGLE@345..346 "<" LIFETIME_PARAM@346..348 LIFETIME@346..348 "\'a" @@ -373,7 +373,7 @@ SOURCE_FILE@0..519 WHITESPACE@379..380 " " NAME@380..382 IDENT@380..382 "g4" - TYPE_PARAM_LIST@382..386 + GENERIC_PARAM_LIST@382..386 L_ANGLE@382..383 "<" LIFETIME_PARAM@383..385 LIFETIME@383..385 "\'a" @@ -405,7 +405,7 @@ SOURCE_FILE@0..519 WHITESPACE@415..416 " " NAME@416..418 IDENT@416..418 "g5" - TYPE_PARAM_LIST@418..422 + GENERIC_PARAM_LIST@418..422 L_ANGLE@418..419 "<" LIFETIME_PARAM@419..421 LIFETIME@419..421 "\'a" diff --git a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast index 7996dc121..2c699ffcb 100644 --- a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast +++ b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..40 WHITESPACE@2..3 " " NAME@3..4 IDENT@3..4 "f" - TYPE_PARAM_LIST@4..7 + GENERIC_PARAM_LIST@4..7 L_ANGLE@4..5 "<" TYPE_PARAM@5..6 NAME@5..6 diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast index e4c2578f6..a368ac1e8 100644 --- a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast +++ b/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..374 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..374 WHITESPACE@23..28 "\n " WHERE_PRED@28..50 FOR_KW@28..31 "for" - TYPE_PARAM_LIST@31..35 + GENERIC_PARAM_LIST@31..35 L_ANGLE@31..32 "<" LIFETIME_PARAM@32..34 LIFETIME@32..34 "\'a" @@ -64,7 +64,7 @@ SOURCE_FILE@0..374 WHITESPACE@58..59 " " NAME@59..66 IDENT@59..66 "for_ref" - TYPE_PARAM_LIST@66..69 + GENERIC_PARAM_LIST@66..69 L_ANGLE@66..67 "<" TYPE_PARAM@67..68 NAME@67..68 @@ -79,7 +79,7 @@ SOURCE_FILE@0..374 WHITESPACE@77..82 "\n " WHERE_PRED@82..102 FOR_KW@82..85 "for" - TYPE_PARAM_LIST@85..89 + GENERIC_PARAM_LIST@85..89 L_ANGLE@85..86 "<" LIFETIME_PARAM@86..88 LIFETIME@86..88 "\'a" @@ -115,7 +115,7 @@ SOURCE_FILE@0..374 WHITESPACE@110..111 " " NAME@111..121 IDENT@111..121 "for_parens" - TYPE_PARAM_LIST@121..124 + GENERIC_PARAM_LIST@121..124 L_ANGLE@121..122 "<" TYPE_PARAM@122..123 NAME@122..123 @@ -130,7 +130,7 @@ SOURCE_FILE@0..374 WHITESPACE@132..137 "\n " WHERE_PRED@137..165 FOR_KW@137..140 "for" - TYPE_PARAM_LIST@140..144 + GENERIC_PARAM_LIST@140..144 L_ANGLE@140..141 "<" LIFETIME_PARAM@141..143 LIFETIME@141..143 "\'a" @@ -182,7 +182,7 @@ SOURCE_FILE@0..374 WHITESPACE@173..174 " " NAME@174..183 IDENT@174..183 "for_slice" - TYPE_PARAM_LIST@183..186 + GENERIC_PARAM_LIST@183..186 L_ANGLE@183..184 "<" TYPE_PARAM@184..185 NAME@184..185 @@ -197,7 +197,7 @@ SOURCE_FILE@0..374 WHITESPACE@194..199 "\n " WHERE_PRED@199..218 FOR_KW@199..202 "for" - TYPE_PARAM_LIST@202..206 + GENERIC_PARAM_LIST@202..206 L_ANGLE@202..203 "<" LIFETIME_PARAM@203..205 LIFETIME@203..205 "\'a" @@ -236,7 +236,7 @@ SOURCE_FILE@0..374 WHITESPACE@226..227 " " NAME@227..236 IDENT@227..236 "for_qpath" - TYPE_PARAM_LIST@236..239 + GENERIC_PARAM_LIST@236..239 L_ANGLE@236..237 "<" TYPE_PARAM@237..238 NAME@237..238 @@ -264,7 +264,7 @@ SOURCE_FILE@0..374 WHITESPACE@253..258 "\n " WHERE_PRED@258..295 FOR_KW@258..261 "for" - TYPE_PARAM_LIST@261..265 + GENERIC_PARAM_LIST@261..265 L_ANGLE@261..262 "<" LIFETIME_PARAM@262..264 LIFETIME@262..264 "\'a" @@ -318,7 +318,7 @@ SOURCE_FILE@0..374 WHITESPACE@303..304 " " NAME@304..314 IDENT@304..314 "for_for_fn" - TYPE_PARAM_LIST@314..317 + GENERIC_PARAM_LIST@314..317 L_ANGLE@314..315 "<" TYPE_PARAM@315..316 NAME@315..316 @@ -333,7 +333,7 @@ SOURCE_FILE@0..374 WHITESPACE@325..330 "\n " WHERE_PRED@330..368 FOR_KW@330..333 "for" - TYPE_PARAM_LIST@333..337 + GENERIC_PARAM_LIST@333..337 L_ANGLE@333..334 "<" LIFETIME_PARAM@334..336 LIFETIME@334..336 "\'a" @@ -341,7 +341,7 @@ SOURCE_FILE@0..374 WHITESPACE@337..338 " " FOR_TYPE@338..362 FOR_KW@338..341 "for" - TYPE_PARAM_LIST@341..345 + GENERIC_PARAM_LIST@341..345 L_ANGLE@341..342 "<" LIFETIME_PARAM@342..344 LIFETIME@342..344 "\'b" -- cgit v1.2.3