From 8843588fca7a6022b86800d5d2539594c0de93cf Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 24 Apr 2020 23:51:02 +0200 Subject: Convert tests to text-size --- .../inline/err/0001_array_type_missing_semi.rast | 54 +++---- .../inline/err/0002_misplaced_label_err.rast | 58 ++++---- .../err/0003_pointer_type_no_mutability.rast | 34 ++--- .../parser/inline/err/0004_impl_type.rast | 158 ++++++++++----------- .../err/0005_fn_pointer_type_missing_fn.rast | 46 +++--- .../inline/err/0006_unsafe_block_in_mod.rast | 74 +++++----- .../inline/err/0007_async_without_semicolon.rast | 64 ++++----- .../test_data/parser/inline/err/0008_pub_expr.rast | 52 +++---- .../inline/err/0009_attr_on_expr_not_allowed.rast | 122 ++++++++-------- .../inline/err/0010_bad_tuple_index_expr.rast | 106 +++++++------- .../parser/inline/err/0010_wrong_order_fns.rast | 82 +++++------ .../parser/inline/err/0013_static_underscore.rast | 42 +++--- .../parser/inline/err/0014_default_fn_type.rast | 118 +++++++-------- ...14_record_literal_before_ellipsis_recovery.rast | 98 ++++++------- 14 files changed, 554 insertions(+), 554 deletions(-) (limited to 'crates/ra_syntax/test_data/parser/inline/err') diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast index 9d807c84f..bf70ebca4 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast @@ -1,27 +1,27 @@ -SOURCE_FILE@[0; 18) - TYPE_ALIAS_DEF@[0; 12) - TYPE_KW@[0; 4) "type" - WHITESPACE@[4; 5) " " - NAME@[5; 6) - IDENT@[5; 6) "T" - WHITESPACE@[6; 7) " " - EQ@[7; 8) "=" - WHITESPACE@[8; 9) " " - SLICE_TYPE@[9; 12) - L_BRACK@[9; 10) "[" - TUPLE_TYPE@[10; 12) - L_PAREN@[10; 11) "(" - R_PAREN@[11; 12) ")" - WHITESPACE@[12; 13) " " - ERROR@[13; 15) - INT_NUMBER@[13; 15) "92" - ERROR@[15; 16) - R_BRACK@[15; 16) "]" - ERROR@[16; 17) - SEMICOLON@[16; 17) ";" - WHITESPACE@[17; 18) "\n" -error [12; 12): expected `;` or `]` -error [12; 12): expected SEMICOLON -error [13; 13): expected an item -error [15; 15): expected an item -error [16; 16): expected an item +SOURCE_FILE@0..18 + TYPE_ALIAS_DEF@0..12 + TYPE_KW@0..4 "type" + WHITESPACE@4..5 " " + NAME@5..6 + IDENT@5..6 "T" + WHITESPACE@6..7 " " + EQ@7..8 "=" + WHITESPACE@8..9 " " + SLICE_TYPE@9..12 + L_BRACK@9..10 "[" + TUPLE_TYPE@10..12 + L_PAREN@10..11 "(" + R_PAREN@11..12 ")" + WHITESPACE@12..13 " " + ERROR@13..15 + INT_NUMBER@13..15 "92" + ERROR@15..16 + R_BRACK@15..16 "]" + ERROR@16..17 + SEMICOLON@16..17 ";" + WHITESPACE@17..18 "\n" +error 12..12: expected `;` or `]` +error 12..12: expected SEMICOLON +error 13..13: expected an item +error 15..15: expected an item +error 16..16: expected an item diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast index a85855f8c..85bf276a0 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast @@ -1,29 +1,29 @@ -SOURCE_FILE@[0; 30) - FN_DEF@[0; 29) - FN_KW@[0; 2) "fn" - WHITESPACE@[2; 3) " " - NAME@[3; 7) - IDENT@[3; 7) "main" - PARAM_LIST@[7; 9) - L_PAREN@[7; 8) "(" - R_PAREN@[8; 9) ")" - WHITESPACE@[9; 10) " " - BLOCK_EXPR@[10; 29) - BLOCK@[10; 29) - L_CURLY@[10; 11) "{" - WHITESPACE@[11; 16) "\n " - EXPR_STMT@[16; 22) - ERROR@[16; 22) - LABEL@[16; 22) - LIFETIME@[16; 21) "\'loop" - COLON@[21; 22) ":" - WHITESPACE@[22; 23) " " - IMPL_DEF@[23; 27) - IMPL_KW@[23; 27) "impl" - WHITESPACE@[27; 28) "\n" - R_CURLY@[28; 29) "}" - WHITESPACE@[29; 30) "\n" -error [22; 22): expected a loop -error [22; 22): expected SEMICOLON -error [27; 27): expected type -error [27; 27): expected `{` +SOURCE_FILE@0..30 + FN_DEF@0..29 + FN_KW@0..2 "fn" + WHITESPACE@2..3 " " + NAME@3..7 + IDENT@3..7 "main" + PARAM_LIST@7..9 + L_PAREN@7..8 "(" + R_PAREN@8..9 ")" + WHITESPACE@9..10 " " + BLOCK_EXPR@10..29 + BLOCK@10..29 + L_CURLY@10..11 "{" + WHITESPACE@11..16 "\n " + EXPR_STMT@16..22 + ERROR@16..22 + LABEL@16..22 + LIFETIME@16..21 "\'loop" + COLON@21..22 ":" + WHITESPACE@22..23 " " + IMPL_DEF@23..27 + IMPL_KW@23..27 "impl" + WHITESPACE@27..28 "\n" + R_CURLY@28..29 "}" + WHITESPACE@29..30 "\n" +error 22..22: expected a loop +error 22..22: expected SEMICOLON +error 27..27: expected type +error 27..27: expected `{` diff --git a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast index e9efad674..95bcc3c0a 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast @@ -1,17 +1,17 @@ -SOURCE_FILE@[0; 14) - TYPE_ALIAS_DEF@[0; 13) - TYPE_KW@[0; 4) "type" - WHITESPACE@[4; 5) " " - NAME@[5; 6) - IDENT@[5; 6) "T" - WHITESPACE@[6; 7) " " - EQ@[7; 8) "=" - WHITESPACE@[8; 9) " " - POINTER_TYPE@[9; 12) - STAR@[9; 10) "*" - TUPLE_TYPE@[10; 12) - L_PAREN@[10; 11) "(" - R_PAREN@[11; 12) ")" - SEMICOLON@[12; 13) ";" - WHITESPACE@[13; 14) "\n" -error [10; 10): expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate) +SOURCE_FILE@0..14 + TYPE_ALIAS_DEF@0..13 + TYPE_KW@0..4 "type" + WHITESPACE@4..5 " " + NAME@5..6 + IDENT@5..6 "T" + WHITESPACE@6..7 " " + EQ@7..8 "=" + WHITESPACE@8..9 " " + POINTER_TYPE@9..12 + STAR@9..10 "*" + TUPLE_TYPE@10..12 + L_PAREN@10..11 "(" + R_PAREN@11..12 ")" + SEMICOLON@12..13 ";" + WHITESPACE@13..14 "\n" +error 10..10: expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate) diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast index 124f0a891..fd939be8d 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast @@ -1,79 +1,79 @@ -SOURCE_FILE@[0; 87) - IMPL_DEF@[0; 12) - IMPL_KW@[0; 4) "impl" - WHITESPACE@[4; 5) " " - PATH_TYPE@[5; 9) - PATH@[5; 9) - PATH_SEGMENT@[5; 9) - NAME_REF@[5; 9) - IDENT@[5; 9) "Type" - WHITESPACE@[9; 10) " " - ITEM_LIST@[10; 12) - L_CURLY@[10; 11) "{" - R_CURLY@[11; 12) "}" - WHITESPACE@[12; 13) "\n" - IMPL_DEF@[13; 33) - IMPL_KW@[13; 17) "impl" - WHITESPACE@[17; 18) " " - PATH_TYPE@[18; 24) - PATH@[18; 24) - PATH_SEGMENT@[18; 24) - NAME_REF@[18; 24) - IDENT@[18; 24) "Trait1" - WHITESPACE@[24; 25) " " - FOR_KW@[25; 28) "for" - WHITESPACE@[28; 29) " " - PATH_TYPE@[29; 30) - PATH@[29; 30) - PATH_SEGMENT@[29; 30) - NAME_REF@[29; 30) - IDENT@[29; 30) "T" - WHITESPACE@[30; 31) " " - ITEM_LIST@[31; 33) - L_CURLY@[31; 32) "{" - R_CURLY@[32; 33) "}" - WHITESPACE@[33; 34) "\n" - IMPL_DEF@[34; 38) - IMPL_KW@[34; 38) "impl" - WHITESPACE@[38; 39) " " - IMPL_DEF@[39; 54) - IMPL_KW@[39; 43) "impl" - WHITESPACE@[43; 44) " " - PATH_TYPE@[44; 51) - PATH@[44; 51) - PATH_SEGMENT@[44; 51) - NAME_REF@[44; 51) - IDENT@[44; 51) "NotType" - WHITESPACE@[51; 52) " " - ITEM_LIST@[52; 54) - L_CURLY@[52; 53) "{" - R_CURLY@[53; 54) "}" - WHITESPACE@[54; 55) "\n" - IMPL_DEF@[55; 70) - IMPL_KW@[55; 59) "impl" - WHITESPACE@[59; 60) " " - PATH_TYPE@[60; 66) - PATH@[60; 66) - PATH_SEGMENT@[60; 66) - NAME_REF@[60; 66) - IDENT@[60; 66) "Trait2" - WHITESPACE@[66; 67) " " - FOR_KW@[67; 70) "for" - WHITESPACE@[70; 71) " " - IMPL_DEF@[71; 86) - IMPL_KW@[71; 75) "impl" - WHITESPACE@[75; 76) " " - PATH_TYPE@[76; 83) - PATH@[76; 83) - PATH_SEGMENT@[76; 83) - NAME_REF@[76; 83) - IDENT@[76; 83) "NotType" - WHITESPACE@[83; 84) " " - ITEM_LIST@[84; 86) - L_CURLY@[84; 85) "{" - R_CURLY@[85; 86) "}" - WHITESPACE@[86; 87) "\n" -error [38; 38): expected trait or type -error [38; 38): expected `{` -error [70; 70): expected trait or type -error [70; 70): expected `{` +SOURCE_FILE@0..87 + IMPL_DEF@0..12 + IMPL_KW@0..4 "impl" + WHITESPACE@4..5 " " + PATH_TYPE@5..9 + PATH@5..9 + PATH_SEGMENT@5..9 + NAME_REF@5..9 + IDENT@5..9 "Type" + WHITESPACE@9..10 " " + ITEM_LIST@10..12 + L_CURLY@10..11 "{" + R_CURLY@11..12 "}" + WHITESPACE@12..13 "\n" + IMPL_DEF@13..33 + IMPL_KW@13..17 "impl" + WHITESPACE@17..18 " " + PATH_TYPE@18..24 + PATH@18..24 + PATH_SEGMENT@18..24 + NAME_REF@18..24 + IDENT@18..24 "Trait1" + WHITESPACE@24..25 " " + FOR_KW@25..28 "for" + WHITESPACE@28..29 " " + PATH_TYPE@29..30 + PATH@29..30 + PATH_SEGMENT@29..30 + NAME_REF@29..30 + IDENT@29..30 "T" + WHITESPACE@30..31 " " + ITEM_LIST@31..33 + L_CURLY@31..32 "{" + R_CURLY@32..33 "}" + WHITESPACE@33..34 "\n" + IMPL_DEF@34..38 + IMPL_KW@34..38 "impl" + WHITESPACE@38..39 " " + IMPL_DEF@39..54 + IMPL_KW@39..43 "impl" + WHITESPACE@43..44 " " + PATH_TYPE@44..51 + PATH@44..51 + PATH_SEGMENT@44..51 + NAME_REF@44..51 + IDENT@44..51 "NotType" + WHITESPACE@51..52 " " + ITEM_LIST@52..54 + L_CURLY@52..53 "{" + R_CURLY@53..54 "}" + WHITESPACE@54..55 "\n" + IMPL_DEF@55..70 + IMPL_KW@55..59 "impl" + WHITESPACE@59..60 " " + PATH_TYPE@60..66 + PATH@60..66 + PATH_SEGMENT@60..66 + NAME_REF@60..66 + IDENT@60..66 "Trait2" + WHITESPACE@66..67 " " + FOR_KW@67..70 "for" + WHITESPACE@70..71 " " + IMPL_DEF@71..86 + IMPL_KW@71..75 "impl" + WHITESPACE@75..76 " " + PATH_TYPE@76..83 + PATH@76..83 + PATH_SEGMENT@76..83 + NAME_REF@76..83 + IDENT@76..83 "NotType" + WHITESPACE@83..84 " " + ITEM_LIST@84..86 + L_CURLY@84..85 "{" + R_CURLY@85..86 "}" + WHITESPACE@86..87 "\n" +error 38..38: expected trait or type +error 38..38: expected `{` +error 70..70: expected trait or type +error 70..70: expected `{` diff --git a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast index b8a494085..90202d764 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast @@ -1,23 +1,23 @@ -SOURCE_FILE@[0; 20) - TYPE_ALIAS_DEF@[0; 15) - TYPE_KW@[0; 4) "type" - WHITESPACE@[4; 5) " " - NAME@[5; 6) - IDENT@[5; 6) "F" - WHITESPACE@[6; 7) " " - EQ@[7; 8) "=" - WHITESPACE@[8; 9) " " - UNSAFE_KW@[9; 15) "unsafe" - WHITESPACE@[15; 16) " " - ERROR@[16; 17) - L_PAREN@[16; 17) "(" - ERROR@[17; 18) - R_PAREN@[17; 18) ")" - ERROR@[18; 19) - SEMICOLON@[18; 19) ";" - WHITESPACE@[19; 20) "\n" -error [15; 15): expected `fn` -error [15; 15): expected SEMICOLON -error [16; 16): expected an item -error [17; 17): expected an item -error [18; 18): expected an item +SOURCE_FILE@0..20 + TYPE_ALIAS_DEF@0..15 + TYPE_KW@0..4 "type" + WHITESPACE@4..5 " " + NAME@5..6 + IDENT@5..6 "F" + WHITESPACE@6..7 " " + EQ@7..8 "=" + WHITESPACE@8..9 " " + UNSAFE_KW@9..15 "unsafe" + WHITESPACE@15..16 " " + ERROR@16..17 + L_PAREN@16..17 "(" + ERROR@17..18 + R_PAREN@17..18 ")" + ERROR@18..19 + SEMICOLON@18..19 ";" + WHITESPACE@19..20 "\n" +error 15..15: expected `fn` +error 15..15: expected SEMICOLON +error 16..16: expected an item +error 17..17: expected an item +error 18..18: expected an item diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast index 690acdca3..b901c17f7 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast @@ -1,37 +1,37 @@ -SOURCE_FILE@[0; 33) - FN_DEF@[0; 10) - FN_KW@[0; 2) "fn" - WHITESPACE@[2; 3) " " - NAME@[3; 6) - IDENT@[3; 6) "foo" - PARAM_LIST@[6; 8) - L_PAREN@[6; 7) "(" - R_PAREN@[7; 8) ")" - BLOCK_EXPR@[8; 10) - BLOCK@[8; 10) - L_CURLY@[8; 9) "{" - R_CURLY@[9; 10) "}" - WHITESPACE@[10; 11) " " - ERROR@[11; 17) - UNSAFE_KW@[11; 17) "unsafe" - WHITESPACE@[17; 18) " " - ERROR@[18; 21) - L_CURLY@[18; 19) "{" - WHITESPACE@[19; 20) " " - R_CURLY@[20; 21) "}" - WHITESPACE@[21; 22) " " - FN_DEF@[22; 32) - FN_KW@[22; 24) "fn" - WHITESPACE@[24; 25) " " - NAME@[25; 28) - IDENT@[25; 28) "bar" - PARAM_LIST@[28; 30) - L_PAREN@[28; 29) "(" - R_PAREN@[29; 30) ")" - BLOCK_EXPR@[30; 32) - BLOCK@[30; 32) - L_CURLY@[30; 31) "{" - R_CURLY@[31; 32) "}" - WHITESPACE@[32; 33) "\n" -error [11; 11): expected an item -error [18; 18): expected an item +SOURCE_FILE@0..33 + FN_DEF@0..10 + FN_KW@0..2 "fn" + WHITESPACE@2..3 " " + NAME@3..6 + IDENT@3..6 "foo" + PARAM_LIST@6..8 + L_PAREN@6..7 "(" + R_PAREN@7..8 ")" + BLOCK_EXPR@8..10 + BLOCK@8..10 + L_CURLY@8..9 "{" + R_CURLY@9..10 "}" + WHITESPACE@10..11 " " + ERROR@11..17 + UNSAFE_KW@11..17 "unsafe" + WHITESPACE@17..18 " " + ERROR@18..21 + L_CURLY@18..19 "{" + WHITESPACE@19..20 " " + R_CURLY@20..21 "}" + WHITESPACE@21..22 " " + FN_DEF@22..32 + FN_KW@22..24 "fn" + WHITESPACE@24..25 " " + NAME@25..28 + IDENT@25..28 "bar" + PARAM_LIST@28..30 + L_PAREN@28..29 "(" + R_PAREN@29..30 ")" + BLOCK_EXPR@30..32 + BLOCK@30..32 + L_CURLY@30..31 "{" + R_CURLY@31..32 "}" + WHITESPACE@32..33 "\n" +error 11..11: expected an item +error 18..18: expected an item diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast index c3f7eb477..3f48b86ed 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast @@ -1,32 +1,32 @@ -SOURCE_FILE@[0; 30) - FN_DEF@[0; 29) - FN_KW@[0; 2) "fn" - WHITESPACE@[2; 3) " " - NAME@[3; 6) - IDENT@[3; 6) "foo" - PARAM_LIST@[6; 8) - L_PAREN@[6; 7) "(" - R_PAREN@[7; 8) ")" - WHITESPACE@[8; 9) " " - BLOCK_EXPR@[9; 29) - BLOCK@[9; 29) - L_CURLY@[9; 10) "{" - WHITESPACE@[10; 11) " " - LET_STMT@[11; 27) - LET_KW@[11; 14) "let" - WHITESPACE@[14; 15) " " - PLACEHOLDER_PAT@[15; 16) - UNDERSCORE@[15; 16) "_" - WHITESPACE@[16; 17) " " - EQ@[17; 18) "=" - WHITESPACE@[18; 19) " " - BLOCK_EXPR@[19; 27) - ASYNC_KW@[19; 24) "async" - WHITESPACE@[24; 25) " " - BLOCK@[25; 27) - L_CURLY@[25; 26) "{" - R_CURLY@[26; 27) "}" - WHITESPACE@[27; 28) " " - R_CURLY@[28; 29) "}" - WHITESPACE@[29; 30) "\n" -error [27; 27): expected SEMICOLON +SOURCE_FILE@0..30 + FN_DEF@0..29 + FN_KW@0..2 "fn" + WHITESPACE@2..3 " " + NAME@3..6 + IDENT@3..6 "foo" + PARAM_LIST@6..8 + L_PAREN@6..7 "(" + R_PAREN@7..8 ")" + WHITESPACE@8..9 " " + BLOCK_EXPR@9..29 + BLOCK@9..29 + L_CURLY@9..10 "{" + WHITESPACE@10..11 " " + LET_STMT@11..27 + LET_KW@11..14 "let" + WHITESPACE@14..15 " " + PLACEHOLDER_PAT@15..16 + UNDERSCORE@15..16 "_" + WHITESPACE@16..17 " " + EQ@17..18 "=" + WHITESPACE@18..19 " " + BLOCK_EXPR@19..27 + ASYNC_KW@19..24 "async" + WHITESPACE@24..25 " " + BLOCK@25..27 + L_CURLY@25..26 "{" + R_CURLY@26..27 "}" + WHITESPACE@27..28 " " + R_CURLY@28..29 "}" + WHITESPACE@29..30 "\n" +error 27..27: expected SEMICOLON diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast index a345f8488..be02eaeeb 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast @@ -1,26 +1,26 @@ -SOURCE_FILE@[0; 21) - FN_DEF@[0; 20) - FN_KW@[0; 2) "fn" - WHITESPACE@[2; 3) " " - NAME@[3; 6) - IDENT@[3; 6) "foo" - PARAM_LIST@[6; 8) - L_PAREN@[6; 7) "(" - R_PAREN@[7; 8) ")" - WHITESPACE@[8; 9) " " - BLOCK_EXPR@[9; 20) - BLOCK@[9; 20) - L_CURLY@[9; 10) "{" - WHITESPACE@[10; 11) " " - ERROR@[11; 14) - VISIBILITY@[11; 14) - PUB_KW@[11; 14) "pub" - WHITESPACE@[14; 15) " " - EXPR_STMT@[15; 18) - LITERAL@[15; 17) - INT_NUMBER@[15; 17) "92" - SEMICOLON@[17; 18) ";" - WHITESPACE@[18; 19) " " - R_CURLY@[19; 20) "}" - WHITESPACE@[20; 21) "\n" -error [14; 14): expected an item +SOURCE_FILE@0..21 + FN_DEF@0..20 + FN_KW@0..2 "fn" + WHITESPACE@2..3 " " + NAME@3..6 + IDENT@3..6 "foo" + PARAM_LIST@6..8 + L_PAREN@6..7 "(" + R_PAREN@7..8 ")" + WHITESPACE@8..9 " " + BLOCK_EXPR@9..20 + BLOCK@9..20 + L_CURLY@9..10 "{" + WHITESPACE@10..11 " " + ERROR@11..14 + VISIBILITY@11..14 + PUB_KW@11..14 "pub" + WHITESPACE@14..15 " " + EXPR_STMT@15..18 + LITERAL@15..17 + INT_NUMBER@15..17 "92" + SEMICOLON@17..18 ";" + WHITESPACE@18..19 " " + R_CURLY@19..20 "}" + WHITESPACE@20..21 "\n" +error 14..14: expected an item diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast index c3a70147a..b344e4f7f 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast @@ -1,61 +1,61 @@ -SOURCE_FILE@[0; 48) - FN_DEF@[0; 47) - FN_KW@[0; 2) "fn" - WHITESPACE@[2; 3) " " - NAME@[3; 6) - IDENT@[3; 6) "foo" - PARAM_LIST@[6; 8) - L_PAREN@[6; 7) "(" - R_PAREN@[7; 8) ")" - WHITESPACE@[8; 9) " " - BLOCK_EXPR@[9; 47) - BLOCK@[9; 47) - L_CURLY@[9; 10) "{" - WHITESPACE@[10; 14) "\n " - EXPR_STMT@[14; 25) - ATTR@[14; 18) - POUND@[14; 15) "#" - L_BRACK@[15; 16) "[" - PATH@[16; 17) - PATH_SEGMENT@[16; 17) - NAME_REF@[16; 17) - IDENT@[16; 17) "A" - R_BRACK@[17; 18) "]" - WHITESPACE@[18; 19) " " - BIN_EXPR@[19; 24) - LITERAL@[19; 20) - INT_NUMBER@[19; 20) "1" - WHITESPACE@[20; 21) " " - PLUS@[21; 22) "+" - WHITESPACE@[22; 23) " " - LITERAL@[23; 24) - INT_NUMBER@[23; 24) "2" - SEMICOLON@[24; 25) ";" - WHITESPACE@[25; 29) "\n " - EXPR_STMT@[29; 45) - ATTR@[29; 33) - POUND@[29; 30) "#" - L_BRACK@[30; 31) "[" - PATH@[31; 32) - PATH_SEGMENT@[31; 32) - NAME_REF@[31; 32) - IDENT@[31; 32) "B" - R_BRACK@[32; 33) "]" - WHITESPACE@[33; 34) " " - IF_EXPR@[34; 44) - IF_KW@[34; 36) "if" - WHITESPACE@[36; 37) " " - CONDITION@[37; 41) - LITERAL@[37; 41) - TRUE_KW@[37; 41) "true" - WHITESPACE@[41; 42) " " - BLOCK_EXPR@[42; 44) - BLOCK@[42; 44) - L_CURLY@[42; 43) "{" - R_CURLY@[43; 44) "}" - SEMICOLON@[44; 45) ";" - WHITESPACE@[45; 46) "\n" - R_CURLY@[46; 47) "}" - WHITESPACE@[47; 48) "\n" -error [24; 24): attributes are not allowed on BIN_EXPR -error [44; 44): attributes are not allowed on IF_EXPR +SOURCE_FILE@0..48 + FN_DEF@0..47 + FN_KW@0..2 "fn" + WHITESPACE@2..3 " " + NAME@3..6 + IDENT@3..6 "foo" + PARAM_LIST@6..8 + L_PAREN@6..7 "(" + R_PAREN@7..8 ")" + WHITESPACE@8..9 " " + BLOCK_EXPR@9..47 + BLOCK@9..47 + L_CURLY@9..10 "{" + WHITESPACE@10..14 "\n " + EXPR_STMT@14..25 + ATTR@14..18 + POUND@14..15 "#" + L_BRACK@15..16 "[" + PATH@16..17 + PATH_SEGMENT@16..17 + NAME_REF@16..17 + IDENT@16..17 "A" + R_BRACK@17..18 "]" + WHITESPACE@18..19 " " + BIN_EXPR@19..24 + LITERAL@19..20 + INT_NUMBER@19..20 "1" + WHITESPACE@20..21 " " + PLUS@21..22 "+" + WHITESPACE@22..23 " " + LITERAL@23..24 + INT_NUMBER@23..24 "2" + SEMICOLON@24..25 ";" + WHITESPACE@25..29 "\n " + EXPR_STMT@29..45 + ATTR@29..33 + POUND@29..30 "#" + L_BRACK@30..31 "[" + PATH@31..32 + PATH_SEGMENT@31..32 + NAME_REF@31..32 + IDENT@31..32 "B" + R_BRACK@32..33 "]" + WHITESPACE@33..34 " " + IF_EXPR@34..44 + IF_KW@34..36 "if" + WHITESPACE@36..37 " " + CONDITION@37..41 + LITERAL@37..41 + TRUE_KW@37..41 "true" + WHITESPACE@41..42 " " + BLOCK_EXPR@42..44 + BLOCK@42..44 + L_CURLY@42..43 "{" + R_CURLY@43..44 "}" + SEMICOLON@44..45 ";" + WHITESPACE@45..46 "\n" + R_CURLY@46..47 "}" + WHITESPACE@47..48 "\n" +error 24..24: attributes are not allowed on BIN_EXPR +error 44..44: attributes are not allowed on IF_EXPR diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast index 61d737abe..5339a84d7 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast @@ -1,53 +1,53 @@ -SOURCE_FILE@[0; 47) - FN_DEF@[0; 46) - FN_KW@[0; 2) "fn" - WHITESPACE@[2; 3) " " - NAME@[3; 6) - IDENT@[3; 6) "foo" - PARAM_LIST@[6; 8) - L_PAREN@[6; 7) "(" - R_PAREN@[7; 8) ")" - WHITESPACE@[8; 9) " " - BLOCK_EXPR@[9; 46) - BLOCK@[9; 46) - L_CURLY@[9; 10) "{" - WHITESPACE@[10; 15) "\n " - EXPR_STMT@[15; 20) - FIELD_EXPR@[15; 19) - PATH_EXPR@[15; 16) - PATH@[15; 16) - PATH_SEGMENT@[15; 16) - NAME_REF@[15; 16) - IDENT@[15; 16) "x" - DOT@[16; 17) "." - FLOAT_NUMBER@[17; 19) "0." - SEMICOLON@[19; 20) ";" - WHITESPACE@[20; 25) "\n " - EXPR_STMT@[25; 32) - FIELD_EXPR@[25; 31) - PATH_EXPR@[25; 26) - PATH@[25; 26) - PATH_SEGMENT@[25; 26) - NAME_REF@[25; 26) - IDENT@[25; 26) "x" - DOT@[26; 27) "." - NAME_REF@[27; 31) - INT_NUMBER@[27; 31) "1i32" - SEMICOLON@[31; 32) ";" - WHITESPACE@[32; 37) "\n " - EXPR_STMT@[37; 44) - FIELD_EXPR@[37; 43) - PATH_EXPR@[37; 38) - PATH@[37; 38) - PATH_SEGMENT@[37; 38) - NAME_REF@[37; 38) - IDENT@[37; 38) "x" - DOT@[38; 39) "." - NAME_REF@[39; 43) - INT_NUMBER@[39; 43) "0x01" - SEMICOLON@[43; 44) ";" - WHITESPACE@[44; 45) "\n" - R_CURLY@[45; 46) "}" - WHITESPACE@[46; 47) "\n" -error [27; 31): Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix -error [39; 43): Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix +SOURCE_FILE@0..47 + FN_DEF@0..46 + FN_KW@0..2 "fn" + WHITESPACE@2..3 " " + NAME@3..6 + IDENT@3..6 "foo" + PARAM_LIST@6..8 + L_PAREN@6..7 "(" + R_PAREN@7..8 ")" + WHITESPACE@8..9 " " + BLOCK_EXPR@9..46 + BLOCK@9..46 + L_CURLY@9..10 "{" + WHITESPACE@10..15 "\n " + EXPR_STMT@15..20 + FIELD_EXPR@15..19 + PATH_EXPR@15..16 + PATH@15..16 + PATH_SEGMENT@15..16 + NAME_REF@15..16 + IDENT@15..16 "x" + DOT@16..17 "." + FLOAT_NUMBER@17..19 "0." + SEMICOLON@19..20 ";" + WHITESPACE@20..25 "\n " + EXPR_STMT@25..32 + FIELD_EXPR@25..31 + PATH_EXPR@25..26 + PATH@25..26 + PATH_SEGMENT@25..26 + NAME_REF@25..26 + IDENT@25..26 "x" + DOT@26..27 "." + NAME_REF@27..31 + INT_NUMBER@27..31 "1i32" + SEMICOLON@31..32 ";" + WHITESPACE@32..37 "\n " + EXPR_STMT@37..44 + FIELD_EXPR@37..43 + PATH_EXPR@37..38 + PATH@37..38 + PATH_SEGMENT@37..38 + NAME_REF@37..38 + IDENT@37..38 "x" + DOT@38..39 "." + NAME_REF@39..43 + INT_NUMBER@39..43 "0x01" + SEMICOLON@43..44 ";" + WHITESPACE@44..45 "\n" + R_CURLY@45..46 "}" + WHITESPACE@46..47 "\n" +error 27..31: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix +error 39..43: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast index f6ac0feaf..20ed39046 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast @@ -1,41 +1,41 @@ -SOURCE_FILE@[0; 50) - ERROR@[0; 6) - UNSAFE_KW@[0; 6) "unsafe" - WHITESPACE@[6; 7) " " - FN_DEF@[7; 24) - ASYNC_KW@[7; 12) "async" - WHITESPACE@[12; 13) " " - FN_KW@[13; 15) "fn" - WHITESPACE@[15; 16) " " - NAME@[16; 19) - IDENT@[16; 19) "foo" - PARAM_LIST@[19; 21) - L_PAREN@[19; 20) "(" - R_PAREN@[20; 21) ")" - WHITESPACE@[21; 22) " " - BLOCK_EXPR@[22; 24) - BLOCK@[22; 24) - L_CURLY@[22; 23) "{" - R_CURLY@[23; 24) "}" - WHITESPACE@[24; 25) "\n" - ERROR@[25; 31) - UNSAFE_KW@[25; 31) "unsafe" - WHITESPACE@[31; 32) " " - FN_DEF@[32; 49) - CONST_KW@[32; 37) "const" - WHITESPACE@[37; 38) " " - FN_KW@[38; 40) "fn" - WHITESPACE@[40; 41) " " - NAME@[41; 44) - IDENT@[41; 44) "bar" - PARAM_LIST@[44; 46) - L_PAREN@[44; 45) "(" - R_PAREN@[45; 46) ")" - WHITESPACE@[46; 47) " " - BLOCK_EXPR@[47; 49) - BLOCK@[47; 49) - L_CURLY@[47; 48) "{" - R_CURLY@[48; 49) "}" - WHITESPACE@[49; 50) "\n" -error [6; 6): expected existential, fn, trait or impl -error [31; 31): expected existential, fn, trait or impl +SOURCE_FILE@0..50 + ERROR@0..6 + UNSAFE_KW@0..6 "unsafe" + WHITESPACE@6..7 " " + FN_DEF@7..24 + ASYNC_KW@7..12 "async" + WHITESPACE@12..13 " " + FN_KW@13..15 "fn" + WHITESPACE@15..16 " " + NAME@16..19 + IDENT@16..19 "foo" + PARAM_LIST@19..21 + L_PAREN@19..20 "(" + R_PAREN@20..21 ")" + WHITESPACE@21..22 " " + BLOCK_EXPR@22..24 + BLOCK@22..24 + L_CURLY@22..23 "{" + R_CURLY@23..24 "}" + WHITESPACE@24..25 "\n" + ERROR@25..31 + UNSAFE_KW@25..31 "unsafe" + WHITESPACE@31..32 " " + FN_DEF@32..49 + CONST_KW@32..37 "const" + WHITESPACE@37..38 " " + FN_KW@38..40 "fn" + WHITESPACE@40..41 " " + NAME@41..44 + IDENT@41..44 "bar" + PARAM_LIST@44..46 + L_PAREN@44..45 "(" + R_PAREN@45..46 ")" + WHITESPACE@46..47 " " + BLOCK_EXPR@47..49 + BLOCK@47..49 + L_CURLY@47..48 "{" + R_CURLY@48..49 "}" + WHITESPACE@49..50 "\n" +error 6..6: expected existential, fn, trait or impl +error 31..31: expected existential, fn, trait or impl diff --git a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast index 62fca0a39..ebcc26e0d 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast @@ -1,21 +1,21 @@ -SOURCE_FILE@[0; 19) - STATIC_DEF@[0; 18) - STATIC_KW@[0; 6) "static" - WHITESPACE@[6; 7) " " - ERROR@[7; 8) - UNDERSCORE@[7; 8) "_" - COLON@[8; 9) ":" - WHITESPACE@[9; 10) " " - PATH_TYPE@[10; 13) - PATH@[10; 13) - PATH_SEGMENT@[10; 13) - NAME_REF@[10; 13) - IDENT@[10; 13) "i32" - WHITESPACE@[13; 14) " " - EQ@[14; 15) "=" - WHITESPACE@[15; 16) " " - LITERAL@[16; 17) - INT_NUMBER@[16; 17) "5" - SEMICOLON@[17; 18) ";" - WHITESPACE@[18; 19) "\n" -error [7; 7): expected a name +SOURCE_FILE@0..19 + STATIC_DEF@0..18 + STATIC_KW@0..6 "static" + WHITESPACE@6..7 " " + ERROR@7..8 + UNDERSCORE@7..8 "_" + COLON@8..9 ":" + WHITESPACE@9..10 " " + PATH_TYPE@10..13 + PATH@10..13 + PATH_SEGMENT@10..13 + NAME_REF@10..13 + IDENT@10..13 "i32" + WHITESPACE@13..14 " " + EQ@14..15 "=" + WHITESPACE@15..16 " " + LITERAL@16..17 + INT_NUMBER@16..17 "5" + SEMICOLON@17..18 ";" + WHITESPACE@18..19 "\n" +error 7..7: expected a name diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast index aa960d3ef..88567263e 100644 --- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast +++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast @@ -1,59 +1,59 @@ -SOURCE_FILE@[0; 62) - TRAIT_DEF@[0; 61) - TRAIT_KW@[0; 5) "trait" - WHITESPACE@[5; 6) " " - NAME@[6; 7) - IDENT@[6; 7) "T" - WHITESPACE@[7; 8) " " - ITEM_LIST@[8; 61) - L_CURLY@[8; 9) "{" - WHITESPACE@[9; 14) "\n " - MACRO_CALL@[14; 21) - PATH@[14; 21) - PATH_SEGMENT@[14; 21) - NAME_REF@[14; 21) - IDENT@[14; 21) "default" - WHITESPACE@[21; 22) " " - TYPE_ALIAS_DEF@[22; 35) - TYPE_KW@[22; 26) "type" - WHITESPACE@[26; 27) " " - NAME@[27; 28) - IDENT@[27; 28) "T" - WHITESPACE@[28; 29) " " - EQ@[29; 30) "=" - WHITESPACE@[30; 31) " " - PATH_TYPE@[31; 34) - PATH@[31; 34) - PATH_SEGMENT@[31; 34) - NAME_REF@[31; 34) - IDENT@[31; 34) "Bar" - SEMICOLON@[34; 35) ";" - WHITESPACE@[35; 40) "\n " - MACRO_CALL@[40; 47) - PATH@[40; 47) - PATH_SEGMENT@[40; 47) - NAME_REF@[40; 47) - IDENT@[40; 47) "default" - WHITESPACE@[47; 48) " " - FN_DEF@[48; 59) - FN_KW@[48; 50) "fn" - WHITESPACE@[50; 51) " " - NAME@[51; 54) - IDENT@[51; 54) "foo" - PARAM_LIST@[54; 56) - L_PAREN@[54; 55) "(" - R_PAREN@[55; 56) ")" - WHITESPACE@[56; 57) " " - BLOCK_EXPR@[57; 59) - BLOCK@[57; 59) - L_CURLY@[57; 58) "{" - R_CURLY@[58; 59) "}" - WHITESPACE@[59; 60) "\n" - R_CURLY@[60; 61) "}" - WHITESPACE@[61; 62) "\n" -error [21; 21): expected BANG -error [21; 21): expected `{`, `[`, `(` -error [21; 21): expected SEMICOLON -error [47; 47): expected BANG -error [47; 47): expected `{`, `[`, `(` -error [47; 47): expected SEMICOLON +SOURCE_FILE@0..62 + TRAIT_DEF@0..61 + TRAIT_KW@0..5 "trait" + WHITESPACE@5..6 " " + NAME@6..7 + IDENT@6..7 "T" + WHITESPACE@7..8 " " + ITEM_LIST@8..61 + L_CURLY@8..9 "{" + WHITESPACE@9..14 "\n " + MACRO_CALL@14..21 + PATH@14..21 + PATH_SEGMENT@14..21 + NAME_REF@14..21 + IDENT@14..21 "default" + WHITESPACE@21..22 " " + TYPE_ALIAS_DEF@22..35 + TYPE_KW@22..26 "type" + WHITESPACE@26..27 " " + NAME@27..28 + IDENT@27..28 "T" + WHITESPACE@28..29 " " + EQ@29..30 "=" + WHITESPACE@30..31 " " + PATH_TYPE@31..34 + PATH@31..34 + PATH_SEGMENT@31..34 + NAME_REF@31..34 + IDENT@31..34 "Bar" + SEMICOLON@34..35 ";" + WHITESPACE@35..40 "\n " + MACRO_CALL@40..47 + PATH@40..47 + PATH_SEGMENT@40..47 + NAME_REF@40..47 + IDENT@40..47 "default" + WHITESPACE@47..48 " " + FN_DEF@48..59 + FN_KW@48..50 "fn" + WHITESPACE@50..51 " " + NAME@51..54 + IDENT@51..54 "foo" + PARAM_LIST@54..56 + L_PAREN@54..55 "(" + R_PAREN@55..56 ")" + WHITESPACE@56..57 " " + BLOCK_EXPR@57..59 + BLOCK@57..59 + L_CURLY@57..58 "{" + R_CURLY@58..59 "}" + WHITESPACE@59..60 "\n" + R_CURLY@60..61 "}" + WHITESPACE@61..62 "\n" +error 21..21: expected BANG +error 21..21: expected `{`, `[`, `(` +error 21..21: expected SEMICOLON +error 47..47: expected BANG +error 47..47: expected `{`, `[`, `(` +error 47..47: expected SEMICOLON 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 75043c9c0..578befa56 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 @@ -1,49 +1,49 @@ -SOURCE_FILE@[0; 45) - FN_DEF@[0; 44) - FN_KW@[0; 2) "fn" - WHITESPACE@[2; 3) " " - NAME@[3; 7) - IDENT@[3; 7) "main" - PARAM_LIST@[7; 9) - L_PAREN@[7; 8) "(" - R_PAREN@[8; 9) ")" - WHITESPACE@[9; 10) " " - BLOCK_EXPR@[10; 44) - BLOCK@[10; 44) - L_CURLY@[10; 11) "{" - WHITESPACE@[11; 16) "\n " - RECORD_LIT@[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) - L_CURLY@[18; 19) "{" - WHITESPACE@[19; 20) " " - RECORD_FIELD@[20; 40) - NAME_REF@[20; 25) - IDENT@[20; 25) "field" - WHITESPACE@[25; 26) " " - RANGE_EXPR@[26; 40) - DOT2@[26; 28) ".." - CALL_EXPR@[28; 40) - PATH_EXPR@[28; 38) - PATH@[28; 38) - PATH@[28; 29) - PATH_SEGMENT@[28; 29) - NAME_REF@[28; 29) - IDENT@[28; 29) "S" - COLON2@[29; 31) "::" - PATH_SEGMENT@[31; 38) - NAME_REF@[31; 38) - IDENT@[31; 38) "default" - ARG_LIST@[38; 40) - L_PAREN@[38; 39) "(" - R_PAREN@[39; 40) ")" - WHITESPACE@[40; 41) " " - R_CURLY@[41; 42) "}" - WHITESPACE@[42; 43) "\n" - R_CURLY@[43; 44) "}" - WHITESPACE@[44; 45) "\n" -error [25; 25): expected COLON +SOURCE_FILE@0..45 + FN_DEF@0..44 + FN_KW@0..2 "fn" + WHITESPACE@2..3 " " + NAME@3..7 + IDENT@3..7 "main" + PARAM_LIST@7..9 + L_PAREN@7..8 "(" + R_PAREN@8..9 ")" + WHITESPACE@9..10 " " + BLOCK_EXPR@10..44 + BLOCK@10..44 + L_CURLY@10..11 "{" + WHITESPACE@11..16 "\n " + RECORD_LIT@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 + L_CURLY@18..19 "{" + WHITESPACE@19..20 " " + RECORD_FIELD@20..40 + NAME_REF@20..25 + IDENT@20..25 "field" + WHITESPACE@25..26 " " + RANGE_EXPR@26..40 + DOT2@26..28 ".." + CALL_EXPR@28..40 + PATH_EXPR@28..38 + PATH@28..38 + PATH@28..29 + PATH_SEGMENT@28..29 + NAME_REF@28..29 + IDENT@28..29 "S" + COLON2@29..31 "::" + PATH_SEGMENT@31..38 + NAME_REF@31..38 + IDENT@31..38 "default" + ARG_LIST@38..40 + L_PAREN@38..39 "(" + R_PAREN@39..40 ")" + WHITESPACE@40..41 " " + R_CURLY@41..42 "}" + WHITESPACE@42..43 "\n" + R_CURLY@43..44 "}" + WHITESPACE@44..45 "\n" +error 25..25: expected COLON -- cgit v1.2.3