From 6f8aa75329d0a4e588e58b8f22f7932bf3d3a706 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Jul 2020 16:21:30 +0200 Subject: Rename RecordLit -> RecordExpr --- .../test_data/parser/err/0018_incomplete_fn.rast | 8 +++---- ...14_record_literal_before_ellipsis_recovery.rast | 6 ++--- .../parser/inline/ok/0061_record_lit.rast | 26 +++++++++++----------- .../test_data/parser/inline/ok/0066_match_arm.rast | 6 ++--- .../parser/inline/ok/0071_match_expr.rast | 4 ++-- .../ok/0125_record_literal_field_with_attr.rast | 6 ++--- .../inline/ok/0138_expression_after_block.rast | 6 ++--- .../parser/ok/0043_complex_assignment.rast | 12 +++++----- 8 files changed, 37 insertions(+), 37 deletions(-) (limited to 'crates/ra_syntax/test_data/parser') diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast index ce43ddf45..1ce5f188f 100644 --- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast +++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast @@ -75,16 +75,16 @@ SOURCE_FILE@0..183 IDENT@106..110 "push" ARG_LIST@110..155 L_PAREN@110..111 "(" - RECORD_LIT@111..154 + RECORD_EXPR@111..154 PATH@111..120 PATH_SEGMENT@111..120 NAME_REF@111..120 IDENT@111..120 "ScopeData" WHITESPACE@120..121 " " - RECORD_FIELD_LIST@121..154 + RECORD_EXPR_FIELD_LIST@121..154 L_CURLY@121..122 "{" WHITESPACE@122..123 " " - RECORD_FIELD@123..135 + RECORD_EXPR_FIELD@123..135 NAME_REF@123..129 IDENT@123..129 "parent" COLON@129..130 ":" @@ -96,7 +96,7 @@ SOURCE_FILE@0..183 IDENT@131..135 "None" COMMA@135..136 "," WHITESPACE@136..137 " " - RECORD_FIELD@137..152 + RECORD_EXPR_FIELD@137..152 NAME_REF@137..144 IDENT@137..144 "entries" COLON@144..145 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast index 6753c3fe7..a81c442c0 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast @@ -11,16 +11,16 @@ SOURCE_FILE@0..45 BLOCK_EXPR@10..44 L_CURLY@10..11 "{" WHITESPACE@11..16 "\n " - RECORD_LIT@16..42 + RECORD_EXPR@16..42 PATH@16..17 PATH_SEGMENT@16..17 NAME_REF@16..17 IDENT@16..17 "S" WHITESPACE@17..18 " " - RECORD_FIELD_LIST@18..42 + RECORD_EXPR_FIELD_LIST@18..42 L_CURLY@18..19 "{" WHITESPACE@19..20 " " - RECORD_FIELD@20..40 + RECORD_EXPR_FIELD@20..40 NAME_REF@20..25 IDENT@20..25 "field" WHITESPACE@25..26 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast index b0aa73b7d..a9ae1aa59 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast @@ -12,28 +12,28 @@ SOURCE_FILE@0..112 L_CURLY@9..10 "{" WHITESPACE@10..15 "\n " EXPR_STMT@15..20 - RECORD_LIT@15..19 + RECORD_EXPR@15..19 PATH@15..16 PATH_SEGMENT@15..16 NAME_REF@15..16 IDENT@15..16 "S" WHITESPACE@16..17 " " - RECORD_FIELD_LIST@17..19 + RECORD_EXPR_FIELD_LIST@17..19 L_CURLY@17..18 "{" R_CURLY@18..19 "}" SEMICOLON@19..20 ";" WHITESPACE@20..25 "\n " EXPR_STMT@25..41 - RECORD_LIT@25..40 + RECORD_EXPR@25..40 PATH@25..26 PATH_SEGMENT@25..26 NAME_REF@25..26 IDENT@25..26 "S" WHITESPACE@26..27 " " - RECORD_FIELD_LIST@27..40 + RECORD_EXPR_FIELD_LIST@27..40 L_CURLY@27..28 "{" WHITESPACE@28..29 " " - RECORD_FIELD@29..30 + RECORD_EXPR_FIELD@29..30 PATH_EXPR@29..30 PATH@29..30 PATH_SEGMENT@29..30 @@ -41,7 +41,7 @@ SOURCE_FILE@0..112 IDENT@29..30 "x" COMMA@30..31 "," WHITESPACE@31..32 " " - RECORD_FIELD@32..37 + RECORD_EXPR_FIELD@32..37 NAME_REF@32..33 IDENT@32..33 "y" COLON@33..34 ":" @@ -54,16 +54,16 @@ SOURCE_FILE@0..112 SEMICOLON@40..41 ";" WHITESPACE@41..46 "\n " EXPR_STMT@46..83 - RECORD_LIT@46..82 + RECORD_EXPR@46..82 PATH@46..47 PATH_SEGMENT@46..47 NAME_REF@46..47 IDENT@46..47 "S" WHITESPACE@47..48 " " - RECORD_FIELD_LIST@48..82 + RECORD_EXPR_FIELD_LIST@48..82 L_CURLY@48..49 "{" WHITESPACE@49..50 " " - RECORD_FIELD@50..51 + RECORD_EXPR_FIELD@50..51 PATH_EXPR@50..51 PATH@50..51 PATH_SEGMENT@50..51 @@ -71,7 +71,7 @@ SOURCE_FILE@0..112 IDENT@50..51 "x" COMMA@51..52 "," WHITESPACE@52..53 " " - RECORD_FIELD@53..58 + RECORD_EXPR_FIELD@53..58 NAME_REF@53..54 IDENT@53..54 "y" COLON@54..55 ":" @@ -100,16 +100,16 @@ SOURCE_FILE@0..112 SEMICOLON@82..83 ";" WHITESPACE@83..88 "\n " EXPR_STMT@88..109 - RECORD_LIT@88..108 + RECORD_EXPR@88..108 PATH@88..99 PATH_SEGMENT@88..99 NAME_REF@88..99 IDENT@88..99 "TupleStruct" WHITESPACE@99..100 " " - RECORD_FIELD_LIST@100..108 + RECORD_EXPR_FIELD_LIST@100..108 L_CURLY@100..101 "{" WHITESPACE@101..102 " " - RECORD_FIELD@102..106 + RECORD_EXPR_FIELD@102..106 NAME_REF@102..103 INT_NUMBER@102..103 "0" COLON@103..104 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast index d2279877b..37ca478e6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast @@ -49,14 +49,14 @@ SOURCE_FILE@0..167 WHITESPACE@60..61 " " R_ANGLE@61..62 ">" WHITESPACE@62..63 " " - RECORD_LIT@63..77 + RECORD_EXPR@63..77 PATH@63..67 PATH_SEGMENT@63..67 NAME_REF@63..67 IDENT@63..67 "Test" - RECORD_FIELD_LIST@67..77 + RECORD_EXPR_FIELD_LIST@67..77 L_CURLY@67..68 "{" - RECORD_FIELD@68..76 + RECORD_EXPR_FIELD@68..76 NAME_REF@68..73 IDENT@68..73 "field" COLON@73..74 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast index d6926425c..673d396ee 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast @@ -72,13 +72,13 @@ SOURCE_FILE@0..97 BLOCK_EXPR@82..90 L_CURLY@82..83 "{" WHITESPACE@83..84 " " - RECORD_LIT@84..88 + RECORD_EXPR@84..88 PATH@84..85 PATH_SEGMENT@84..85 NAME_REF@84..85 IDENT@84..85 "S" WHITESPACE@85..86 " " - RECORD_FIELD_LIST@86..88 + RECORD_EXPR_FIELD_LIST@86..88 L_CURLY@86..87 "{" R_CURLY@87..88 "}" WHITESPACE@88..89 " " diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast index 20979cef3..54ea2c7c6 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast @@ -11,16 +11,16 @@ SOURCE_FILE@0..46 BLOCK_EXPR@10..45 L_CURLY@10..11 "{" WHITESPACE@11..16 "\n " - RECORD_LIT@16..43 + RECORD_EXPR@16..43 PATH@16..17 PATH_SEGMENT@16..17 NAME_REF@16..17 IDENT@16..17 "S" WHITESPACE@17..18 " " - RECORD_FIELD_LIST@18..43 + RECORD_EXPR_FIELD_LIST@18..43 L_CURLY@18..19 "{" WHITESPACE@19..20 " " - RECORD_FIELD@20..41 + RECORD_EXPR_FIELD@20..41 ATTR@20..32 POUND@20..21 "#" L_BRACK@21..22 "[" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast index a03139ab5..a7f87c020 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast @@ -22,14 +22,14 @@ SOURCE_FILE@0..52 WHITESPACE@23..24 " " EQ@24..25 "=" WHITESPACE@25..26 " " - RECORD_LIT@26..33 + RECORD_EXPR@26..33 PATH@26..27 PATH_SEGMENT@26..27 NAME_REF@26..27 IDENT@26..27 "F" - RECORD_FIELD_LIST@27..33 + RECORD_EXPR_FIELD_LIST@27..33 L_CURLY@27..28 "{" - RECORD_FIELD@28..32 + RECORD_EXPR_FIELD@28..32 NAME_REF@28..29 IDENT@28..29 "x" COLON@29..30 ":" 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 22eb22e3c..1c5545b6d 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 @@ -46,16 +46,16 @@ SOURCE_FILE@0..160 BIN_EXPR@107..135 INDEX_EXPR@107..131 FIELD_EXPR@107..128 - RECORD_LIT@107..124 + RECORD_EXPR@107..124 PATH@107..111 PATH_SEGMENT@107..111 NAME_REF@107..111 IDENT@107..111 "Repr" WHITESPACE@111..112 " " - RECORD_FIELD_LIST@112..124 + RECORD_EXPR_FIELD_LIST@112..124 L_CURLY@112..113 "{" WHITESPACE@113..114 " " - RECORD_FIELD@114..122 + RECORD_EXPR_FIELD@114..122 NAME_REF@114..117 IDENT@114..117 "raw" COLON@117..118 ":" @@ -83,14 +83,14 @@ SOURCE_FILE@0..160 WHITESPACE@136..141 "\n " EXPR_STMT@141..157 CALL_EXPR@141..156 - RECORD_LIT@141..154 + RECORD_EXPR@141..154 PATH@141..145 PATH_SEGMENT@141..145 NAME_REF@141..145 IDENT@141..145 "Repr" - RECORD_FIELD_LIST@145..154 + RECORD_EXPR_FIELD_LIST@145..154 L_CURLY@145..146 "{" - RECORD_FIELD@146..153 + RECORD_EXPR_FIELD@146..153 NAME_REF@146..149 IDENT@146..149 "raw" COLON@149..150 ":" -- cgit v1.2.3