From 216a5344c8ef3c3e430d2761dc8b1a7b60250a15 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 17:50:40 +0200 Subject: Rename StructDef -> Struct --- .../test_data/parser/ok/0001_struct_item.rast | 2 +- .../parser/ok/0002_struct_item_field.rast | 2 +- .../test_data/parser/ok/0008_mod_item.rast | 2 +- .../test_data/parser/ok/0016_struct_flavors.rast | 10 ++++---- .../parser/ok/0018_struct_type_params.rast | 30 +++++++++++----------- .../parser/ok/0020_type_param_bounds.rast | 20 +++++++-------- .../parser/ok/0040_raw_struct_item_field.rast | 2 +- .../test_data/parser/ok/0042_ufcs_call_list.rast | 2 +- .../parser/ok/0043_complex_assignment.rast | 2 +- 9 files changed, 36 insertions(+), 36 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 c9d1af92f..a171fe7a8 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 @@ -1,5 +1,5 @@ SOURCE_FILE@0..32 - STRUCT_DEF@0..31 + STRUCT@0..31 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 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 57fb7a329..362892b91 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 @@ -1,5 +1,5 @@ SOURCE_FILE@0..25 - STRUCT_DEF@0..25 + STRUCT@0..25 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 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 60ded78d5..b2c1d791f 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 @@ -40,7 +40,7 @@ SOURCE_FILE@0..118 WHITESPACE@41..46 "\n " R_CURLY@46..47 "}" WHITESPACE@47..52 "\n " - STRUCT_DEF@52..63 + STRUCT@52..63 STRUCT_KW@52..58 "struct" WHITESPACE@58..59 " " NAME@59..60 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 00b1b65be..b15f41dd7 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 @@ -1,12 +1,12 @@ SOURCE_FILE@0..97 - STRUCT_DEF@0..9 + STRUCT@0..9 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 IDENT@7..8 "A" SEMICOLON@8..9 ";" WHITESPACE@9..10 "\n" - STRUCT_DEF@10..21 + STRUCT@10..21 STRUCT_KW@10..16 "struct" WHITESPACE@16..17 " " NAME@17..18 @@ -16,7 +16,7 @@ SOURCE_FILE@0..97 L_CURLY@19..20 "{" R_CURLY@20..21 "}" WHITESPACE@21..22 "\n" - STRUCT_DEF@22..33 + STRUCT@22..33 STRUCT_KW@22..28 "struct" WHITESPACE@28..29 " " NAME@29..30 @@ -26,7 +26,7 @@ SOURCE_FILE@0..97 R_PAREN@31..32 ")" SEMICOLON@32..33 ";" WHITESPACE@33..35 "\n\n" - STRUCT_DEF@35..74 + STRUCT@35..74 STRUCT_KW@35..41 "struct" WHITESPACE@41..42 " " NAME@42..43 @@ -63,7 +63,7 @@ SOURCE_FILE@0..97 WHITESPACE@72..73 "\n" R_CURLY@73..74 "}" WHITESPACE@74..76 "\n\n" - STRUCT_DEF@76..96 + STRUCT@76..96 STRUCT_KW@76..82 "struct" WHITESPACE@82..83 " " NAME@83..84 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 b757bd16d..630aa0708 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 @@ -1,5 +1,5 @@ SOURCE_FILE@0..290 - STRUCT_DEF@0..13 + STRUCT@0..13 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..9 @@ -12,7 +12,7 @@ SOURCE_FILE@0..290 R_ANGLE@11..12 ">" SEMICOLON@12..13 ";" WHITESPACE@13..14 "\n" - STRUCT_DEF@14..32 + STRUCT@14..32 STRUCT_KW@14..20 "struct" WHITESPACE@20..21 " " NAME@21..23 @@ -34,7 +34,7 @@ SOURCE_FILE@0..290 R_PAREN@30..31 ")" SEMICOLON@31..32 ";" WHITESPACE@32..33 "\n" - STRUCT_DEF@33..56 + STRUCT@33..56 STRUCT_KW@33..39 "struct" WHITESPACE@39..40 " " NAME@40..42 @@ -62,7 +62,7 @@ SOURCE_FILE@0..290 WHITESPACE@54..55 " " R_CURLY@55..56 "}" WHITESPACE@56..58 "\n\n" - STRUCT_DEF@58..70 + STRUCT@58..70 STRUCT_KW@58..64 "struct" WHITESPACE@64..65 " " NAME@65..67 @@ -72,7 +72,7 @@ SOURCE_FILE@0..290 R_ANGLE@68..69 ">" SEMICOLON@69..70 ";" WHITESPACE@70..71 "\n" - STRUCT_DEF@71..85 + STRUCT@71..85 STRUCT_KW@71..77 "struct" WHITESPACE@77..78 " " NAME@78..80 @@ -84,7 +84,7 @@ SOURCE_FILE@0..290 R_ANGLE@83..84 ">" SEMICOLON@84..85 ";" WHITESPACE@85..86 "\n" - STRUCT_DEF@86..101 + STRUCT@86..101 STRUCT_KW@86..92 "struct" WHITESPACE@92..93 " " NAME@93..95 @@ -97,7 +97,7 @@ SOURCE_FILE@0..290 R_ANGLE@99..100 ">" SEMICOLON@100..101 ";" WHITESPACE@101..102 "\n" - STRUCT_DEF@102..120 + STRUCT@102..120 STRUCT_KW@102..108 "struct" WHITESPACE@108..109 " " NAME@109..111 @@ -112,7 +112,7 @@ SOURCE_FILE@0..290 R_ANGLE@118..119 ">" SEMICOLON@119..120 ";" WHITESPACE@120..121 "\n" - STRUCT_DEF@121..142 + STRUCT@121..142 STRUCT_KW@121..127 "struct" WHITESPACE@127..128 " " NAME@128..130 @@ -130,7 +130,7 @@ SOURCE_FILE@0..290 R_ANGLE@140..141 ">" SEMICOLON@141..142 ";" WHITESPACE@142..143 "\n" - STRUCT_DEF@143..166 + STRUCT@143..166 STRUCT_KW@143..149 "struct" WHITESPACE@149..150 " " NAME@150..152 @@ -149,7 +149,7 @@ SOURCE_FILE@0..290 R_ANGLE@164..165 ">" SEMICOLON@165..166 ";" WHITESPACE@166..167 "\n" - STRUCT_DEF@167..183 + STRUCT@167..183 STRUCT_KW@167..173 "struct" WHITESPACE@173..174 " " NAME@174..177 @@ -162,7 +162,7 @@ SOURCE_FILE@0..290 R_ANGLE@181..182 ">" SEMICOLON@182..183 ";" WHITESPACE@183..184 "\n" - STRUCT_DEF@184..203 + STRUCT@184..203 STRUCT_KW@184..190 "struct" WHITESPACE@190..191 " " NAME@191..194 @@ -178,7 +178,7 @@ SOURCE_FILE@0..290 R_ANGLE@201..202 ">" SEMICOLON@202..203 ";" WHITESPACE@203..204 "\n" - STRUCT_DEF@204..233 + STRUCT@204..233 STRUCT_KW@204..210 "struct" WHITESPACE@210..211 " " NAME@211..214 @@ -202,7 +202,7 @@ SOURCE_FILE@0..290 R_ANGLE@231..232 ">" SEMICOLON@232..233 ";" WHITESPACE@233..235 "\n\n" - STRUCT_DEF@235..249 + STRUCT@235..249 STRUCT_KW@235..241 "struct" WHITESPACE@241..242 " " NAME@242..245 @@ -215,7 +215,7 @@ SOURCE_FILE@0..290 R_ANGLE@247..248 ">" SEMICOLON@248..249 ";" WHITESPACE@249..250 "\n" - STRUCT_DEF@250..267 + STRUCT@250..267 STRUCT_KW@250..256 "struct" WHITESPACE@256..257 " " NAME@257..260 @@ -233,7 +233,7 @@ SOURCE_FILE@0..290 R_ANGLE@265..266 ">" SEMICOLON@266..267 ";" WHITESPACE@267..268 "\n" - STRUCT_DEF@268..289 + STRUCT@268..289 STRUCT_KW@268..274 "struct" WHITESPACE@274..275 " " NAME@275..278 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 5100e6a48..9bdc50e1e 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 @@ -1,5 +1,5 @@ SOURCE_FILE@0..250 - STRUCT_DEF@0..12 + STRUCT@0..12 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 @@ -12,7 +12,7 @@ SOURCE_FILE@0..250 R_ANGLE@10..11 ">" SEMICOLON@11..12 ";" WHITESPACE@12..13 "\n" - STRUCT_DEF@13..26 + STRUCT@13..26 STRUCT_KW@13..19 "struct" WHITESPACE@19..20 " " NAME@20..21 @@ -27,7 +27,7 @@ SOURCE_FILE@0..250 R_ANGLE@24..25 ">" SEMICOLON@25..26 ";" WHITESPACE@26..27 "\n" - STRUCT_DEF@27..43 + STRUCT@27..43 STRUCT_KW@27..33 "struct" WHITESPACE@33..34 " " NAME@34..35 @@ -45,7 +45,7 @@ SOURCE_FILE@0..250 R_ANGLE@41..42 ">" SEMICOLON@42..43 ";" WHITESPACE@43..44 "\n" - STRUCT_DEF@44..63 + STRUCT@44..63 STRUCT_KW@44..50 "struct" WHITESPACE@50..51 " " NAME@51..52 @@ -66,7 +66,7 @@ SOURCE_FILE@0..250 R_ANGLE@61..62 ">" SEMICOLON@62..63 ";" WHITESPACE@63..64 "\n" - STRUCT_DEF@64..86 + STRUCT@64..86 STRUCT_KW@64..70 "struct" WHITESPACE@70..71 " " NAME@71..72 @@ -90,7 +90,7 @@ SOURCE_FILE@0..250 R_ANGLE@84..85 ">" SEMICOLON@85..86 ";" WHITESPACE@86..87 "\n" - STRUCT_DEF@87..116 + STRUCT@87..116 STRUCT_KW@87..93 "struct" WHITESPACE@93..94 " " NAME@94..95 @@ -122,7 +122,7 @@ SOURCE_FILE@0..250 R_ANGLE@114..115 ">" SEMICOLON@115..116 ";" WHITESPACE@116..117 "\n" - STRUCT_DEF@117..143 + STRUCT@117..143 STRUCT_KW@117..123 "struct" WHITESPACE@123..124 " " NAME@124..125 @@ -153,7 +153,7 @@ SOURCE_FILE@0..250 R_ANGLE@141..142 ">" SEMICOLON@142..143 ";" WHITESPACE@143..144 "\n" - STRUCT_DEF@144..180 + STRUCT@144..180 STRUCT_KW@144..150 "struct" WHITESPACE@150..151 " " NAME@151..152 @@ -194,7 +194,7 @@ SOURCE_FILE@0..250 R_ANGLE@178..179 ">" SEMICOLON@179..180 ";" WHITESPACE@180..181 "\n" - STRUCT_DEF@181..199 + STRUCT@181..199 STRUCT_KW@181..187 "struct" WHITESPACE@187..188 " " NAME@188..189 @@ -217,7 +217,7 @@ SOURCE_FILE@0..250 R_ANGLE@197..198 ">" SEMICOLON@198..199 ";" WHITESPACE@199..200 "\n" - STRUCT_DEF@200..250 + STRUCT@200..250 STRUCT_KW@200..206 "struct" WHITESPACE@206..207 " " NAME@207..208 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 0f0138c86..8cfc14f49 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 @@ -1,5 +1,5 @@ SOURCE_FILE@0..27 - STRUCT_DEF@0..27 + STRUCT@0..27 STRUCT_KW@0..6 "struct" WHITESPACE@6..7 " " NAME@7..8 diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast index 4f0c68822..c4ffc0a3d 100644 --- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast +++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast @@ -1,7 +1,7 @@ SOURCE_FILE@0..199 COMMENT@0..60 "// https://github.com ..." WHITESPACE@60..62 "\n\n" - STRUCT_DEF@62..73 + STRUCT@62..73 STRUCT_KW@62..68 "struct" WHITESPACE@68..69 " " NAME@69..72 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 9c2ea3754..adc4a22e9 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 @@ -1,7 +1,7 @@ SOURCE_FILE@0..160 COMMENT@0..60 "// https://github.com ..." WHITESPACE@60..62 "\n\n" - STRUCT_DEF@62..90 + STRUCT@62..90 STRUCT_KW@62..68 "struct" WHITESPACE@68..69 " " NAME@69..73 -- cgit v1.2.3