From 1766aae145c6925a33e427f2fe6ef2a56c301665 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 17:56:53 +0200 Subject: Rename EnumVariant -> Variant --- .../ra_syntax/test_data/parser/err/0025_nope.rast | 20 ++++++++--------- .../inline/ok/0118_impl_inner_attributes.rast | 2 +- .../inline/ok/0134_nocontentexpr_after_item.rast | 6 ++--- .../inline/ok/0157_variant_discriminant.rast | 4 ++-- .../ra_syntax/test_data/parser/ok/0019_enums.rast | 26 +++++++++++----------- .../parser/ok/0047_minus_in_inner_pattern.rast | 4 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) (limited to 'crates/ra_syntax/test_data') diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast index 94456e48c..fca646557 100644 --- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast +++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast @@ -17,15 +17,15 @@ SOURCE_FILE@0..575 NAME@21..25 IDENT@21..25 "Test" WHITESPACE@25..26 " " - ENUM_VARIANT_LIST@26..152 + VARIANT_LIST@26..152 L_CURLY@26..27 "{" WHITESPACE@27..36 "\n " - ENUM_VARIANT@36..40 + VARIANT@36..40 NAME@36..40 IDENT@36..40 "Var1" COMMA@40..41 "," WHITESPACE@41..50 "\n " - ENUM_VARIANT@50..62 + VARIANT@50..62 NAME@50..54 IDENT@50..54 "Var2" TUPLE_FIELD_LIST@54..62 @@ -39,7 +39,7 @@ SOURCE_FILE@0..575 R_PAREN@61..62 ")" COMMA@62..63 "," WHITESPACE@63..72 "\n " - ENUM_VARIANT@72..145 + VARIANT@72..145 NAME@72..76 IDENT@72..76 "Var3" WHITESPACE@76..77 " " @@ -85,10 +85,10 @@ SOURCE_FILE@0..575 NAME@196..201 IDENT@196..201 "Test2" WHITESPACE@201..202 " " - ENUM_VARIANT_LIST@202..223 + VARIANT_LIST@202..223 L_CURLY@202..203 "{" WHITESPACE@203..212 "\n " - ENUM_VARIANT@212..216 + VARIANT@212..216 NAME@212..216 IDENT@212..216 "Fine" COMMA@216..217 "," @@ -101,10 +101,10 @@ SOURCE_FILE@0..575 NAME@234..239 IDENT@234..239 "Test3" WHITESPACE@239..240 " " - ENUM_VARIANT_LIST@240..300 + VARIANT_LIST@240..300 L_CURLY@240..241 "{" WHITESPACE@241..250 "\n " - ENUM_VARIANT@250..293 + VARIANT@250..293 NAME@250..259 IDENT@250..259 "StillFine" WHITESPACE@259..260 " " @@ -140,10 +140,10 @@ SOURCE_FILE@0..575 NAME@343..348 IDENT@343..348 "Test4" WHITESPACE@348..349 " " - ENUM_VARIANT_LIST@349..453 + VARIANT_LIST@349..453 L_CURLY@349..350 "{" WHITESPACE@350..363 "\n " - ENUM_VARIANT@363..372 + VARIANT@363..372 NAME@363..367 IDENT@363..367 "Nope" TUPLE_FIELD_LIST@367..372 diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast index 25e6cc170..f2561abd6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast @@ -4,7 +4,7 @@ SOURCE_FILE@0..94 WHITESPACE@4..5 " " NAME@5..6 IDENT@5..6 "F" - ENUM_VARIANT_LIST@6..8 + VARIANT_LIST@6..8 L_CURLY@6..7 "{" R_CURLY@7..8 "}" WHITESPACE@8..9 "\n" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast index 9cc8172e0..429a0506e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast @@ -17,15 +17,15 @@ SOURCE_FILE@0..111 NAME@32..41 IDENT@32..41 "LocalEnum" WHITESPACE@41..42 " " - ENUM_VARIANT_LIST@42..75 + VARIANT_LIST@42..75 L_CURLY@42..43 "{" WHITESPACE@43..52 "\n " - ENUM_VARIANT@52..55 + VARIANT@52..55 NAME@52..55 IDENT@52..55 "One" COMMA@55..56 "," WHITESPACE@56..65 "\n " - ENUM_VARIANT@65..68 + VARIANT@65..68 NAME@65..68 IDENT@65..68 "Two" COMMA@68..69 "," diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast b/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast index 0331558d2..a2e05eb2e 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast @@ -5,10 +5,10 @@ SOURCE_FILE@0..23 NAME@5..6 IDENT@5..6 "E" WHITESPACE@6..7 " " - ENUM_VARIANT_LIST@7..22 + VARIANT_LIST@7..22 L_CURLY@7..8 "{" WHITESPACE@8..9 " " - ENUM_VARIANT@9..20 + VARIANT@9..20 NAME@9..10 IDENT@9..10 "X" TUPLE_FIELD_LIST@10..15 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 1ffcffc1a..c3df00814 100644 --- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast +++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast @@ -5,7 +5,7 @@ SOURCE_FILE@0..182 NAME@5..7 IDENT@5..7 "E1" WHITESPACE@7..8 " " - ENUM_VARIANT_LIST@8..11 + VARIANT_LIST@8..11 L_CURLY@8..9 "{" WHITESPACE@9..10 "\n" R_CURLY@10..11 "}" @@ -22,7 +22,7 @@ SOURCE_FILE@0..182 IDENT@21..22 "T" R_ANGLE@22..23 ">" WHITESPACE@23..24 " " - ENUM_VARIANT_LIST@24..27 + VARIANT_LIST@24..27 L_CURLY@24..25 "{" WHITESPACE@25..26 "\n" R_CURLY@26..27 "}" @@ -33,10 +33,10 @@ SOURCE_FILE@0..182 NAME@34..36 IDENT@34..36 "E3" WHITESPACE@36..37 " " - ENUM_VARIANT_LIST@37..46 + VARIANT_LIST@37..46 L_CURLY@37..38 "{" WHITESPACE@38..43 "\n " - ENUM_VARIANT@43..44 + VARIANT@43..44 NAME@43..44 IDENT@43..44 "X" WHITESPACE@44..45 "\n" @@ -48,10 +48,10 @@ SOURCE_FILE@0..182 NAME@53..55 IDENT@53..55 "E4" WHITESPACE@55..56 " " - ENUM_VARIANT_LIST@56..66 + VARIANT_LIST@56..66 L_CURLY@56..57 "{" WHITESPACE@57..62 "\n " - ENUM_VARIANT@62..63 + VARIANT@62..63 NAME@62..63 IDENT@62..63 "X" COMMA@63..64 "," @@ -64,15 +64,15 @@ SOURCE_FILE@0..182 NAME@73..75 IDENT@73..75 "E5" WHITESPACE@75..76 " " - ENUM_VARIANT_LIST@76..181 + VARIANT_LIST@76..181 L_CURLY@76..77 "{" WHITESPACE@77..82 "\n " - ENUM_VARIANT@82..83 + VARIANT@82..83 NAME@82..83 IDENT@82..83 "A" COMMA@83..84 "," WHITESPACE@84..89 "\n " - ENUM_VARIANT@89..95 + VARIANT@89..95 NAME@89..90 IDENT@89..90 "B" WHITESPACE@90..91 " " @@ -82,7 +82,7 @@ SOURCE_FILE@0..182 INT_NUMBER@93..95 "92" COMMA@95..96 "," WHITESPACE@96..101 "\n " - ENUM_VARIANT@101..146 + VARIANT@101..146 NAME@101..102 IDENT@101..102 "C" WHITESPACE@102..103 " " @@ -119,7 +119,7 @@ SOURCE_FILE@0..182 R_CURLY@145..146 "}" COMMA@146..147 "," WHITESPACE@147..152 "\n " - ENUM_VARIANT@152..156 + VARIANT@152..156 NAME@152..153 IDENT@152..153 "F" WHITESPACE@153..154 " " @@ -128,7 +128,7 @@ SOURCE_FILE@0..182 R_CURLY@155..156 "}" COMMA@156..157 "," WHITESPACE@157..162 "\n " - ENUM_VARIANT@162..169 + VARIANT@162..169 NAME@162..163 IDENT@162..163 "D" TUPLE_FIELD_LIST@163..169 @@ -143,7 +143,7 @@ SOURCE_FILE@0..182 R_PAREN@168..169 ")" COMMA@169..170 "," WHITESPACE@170..175 "\n " - ENUM_VARIANT@175..178 + VARIANT@175..178 NAME@175..176 IDENT@175..176 "E" TUPLE_FIELD_LIST@176..178 diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast index 9db4f0aa1..7a54fa113 100644 --- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast +++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast @@ -262,10 +262,10 @@ SOURCE_FILE@0..395 NAME@348..349 IDENT@348..349 "A" WHITESPACE@349..350 " " - ENUM_VARIANT_LIST@350..367 + VARIANT_LIST@350..367 L_CURLY@350..351 "{" WHITESPACE@351..356 "\n " - ENUM_VARIANT@356..365 + VARIANT@356..365 NAME@356..357 IDENT@356..357 "B" TUPLE_FIELD_LIST@357..365 -- cgit v1.2.3