From 310bfe57bd1ea3cd5e22d434ae9d709265af5463 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 28 May 2019 17:09:45 +0300 Subject: update test data --- .../data/parser/inline/err/0001_array_type_missing_semi.txt | 10 +++++----- .../tests/data/parser/inline/err/0002_misplaced_label_err.txt | 8 ++++---- .../data/parser/inline/err/0003_pointer_type_no_mutability.txt | 2 +- .../ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt | 8 ++++---- .../data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt | 10 +++++----- .../tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt | 4 ++-- .../data/parser/inline/err/0007_async_without_semicolon.txt | 2 +- .../ra_syntax/tests/data/parser/inline/err/0008_pub_expr.txt | 2 +- .../data/parser/inline/err/0009_attr_on_expr_not_allowed.txt | 4 ++-- .../tests/data/parser/inline/err/0010_bad_tuple_index_expr.txt | 6 +++--- .../tests/data/parser/inline/err/0010_wrong_order_fns.txt | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) (limited to 'crates/ra_syntax/tests/data/parser/inline/err') diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt b/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt index 3020f9086..eb6d98fcd 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt @@ -12,16 +12,16 @@ SOURCE_FILE@[0; 18) TUPLE_TYPE@[10; 12) L_PAREN@[10; 11) "(" R_PAREN@[11; 12) ")" - err: `expected `;` or `]`` - err: `expected SEMI` WHITESPACE@[12; 13) " " - err: `expected an item` ERROR@[13; 15) INT_NUMBER@[13; 15) "92" - err: `expected an item` ERROR@[15; 16) R_BRACK@[15; 16) "]" - err: `expected an item` ERROR@[16; 17) SEMI@[16; 17) ";" WHITESPACE@[17; 18) "\n" +err: `expected `;` or `]`` +err: `expected SEMI` +err: `expected an item` +err: `expected an item` +err: `expected an item` diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt b/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt index d61d8e73e..b1d104bd4 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt @@ -16,13 +16,13 @@ SOURCE_FILE@[0; 30) LABEL@[16; 22) LIFETIME@[16; 21) "\'loop" COLON@[21; 22) ":" - err: `expected a loop` - err: `expected SEMI` WHITESPACE@[22; 23) " " IMPL_BLOCK@[23; 27) IMPL_KW@[23; 27) "impl" - err: `expected type` - err: `expected `{`` WHITESPACE@[27; 28) "\n" R_CURLY@[28; 29) "}" WHITESPACE@[29; 30) "\n" +err: `expected a loop` +err: `expected SEMI` +err: `expected type` +err: `expected `{`` diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt b/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt index 3d7a6a745..b470d9ad1 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt @@ -9,9 +9,9 @@ SOURCE_FILE@[0; 14) WHITESPACE@[8; 9) " " POINTER_TYPE@[9; 12) STAR@[9; 10) "*" - err: `expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate)` TUPLE_TYPE@[10; 12) L_PAREN@[10; 11) "(" R_PAREN@[11; 12) ")" SEMI@[12; 13) ";" WHITESPACE@[13; 14) "\n" +err: `expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate)` diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt b/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt index 86f84459a..ef4e0d5dd 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt @@ -35,8 +35,6 @@ SOURCE_FILE@[0; 87) WHITESPACE@[33; 34) "\n" IMPL_BLOCK@[34; 38) IMPL_KW@[34; 38) "impl" - err: `expected trait or type` - err: `expected `{`` WHITESPACE@[38; 39) " " IMPL_BLOCK@[39; 54) IMPL_KW@[39; 43) "impl" @@ -61,8 +59,6 @@ SOURCE_FILE@[0; 87) IDENT@[60; 66) "Trait2" WHITESPACE@[66; 67) " " FOR_KW@[67; 70) "for" - err: `expected trait or type` - err: `expected `{`` WHITESPACE@[70; 71) " " IMPL_BLOCK@[71; 86) IMPL_KW@[71; 75) "impl" @@ -77,3 +73,7 @@ SOURCE_FILE@[0; 87) L_CURLY@[84; 85) "{" R_CURLY@[85; 86) "}" WHITESPACE@[86; 87) "\n" +err: `expected trait or type` +err: `expected `{`` +err: `expected trait or type` +err: `expected `{`` diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt b/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt index 4587525aa..41e623b41 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt @@ -8,16 +8,16 @@ SOURCE_FILE@[0; 20) EQ@[7; 8) "=" WHITESPACE@[8; 9) " " UNSAFE_KW@[9; 15) "unsafe" - err: `expected `fn`` - err: `expected SEMI` WHITESPACE@[15; 16) " " - err: `expected an item` ERROR@[16; 17) L_PAREN@[16; 17) "(" - err: `expected an item` ERROR@[17; 18) R_PAREN@[17; 18) ")" - err: `expected an item` ERROR@[18; 19) SEMI@[18; 19) ";" WHITESPACE@[19; 20) "\n" +err: `expected `fn`` +err: `expected SEMI` +err: `expected an item` +err: `expected an item` +err: `expected an item` diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt b/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt index fefa35c20..f1d0dd5c6 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt @@ -11,11 +11,9 @@ SOURCE_FILE@[0; 33) L_CURLY@[8; 9) "{" R_CURLY@[9; 10) "}" WHITESPACE@[10; 11) " " - err: `expected an item` ERROR@[11; 17) UNSAFE_KW@[11; 17) "unsafe" WHITESPACE@[17; 18) " " - err: `expected an item` ERROR@[18; 21) L_CURLY@[18; 19) "{" WHITESPACE@[19; 20) " " @@ -33,3 +31,5 @@ SOURCE_FILE@[0; 33) L_CURLY@[30; 31) "{" R_CURLY@[31; 32) "}" WHITESPACE@[32; 33) "\n" +err: `expected an item` +err: `expected an item` diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.txt b/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.txt index 8afcd5429..1a8fa029c 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.txt @@ -25,7 +25,7 @@ SOURCE_FILE@[0; 30) BLOCK@[25; 27) L_CURLY@[25; 26) "{" R_CURLY@[26; 27) "}" - err: `expected SEMI` WHITESPACE@[27; 28) " " R_CURLY@[28; 29) "}" WHITESPACE@[29; 30) "\n" +err: `expected SEMI` diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.txt b/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.txt index 1af31c48b..cadbbc078 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.txt @@ -14,7 +14,6 @@ SOURCE_FILE@[0; 21) ERROR@[11; 14) VISIBILITY@[11; 14) PUB_KW@[11; 14) "pub" - err: `expected an item` WHITESPACE@[14; 15) " " EXPR_STMT@[15; 18) LITERAL@[15; 17) @@ -23,3 +22,4 @@ SOURCE_FILE@[0; 21) WHITESPACE@[18; 19) " " R_CURLY@[19; 20) "}" WHITESPACE@[20; 21) "\n" +err: `expected an item` diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.txt b/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.txt index 9d50a520f..8e7d7d241 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.txt @@ -27,7 +27,6 @@ SOURCE_FILE@[0; 48) WHITESPACE@[22; 23) " " LITERAL@[23; 24) INT_NUMBER@[23; 24) "2" - err: `attributes are not allowed on BIN_EXPR` SEMI@[24; 25) ";" WHITESPACE@[25; 29) "\n " EXPR_STMT@[29; 45) @@ -48,8 +47,9 @@ SOURCE_FILE@[0; 48) BLOCK@[42; 44) L_CURLY@[42; 43) "{" R_CURLY@[43; 44) "}" - err: `attributes are not allowed on IF_EXPR` SEMI@[44; 45) ";" WHITESPACE@[45; 46) "\n" R_CURLY@[46; 47) "}" WHITESPACE@[47; 48) "\n" +err: `attributes are not allowed on BIN_EXPR` +err: `attributes are not allowed on IF_EXPR` diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.txt b/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.txt index c111f60ea..36717439e 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.txt @@ -19,7 +19,6 @@ SOURCE_FILE@[0; 47) NAME_REF@[15; 16) IDENT@[15; 16) "x" DOT@[16; 17) "." - err: `Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix` FLOAT_NUMBER@[17; 19) "0." SEMI@[19; 20) ";" WHITESPACE@[20; 25) "\n " @@ -31,7 +30,6 @@ SOURCE_FILE@[0; 47) NAME_REF@[25; 26) IDENT@[25; 26) "x" DOT@[26; 27) "." - err: `Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix` INT_NUMBER@[27; 31) "1i32" SEMI@[31; 32) ";" WHITESPACE@[32; 37) "\n " @@ -43,9 +41,11 @@ SOURCE_FILE@[0; 47) NAME_REF@[37; 38) IDENT@[37; 38) "x" DOT@[38; 39) "." - err: `Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix` INT_NUMBER@[39; 43) "0x01" SEMI@[43; 44) ";" WHITESPACE@[44; 45) "\n" R_CURLY@[45; 46) "}" WHITESPACE@[46; 47) "\n" +err: `Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix` +err: `Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix` +err: `Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix` diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.txt b/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.txt index 220191ffa..5f39e7238 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.txt @@ -1,7 +1,6 @@ SOURCE_FILE@[0; 50) ERROR@[0; 5) ASYNC_KW@[0; 5) "async" - err: `expected fn, trait or impl` WHITESPACE@[5; 6) " " FN_DEF@[6; 24) UNSAFE_KW@[6; 12) "unsafe" @@ -20,7 +19,6 @@ SOURCE_FILE@[0; 50) WHITESPACE@[24; 25) "\n" ERROR@[25; 31) UNSAFE_KW@[25; 31) "unsafe" - err: `expected fn, trait or impl` WHITESPACE@[31; 32) " " FN_DEF@[32; 49) CONST_KW@[32; 37) "const" @@ -37,3 +35,5 @@ SOURCE_FILE@[0; 50) L_CURLY@[47; 48) "{" R_CURLY@[48; 49) "}" WHITESPACE@[49; 50) "\n" +err: `expected fn, trait or impl` +err: `expected fn, trait or impl` -- cgit v1.2.3