From 0a9e3ccc262fbcbd4cdaab30384f8cb71584544b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 16:49:13 +0200 Subject: Rename FieldDef -> Field --- .../ra_syntax/test_data/parser/ok/0001_struct_item.rast | 4 ++-- .../test_data/parser/ok/0002_struct_item_field.rast | 4 ++-- crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast | 2 +- .../test_data/parser/ok/0016_struct_flavors.rast | 16 ++++++++-------- .../test_data/parser/ok/0018_struct_type_params.rast | 8 ++++---- crates/ra_syntax/test_data/parser/ok/0019_enums.rast | 14 +++++++------- .../ra_syntax/test_data/parser/ok/0035_weird_exprs.rast | 4 ++-- .../test_data/parser/ok/0040_raw_struct_item_field.rast | 4 ++-- .../test_data/parser/ok/0043_complex_assignment.rast | 4 ++-- .../test_data/parser/ok/0047_minus_in_inner_pattern.rast | 6 +++--- 10 files changed, 33 insertions(+), 33 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 cf801aedd..c9d1af92f 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 @@ -20,10 +20,10 @@ SOURCE_FILE@0..32 IDENT@12..16 "Copy" R_ANGLE@16..17 ">" WHITESPACE@17..18 " " - RECORD_FIELD_DEF_LIST@18..31 + RECORD_FIELD_LIST@18..31 L_CURLY@18..19 "{" WHITESPACE@19..24 "\n " - RECORD_FIELD_DEF@24..28 + RECORD_FIELD@24..28 NAME@24..25 IDENT@24..25 "f" COLON@25..26 ":" diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast index a1d546491..57fb7a329 100644 --- a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast +++ b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast @@ -5,10 +5,10 @@ SOURCE_FILE@0..25 NAME@7..8 IDENT@7..8 "S" WHITESPACE@8..9 " " - RECORD_FIELD_DEF_LIST@9..25 + RECORD_FIELD_LIST@9..25 L_CURLY@9..10 "{" WHITESPACE@10..15 "\n " - RECORD_FIELD_DEF@15..23 + RECORD_FIELD@15..23 NAME@15..18 IDENT@15..18 "foo" COLON@18..19 ":" diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast index ea26f1440..60ded78d5 100644 --- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast +++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast @@ -46,7 +46,7 @@ SOURCE_FILE@0..118 NAME@59..60 IDENT@59..60 "S" WHITESPACE@60..61 " " - RECORD_FIELD_DEF_LIST@61..63 + RECORD_FIELD_LIST@61..63 L_CURLY@61..62 "{" R_CURLY@62..63 "}" WHITESPACE@63..64 "\n" diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast index 95656d19b..00b1b65be 100644 --- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast +++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast @@ -12,7 +12,7 @@ SOURCE_FILE@0..97 NAME@17..18 IDENT@17..18 "B" WHITESPACE@18..19 " " - RECORD_FIELD_DEF_LIST@19..21 + RECORD_FIELD_LIST@19..21 L_CURLY@19..20 "{" R_CURLY@20..21 "}" WHITESPACE@21..22 "\n" @@ -21,7 +21,7 @@ SOURCE_FILE@0..97 WHITESPACE@28..29 " " NAME@29..30 IDENT@29..30 "C" - TUPLE_FIELD_DEF_LIST@30..32 + TUPLE_FIELD_LIST@30..32 L_PAREN@30..31 "(" R_PAREN@31..32 ")" SEMICOLON@32..33 ";" @@ -32,10 +32,10 @@ SOURCE_FILE@0..97 NAME@42..43 IDENT@42..43 "D" WHITESPACE@43..44 " " - RECORD_FIELD_DEF_LIST@44..74 + RECORD_FIELD_LIST@44..74 L_CURLY@44..45 "{" WHITESPACE@45..50 "\n " - RECORD_FIELD_DEF@50..56 + RECORD_FIELD@50..56 NAME@50..51 IDENT@50..51 "a" COLON@51..52 ":" @@ -47,7 +47,7 @@ SOURCE_FILE@0..97 IDENT@53..56 "u32" COMMA@56..57 "," WHITESPACE@57..62 "\n " - RECORD_FIELD_DEF@62..72 + RECORD_FIELD@62..72 VISIBILITY@62..65 PUB_KW@62..65 "pub" WHITESPACE@65..66 " " @@ -68,9 +68,9 @@ SOURCE_FILE@0..97 WHITESPACE@82..83 " " NAME@83..84 IDENT@83..84 "E" - TUPLE_FIELD_DEF_LIST@84..95 + TUPLE_FIELD_LIST@84..95 L_PAREN@84..85 "(" - TUPLE_FIELD_DEF@85..90 + TUPLE_FIELD@85..90 VISIBILITY@85..88 PUB_KW@85..88 "pub" WHITESPACE@88..89 " " @@ -81,7 +81,7 @@ SOURCE_FILE@0..97 IDENT@89..90 "x" COMMA@90..91 "," WHITESPACE@91..92 " " - TUPLE_FIELD_DEF@92..93 + TUPLE_FIELD@92..93 PATH_TYPE@92..93 PATH@92..93 PATH_SEGMENT@92..93 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 3ee208fff..b757bd16d 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 @@ -23,9 +23,9 @@ SOURCE_FILE@0..290 NAME@24..25 IDENT@24..25 "T" R_ANGLE@25..26 ">" - TUPLE_FIELD_DEF_LIST@26..31 + TUPLE_FIELD_LIST@26..31 L_PAREN@26..27 "(" - TUPLE_FIELD_DEF@27..30 + TUPLE_FIELD@27..30 PATH_TYPE@27..30 PATH@27..30 PATH_SEGMENT@27..30 @@ -46,10 +46,10 @@ SOURCE_FILE@0..290 IDENT@43..44 "T" R_ANGLE@44..45 ">" WHITESPACE@45..46 " " - RECORD_FIELD_DEF_LIST@46..56 + RECORD_FIELD_LIST@46..56 L_CURLY@46..47 "{" WHITESPACE@47..48 " " - RECORD_FIELD_DEF@48..54 + RECORD_FIELD@48..54 NAME@48..49 IDENT@48..49 "u" COLON@49..50 ":" 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 993f28c4d..1a32d88fd 100644 --- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast +++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.rast @@ -86,10 +86,10 @@ SOURCE_FILE@0..182 NAME@101..102 IDENT@101..102 "C" WHITESPACE@102..103 " " - RECORD_FIELD_DEF_LIST@103..146 + RECORD_FIELD_LIST@103..146 L_CURLY@103..104 "{" WHITESPACE@104..113 "\n " - RECORD_FIELD_DEF@113..119 + RECORD_FIELD@113..119 NAME@113..114 IDENT@113..114 "a" COLON@114..115 ":" @@ -101,7 +101,7 @@ SOURCE_FILE@0..182 IDENT@116..119 "u32" COMMA@119..120 "," WHITESPACE@120..129 "\n " - RECORD_FIELD_DEF@129..139 + RECORD_FIELD@129..139 VISIBILITY@129..132 PUB_KW@129..132 "pub" WHITESPACE@132..133 " " @@ -123,7 +123,7 @@ SOURCE_FILE@0..182 NAME@152..153 IDENT@152..153 "F" WHITESPACE@153..154 " " - RECORD_FIELD_DEF_LIST@154..156 + RECORD_FIELD_LIST@154..156 L_CURLY@154..155 "{" R_CURLY@155..156 "}" COMMA@156..157 "," @@ -131,9 +131,9 @@ SOURCE_FILE@0..182 ENUM_VARIANT@162..169 NAME@162..163 IDENT@162..163 "D" - TUPLE_FIELD_DEF_LIST@163..169 + TUPLE_FIELD_LIST@163..169 L_PAREN@163..164 "(" - TUPLE_FIELD_DEF@164..167 + TUPLE_FIELD@164..167 PATH_TYPE@164..167 PATH@164..167 PATH_SEGMENT@164..167 @@ -146,7 +146,7 @@ SOURCE_FILE@0..182 ENUM_VARIANT@175..178 NAME@175..176 IDENT@175..176 "E" - TUPLE_FIELD_DEF_LIST@176..178 + TUPLE_FIELD_LIST@176..178 L_PAREN@176..177 "(" R_PAREN@177..178 ")" COMMA@178..179 "," 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 ea54651b7..2aa075993 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 @@ -1571,10 +1571,10 @@ SOURCE_FILE@0..3813 LIFETIME@2863..2869 "\'union" R_ANGLE@2869..2870 ">" WHITESPACE@2870..2871 " " - RECORD_FIELD_DEF_LIST@2871..2904 + RECORD_FIELD_LIST@2871..2904 L_CURLY@2871..2872 "{" WHITESPACE@2872..2873 " " - RECORD_FIELD_DEF@2873..2901 + RECORD_FIELD@2873..2901 NAME@2873..2878 IDENT@2873..2878 "union" COLON@2878..2879 ":" diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast index 5640bae0a..0f0138c86 100644 --- a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast +++ b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast @@ -5,10 +5,10 @@ SOURCE_FILE@0..27 NAME@7..8 IDENT@7..8 "S" WHITESPACE@8..9 " " - RECORD_FIELD_DEF_LIST@9..27 + RECORD_FIELD_LIST@9..27 L_CURLY@9..10 "{" WHITESPACE@10..15 "\n " - RECORD_FIELD_DEF@15..25 + RECORD_FIELD@15..25 NAME@15..20 IDENT@15..20 "r#foo" COLON@20..21 ":" diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast index 1c5545b6d..9c2ea3754 100644 --- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast +++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast @@ -7,10 +7,10 @@ SOURCE_FILE@0..160 NAME@69..73 IDENT@69..73 "Repr" WHITESPACE@73..74 " " - RECORD_FIELD_DEF_LIST@74..90 + RECORD_FIELD_LIST@74..90 L_CURLY@74..75 "{" WHITESPACE@75..76 " " - RECORD_FIELD_DEF@76..88 + RECORD_FIELD@76..88 NAME@76..79 IDENT@76..79 "raw" COLON@79..80 ":" 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 29a5d48e6..fcf605ec8 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 @@ -268,9 +268,9 @@ SOURCE_FILE@0..395 ENUM_VARIANT@356..365 NAME@356..357 IDENT@356..357 "B" - TUPLE_FIELD_DEF_LIST@357..365 + TUPLE_FIELD_LIST@357..365 L_PAREN@357..358 "(" - TUPLE_FIELD_DEF@358..360 + TUPLE_FIELD@358..360 PATH_TYPE@358..360 PATH@358..360 PATH_SEGMENT@358..360 @@ -278,7 +278,7 @@ SOURCE_FILE@0..395 IDENT@358..360 "i8" COMMA@360..361 "," WHITESPACE@361..362 " " - TUPLE_FIELD_DEF@362..364 + TUPLE_FIELD@362..364 PATH_TYPE@362..364 PATH@362..364 PATH_SEGMENT@362..364 -- cgit v1.2.3