From 1142112c70b705f59b7d559d9d72cdc831865158 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 14:51:08 +0200 Subject: Rename FnDef -> Fn --- crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast') diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast index cb90f28bc..5f59c3bc2 100644 --- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast @@ -136,7 +136,7 @@ SOURCE_FILE@0..239 R_PAREN@147..148 ")" SEMICOLON@148..149 ";" WHITESPACE@149..150 "\n" - FN_DEF@150..238 + FN@150..238 FN_KW@150..152 "fn" WHITESPACE@152..153 " " NAME@153..164 -- cgit v1.2.3 From eb2f8063444b11257111f4f8ade990ec810e0361 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 15:25:46 +0200 Subject: Rename TypeAliasDef -> TypeAlias --- .../ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast') diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast index 5f59c3bc2..19b3540e9 100644 --- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast @@ -1,5 +1,5 @@ SOURCE_FILE@0..239 - TYPE_ALIAS_DEF@0..30 + TYPE_ALIAS@0..30 TYPE_KW@0..4 "type" WHITESPACE@4..5 " " NAME@5..11 @@ -26,7 +26,7 @@ SOURCE_FILE@0..239 IDENT@26..29 "u32" SEMICOLON@29..30 ";" WHITESPACE@30..31 "\n" - TYPE_ALIAS_DEF@31..64 + TYPE_ALIAS@31..64 TYPE_KW@31..35 "type" WHITESPACE@35..36 " " NAME@36..42 @@ -57,7 +57,7 @@ SOURCE_FILE@0..239 R_PAREN@62..63 ")" SEMICOLON@63..64 ";" WHITESPACE@64..65 "\n" - TYPE_ALIAS_DEF@65..95 + TYPE_ALIAS@65..95 TYPE_KW@65..69 "type" WHITESPACE@69..70 " " NAME@70..78 @@ -83,7 +83,7 @@ SOURCE_FILE@0..239 R_BRACK@93..94 "]" SEMICOLON@94..95 ";" WHITESPACE@95..96 "\n" - TYPE_ALIAS_DEF@96..149 + TYPE_ALIAS@96..149 TYPE_KW@96..100 "type" WHITESPACE@100..101 " " NAME@101..109 -- cgit v1.2.3 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/err/0044_unexpected_for_type.rast | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast') diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast index 19b3540e9..082625c13 100644 --- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast @@ -9,7 +9,7 @@ SOURCE_FILE@0..239 WHITESPACE@13..14 " " FOR_TYPE@14..29 FOR_KW@14..17 "for" - TYPE_PARAM_LIST@17..21 + GENERIC_PARAM_LIST@17..21 L_ANGLE@17..18 "<" LIFETIME_PARAM@18..20 LIFETIME@18..20 "\'a" @@ -36,7 +36,7 @@ SOURCE_FILE@0..239 WHITESPACE@44..45 " " FOR_TYPE@45..63 FOR_KW@45..48 "for" - TYPE_PARAM_LIST@48..52 + GENERIC_PARAM_LIST@48..52 L_ANGLE@48..49 "<" LIFETIME_PARAM@49..51 LIFETIME@49..51 "\'a" @@ -67,7 +67,7 @@ SOURCE_FILE@0..239 WHITESPACE@80..81 " " FOR_TYPE@81..94 FOR_KW@81..84 "for" - TYPE_PARAM_LIST@84..88 + GENERIC_PARAM_LIST@84..88 L_ANGLE@84..85 "<" LIFETIME_PARAM@85..87 LIFETIME@85..87 "\'a" @@ -93,7 +93,7 @@ SOURCE_FILE@0..239 WHITESPACE@111..112 " " FOR_TYPE@112..148 FOR_KW@112..115 "for" - TYPE_PARAM_LIST@115..119 + GENERIC_PARAM_LIST@115..119 L_ANGLE@115..116 "<" LIFETIME_PARAM@116..118 LIFETIME@116..118 "\'a" @@ -101,7 +101,7 @@ SOURCE_FILE@0..239 WHITESPACE@119..120 " " FOR_TYPE@120..148 FOR_KW@120..123 "for" - TYPE_PARAM_LIST@123..127 + GENERIC_PARAM_LIST@123..127 L_ANGLE@123..124 "<" LIFETIME_PARAM@124..126 LIFETIME@124..126 "\'b" @@ -141,7 +141,7 @@ SOURCE_FILE@0..239 WHITESPACE@152..153 " " NAME@153..164 IDENT@153..164 "for_for_for" - TYPE_PARAM_LIST@164..167 + GENERIC_PARAM_LIST@164..167 L_ANGLE@164..165 "<" TYPE_PARAM@165..166 NAME@165..166 @@ -156,7 +156,7 @@ SOURCE_FILE@0..239 WHITESPACE@175..180 "\n " WHERE_PRED@180..233 FOR_KW@180..183 "for" - TYPE_PARAM_LIST@183..187 + GENERIC_PARAM_LIST@183..187 L_ANGLE@183..184 "<" LIFETIME_PARAM@184..186 LIFETIME@184..186 "\'a" @@ -164,7 +164,7 @@ SOURCE_FILE@0..239 WHITESPACE@187..188 " " FOR_TYPE@188..227 FOR_KW@188..191 "for" - TYPE_PARAM_LIST@191..195 + GENERIC_PARAM_LIST@191..195 L_ANGLE@191..192 "<" LIFETIME_PARAM@192..194 LIFETIME@192..194 "\'b" @@ -172,7 +172,7 @@ SOURCE_FILE@0..239 WHITESPACE@195..196 " " FOR_TYPE@196..227 FOR_KW@196..199 "for" - TYPE_PARAM_LIST@199..203 + GENERIC_PARAM_LIST@199..203 L_ANGLE@199..200 "<" LIFETIME_PARAM@200..202 LIFETIME@200..202 "\'c" -- cgit v1.2.3 From bff8dd094958f1abe2fcfe8fe9f15dc7a7e6b53e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 1 Aug 2020 13:47:19 +0200 Subject: Update grammar --- .../test_data/parser/err/0044_unexpected_for_type.rast | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast') diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast index 082625c13..71aa86494 100644 --- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast @@ -15,7 +15,7 @@ SOURCE_FILE@0..239 LIFETIME@18..20 "\'a" R_ANGLE@20..21 ">" WHITESPACE@21..22 " " - REFERENCE_TYPE@22..29 + REF_TYPE@22..29 AMP@22..23 "&" LIFETIME@23..25 "\'a" WHITESPACE@25..26 " " @@ -44,7 +44,7 @@ SOURCE_FILE@0..239 WHITESPACE@52..53 " " TUPLE_TYPE@53..63 L_PAREN@53..54 "(" - REFERENCE_TYPE@54..61 + REF_TYPE@54..61 AMP@54..55 "&" LIFETIME@55..57 "\'a" WHITESPACE@57..58 " " @@ -107,12 +107,12 @@ SOURCE_FILE@0..239 LIFETIME@124..126 "\'b" R_ANGLE@126..127 ">" WHITESPACE@127..128 " " - FN_POINTER_TYPE@128..148 + FN_PTR_TYPE@128..148 FN_KW@128..130 "fn" PARAM_LIST@130..148 L_PAREN@130..131 "(" PARAM@131..138 - REFERENCE_TYPE@131..138 + REF_TYPE@131..138 AMP@131..132 "&" LIFETIME@132..134 "\'a" WHITESPACE@134..135 " " @@ -124,7 +124,7 @@ SOURCE_FILE@0..239 COMMA@138..139 "," WHITESPACE@139..140 " " PARAM@140..147 - REFERENCE_TYPE@140..147 + REF_TYPE@140..147 AMP@140..141 "&" LIFETIME@141..143 "\'b" WHITESPACE@143..144 " " @@ -178,12 +178,12 @@ SOURCE_FILE@0..239 LIFETIME@200..202 "\'c" R_ANGLE@202..203 ">" WHITESPACE@203..204 " " - FN_POINTER_TYPE@204..227 + FN_PTR_TYPE@204..227 FN_KW@204..206 "fn" PARAM_LIST@206..227 L_PAREN@206..207 "(" PARAM@207..212 - REFERENCE_TYPE@207..212 + REF_TYPE@207..212 AMP@207..208 "&" LIFETIME@208..210 "\'a" WHITESPACE@210..211 " " @@ -195,7 +195,7 @@ SOURCE_FILE@0..239 COMMA@212..213 "," WHITESPACE@213..214 " " PARAM@214..219 - REFERENCE_TYPE@214..219 + REF_TYPE@214..219 AMP@214..215 "&" LIFETIME@215..217 "\'b" WHITESPACE@217..218 " " @@ -207,7 +207,7 @@ SOURCE_FILE@0..239 COMMA@219..220 "," WHITESPACE@220..221 " " PARAM@221..226 - REFERENCE_TYPE@221..226 + REF_TYPE@221..226 AMP@221..222 "&" LIFETIME@222..224 "\'c" WHITESPACE@224..225 " " -- cgit v1.2.3