Merge #1752

1752: Always wrap blocks into block expressions r=flodiebold a=matklad

This way, things like function bodies are expressions, and we don't have to single them out

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 30 insertions, 29 deletions

diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.txt b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.txt
index 40ddbfbf6..c1d669e54 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.txt
@@ -8,33 +8,34 @@ SOURCE_FILE@[0; 39)
       L_PAREN@[7; 8) "("
       R_PAREN@[8; 9) ")"
     WHITESPACE@[9; 10) " "
-    BLOCK@[10; 38)
-      L_CURLY@[10; 11) "{"
-      WHITESPACE@[11; 16) "\n    "
-      LET_STMT@[16; 36)
-        LET_KW@[16; 19) "let"
-        WHITESPACE@[19; 20) " "
-        SLICE_PAT@[20; 30)
-          L_BRACK@[20; 21) "["
-          BIND_PAT@[21; 22)
-            NAME@[21; 22)
-              IDENT@[21; 22) "a"
-          COMMA@[22; 23) ","
-          WHITESPACE@[23; 24) " "
-          BIND_PAT@[24; 25)
-            NAME@[24; 25)
-              IDENT@[24; 25) "b"
-          COMMA@[25; 26) ","
-          WHITESPACE@[26; 27) " "
-          DOTDOT@[27; 29) ".."
-          R_BRACK@[29; 30) "]"
-        WHITESPACE@[30; 31) " "
-        EQ@[31; 32) "="
-        WHITESPACE@[32; 33) " "
-        ARRAY_EXPR@[33; 35)
-          L_BRACK@[33; 34) "["
-          R_BRACK@[34; 35) "]"
-        SEMI@[35; 36) ";"
-      WHITESPACE@[36; 37) "\n"
-      R_CURLY@[37; 38) "}"
+    BLOCK_EXPR@[10; 38)
+      BLOCK@[10; 38)
+        L_CURLY@[10; 11) "{"
+        WHITESPACE@[11; 16) "\n    "
+        LET_STMT@[16; 36)
+          LET_KW@[16; 19) "let"
+          WHITESPACE@[19; 20) " "
+          SLICE_PAT@[20; 30)
+            L_BRACK@[20; 21) "["
+            BIND_PAT@[21; 22)
+              NAME@[21; 22)
+                IDENT@[21; 22) "a"
+            COMMA@[22; 23) ","
+            WHITESPACE@[23; 24) " "
+            BIND_PAT@[24; 25)
+              NAME@[24; 25)
+                IDENT@[24; 25) "b"
+            COMMA@[25; 26) ","
+            WHITESPACE@[26; 27) " "
+            DOTDOT@[27; 29) ".."
+            R_BRACK@[29; 30) "]"
+          WHITESPACE@[30; 31) " "
+          EQ@[31; 32) "="
+          WHITESPACE@[32; 33) " "
+          ARRAY_EXPR@[33; 35)
+            L_BRACK@[33; 34) "["
+            R_BRACK@[34; 35) "]"
+          SEMI@[35; 36) ";"
+        WHITESPACE@[36; 37) "\n"
+        R_CURLY@[37; 38) "}"
   WHITESPACE@[38; 39) "\n"