Unnamed repository; edit this file 'description' to name the repository.
CRLF to LF
11 files changed, 115 insertions, 100 deletions
diff --git a/crates/parser/test_data/parser/err/0056_let_else_right_curly_brace_struct.rast b/crates/parser/test_data/parser/err/0056_let_else_right_curly_brace_struct.rast index f62640ba60..578dc2b0f9 100644 --- a/crates/parser/test_data/parser/err/0056_let_else_right_curly_brace_struct.rast +++ b/crates/parser/test_data/parser/err/0056_let_else_right_curly_brace_struct.rast @@ -18,49 +18,62 @@ SOURCE_FILE NAME_REF IDENT "i32" R_CURLY "}" - WHITESPACE "\r\n" - ERROR - LET_KW "let" + WHITESPACE "\n" + FN + FN_KW "fn" WHITESPACE " " - IDENT_PAT - NAME - IDENT "foo" - WHITESPACE " " - EQ "=" + NAME + IDENT "f" + PARAM_LIST + L_PAREN "(" + R_PAREN ")" WHITESPACE " " - RECORD_EXPR - PATH - PATH_SEGMENT - NAME_REF - IDENT "X" - WHITESPACE " " - RECORD_EXPR_FIELD_LIST + BLOCK_EXPR + STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " - RECORD_EXPR_FIELD - NAME_REF - IDENT "a" - COLON ":" + WHITESPACE "\n " + LET_STMT + LET_KW "let" + WHITESPACE " " + IDENT_PAT + NAME + IDENT "foo" WHITESPACE " " - LITERAL - INT_NUMBER "1" - WHITESPACE "\r\n" + EQ "=" + WHITESPACE " " + RECORD_EXPR + PATH + PATH_SEGMENT + NAME_REF + IDENT "X" + WHITESPACE " " + RECORD_EXPR_FIELD_LIST + L_CURLY "{" + WHITESPACE "\n " + RECORD_EXPR_FIELD + NAME_REF + IDENT "a" + COLON ":" + WHITESPACE " " + LITERAL + INT_NUMBER "1" + WHITESPACE "\n " + R_CURLY "}" + WHITESPACE " " + LET_ELSE + ELSE_KW "else" + WHITESPACE " " + BLOCK_EXPR + STMT_LIST + L_CURLY "{" + WHITESPACE "\n " + EXPR_STMT + RETURN_EXPR + RETURN_KW "return" + SEMICOLON ";" + WHITESPACE "\n " + R_CURLY "}" + SEMICOLON ";" + WHITESPACE "\n" R_CURLY "}" - WHITESPACE " " - LET_ELSE - ELSE_KW "else" - WHITESPACE " " - BLOCK_EXPR - STMT_LIST - L_CURLY "{" - WHITESPACE "\r\n " - EXPR_STMT - RETURN_EXPR - RETURN_KW "return" - SEMICOLON ";" - WHITESPACE "\r\n" - R_CURLY "}" - SEMICOLON ";" - WHITESPACE "\r\n" -error 19: expected an item -error 45: right curly brace `}` before `else` in a `let...else` statement not allowed +error 63: right curly brace `}` before `else` in a `let...else` statement not allowed diff --git a/crates/parser/test_data/parser/err/0056_let_else_right_curly_brace_struct.rs b/crates/parser/test_data/parser/err/0056_let_else_right_curly_brace_struct.rs index 76a6bba18c..c0c0edc983 100644 --- a/crates/parser/test_data/parser/err/0056_let_else_right_curly_brace_struct.rs +++ b/crates/parser/test_data/parser/err/0056_let_else_right_curly_brace_struct.rs @@ -1,6 +1,8 @@ struct X {a: i32} -let foo = X { - a: 1 -} else { - return; -}; +fn f() { + let foo = X { + a: 1 + } else { + return; + }; +}
\ No newline at end of file diff --git a/crates/parser/test_data/parser/err/0057_let_else_right_curly_brace_arithmetic.rast b/crates/parser/test_data/parser/err/0057_let_else_right_curly_brace_arithmetic.rast index 1f2c1b9cb7..8e994f22d4 100644 --- a/crates/parser/test_data/parser/err/0057_let_else_right_curly_brace_arithmetic.rast +++ b/crates/parser/test_data/parser/err/0057_let_else_right_curly_brace_arithmetic.rast @@ -17,10 +17,10 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " LITERAL INT_NUMBER "1" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" WHITESPACE " " LET_ELSE @@ -29,14 +29,14 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " EXPR_STMT RETURN_EXPR RETURN_KW "return" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" error 0: expected an item -error 25: right curly brace `}` before `else` in a `let...else` statement not allowed +error 23: right curly brace `}` before `else` in a `let...else` statement not allowed diff --git a/crates/parser/test_data/parser/err/0057_let_else_right_curly_brace_format_args.rast b/crates/parser/test_data/parser/err/0057_let_else_right_curly_brace_format_args.rast index 031ed98e67..055b583ace 100644 --- a/crates/parser/test_data/parser/err/0057_let_else_right_curly_brace_format_args.rast +++ b/crates/parser/test_data/parser/err/0057_let_else_right_curly_brace_format_args.rast @@ -11,7 +11,7 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " LET_STMT LET_KW "let" WHITESPACE " " @@ -47,7 +47,7 @@ SOURCE_FILE WHITESPACE " " R_CURLY "}" SEMICOLON ";" - WHITESPACE "\r\n\r\n " + WHITESPACE "\n\n " LET_STMT LET_KW "let" WHITESPACE " " @@ -84,7 +84,7 @@ SOURCE_FILE WHITESPACE " " R_CURLY "}" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" - WHITESPACE "\r\n" -error 92: right curly brace `}` before `else` in a `let...else` statement not allowed + WHITESPACE "\n" +error 89: right curly brace `}` before `else` in a `let...else` statement not allowed diff --git a/crates/parser/test_data/parser/err/0058_let_else_right_curly_brace_range.rast b/crates/parser/test_data/parser/err/0058_let_else_right_curly_brace_range.rast index a59f5c462a..8c7fd8c295 100644 --- a/crates/parser/test_data/parser/err/0058_let_else_right_curly_brace_range.rast +++ b/crates/parser/test_data/parser/err/0058_let_else_right_curly_brace_range.rast @@ -15,10 +15,10 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " LITERAL INT_NUMBER "1" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" WHITESPACE " " LET_ELSE @@ -27,14 +27,14 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " EXPR_STMT RETURN_EXPR RETURN_KW "return" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" error 0: expected an item -error 24: right curly brace `}` before `else` in a `let...else` statement not allowed +error 22: right curly brace `}` before `else` in a `let...else` statement not allowed diff --git a/crates/parser/test_data/parser/err/0059_let_else_right_curly_brace_closure.rast b/crates/parser/test_data/parser/err/0059_let_else_right_curly_brace_closure.rast index 3cffa70aff..57925a0d19 100644 --- a/crates/parser/test_data/parser/err/0059_let_else_right_curly_brace_closure.rast +++ b/crates/parser/test_data/parser/err/0059_let_else_right_curly_brace_closure.rast @@ -27,13 +27,13 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " PATH_EXPR PATH PATH_SEGMENT NAME_REF IDENT "x" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" WHITESPACE " " LET_ELSE @@ -42,14 +42,14 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " EXPR_STMT RETURN_EXPR RETURN_KW "return" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" error 0: expected an item -error 30: right curly brace `}` before `else` in a `let...else` statement not allowed +error 28: right curly brace `}` before `else` in a `let...else` statement not allowed diff --git a/crates/parser/test_data/parser/err/0060_let_else_right_curly_brace_unary.rast b/crates/parser/test_data/parser/err/0060_let_else_right_curly_brace_unary.rast index ddec752bcf..4fb70bd50e 100644 --- a/crates/parser/test_data/parser/err/0060_let_else_right_curly_brace_unary.rast +++ b/crates/parser/test_data/parser/err/0060_let_else_right_curly_brace_unary.rast @@ -13,10 +13,10 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " LITERAL INT_NUMBER "1" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" WHITESPACE " " LET_ELSE @@ -25,14 +25,14 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " EXPR_STMT RETURN_EXPR RETURN_KW "return" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" error 0: expected an item -error 22: right curly brace `}` before `else` in a `let...else` statement not allowed +error 20: right curly brace `}` before `else` in a `let...else` statement not allowed diff --git a/crates/parser/test_data/parser/err/0061_let_else_right_curly_brace_do_yeet.rast b/crates/parser/test_data/parser/err/0061_let_else_right_curly_brace_do_yeet.rast index 277778885b..e8eeeee695 100644 --- a/crates/parser/test_data/parser/err/0061_let_else_right_curly_brace_do_yeet.rast +++ b/crates/parser/test_data/parser/err/0061_let_else_right_curly_brace_do_yeet.rast @@ -33,7 +33,7 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " LET_STMT LET_KW "let" WHITESPACE " " @@ -51,11 +51,11 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " TUPLE_EXPR L_PAREN "(" R_PAREN ")" - WHITESPACE "\r\n " + WHITESPACE "\n " R_CURLY "}" WHITESPACE " " LET_ELSE @@ -64,7 +64,7 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " EXPR_STMT RETURN_EXPR RETURN_KW "return" @@ -82,9 +82,9 @@ SOURCE_FILE R_PAREN ")" R_PAREN ")" SEMICOLON ";" - WHITESPACE "\r\n " + WHITESPACE "\n " R_CURLY "}" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" -error 70: right curly brace `}` before `else` in a `let...else` statement not allowed +error 67: right curly brace `}` before `else` in a `let...else` statement not allowed diff --git a/crates/parser/test_data/parser/err/0062_let_else_right_curly_brace_become.rast b/crates/parser/test_data/parser/err/0062_let_else_right_curly_brace_become.rast index 75da59f98d..cc5e1278c3 100644 --- a/crates/parser/test_data/parser/err/0062_let_else_right_curly_brace_become.rast +++ b/crates/parser/test_data/parser/err/0062_let_else_right_curly_brace_become.rast @@ -14,11 +14,11 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " TUPLE_EXPR L_PAREN "(" R_PAREN ")" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" WHITESPACE " " LET_ELSE @@ -27,14 +27,14 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " EXPR_STMT RETURN_EXPR RETURN_KW "return" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" error 0: expected an item -error 29: right curly brace `}` before `else` in a `let...else` statement not allowed +error 27: right curly brace `}` before `else` in a `let...else` statement not allowed diff --git a/crates/parser/test_data/parser/err/0063_let_else_right_curly_brace_reference.rast b/crates/parser/test_data/parser/err/0063_let_else_right_curly_brace_reference.rast index ff1e69c6c3..ea2f4f28e2 100644 --- a/crates/parser/test_data/parser/err/0063_let_else_right_curly_brace_reference.rast +++ b/crates/parser/test_data/parser/err/0063_let_else_right_curly_brace_reference.rast @@ -13,10 +13,10 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " LITERAL INT_NUMBER "1" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" WHITESPACE " " LET_ELSE @@ -25,14 +25,14 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " EXPR_STMT RETURN_EXPR RETURN_KW "return" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" error 0: expected an item -error 22: right curly brace `}` before `else` in a `let...else` statement not allowed +error 20: right curly brace `}` before `else` in a `let...else` statement not allowed diff --git a/crates/parser/test_data/parser/err/0064_let_else_right_curly_brace_assignment.rast b/crates/parser/test_data/parser/err/0064_let_else_right_curly_brace_assignment.rast index a53e08d0bb..47396140c5 100644 --- a/crates/parser/test_data/parser/err/0064_let_else_right_curly_brace_assignment.rast +++ b/crates/parser/test_data/parser/err/0064_let_else_right_curly_brace_assignment.rast @@ -20,10 +20,10 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " LITERAL INT_NUMBER "1" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" WHITESPACE " " LET_ELSE @@ -32,14 +32,14 @@ SOURCE_FILE BLOCK_EXPR STMT_LIST L_CURLY "{" - WHITESPACE "\r\n " + WHITESPACE "\n " EXPR_STMT RETURN_EXPR RETURN_KW "return" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" R_CURLY "}" SEMICOLON ";" - WHITESPACE "\r\n" + WHITESPACE "\n" error 0: expected an item -error 27: right curly brace `}` before `else` in a `let...else` statement not allowed +error 25: right curly brace `}` before `else` in a `let...else` statement not allowed |