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, 22 insertions, 20 deletions

diff --git a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.txt b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.txt
index a345f4bc2..f5a7a1a5a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.txt
+++ b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.txt
@@ -8,24 +8,26 @@ SOURCE_FILE@[0; 35)
       L_PAREN@[7; 8) "("
       R_PAREN@[8; 9) ")"
     WHITESPACE@[9; 10) " "
-    BLOCK@[10; 34)
-      L_CURLY@[10; 11) "{"
-      WHITESPACE@[11; 16) "\n    "
-      FN_DEF@[16; 32)
-        ABI@[16; 22)
-          EXTERN_KW@[16; 22) "extern"
-        WHITESPACE@[22; 23) " "
-        FN_KW@[23; 25) "fn"
-        WHITESPACE@[25; 26) " "
-        NAME@[26; 27)
-          IDENT@[26; 27) "f"
-        PARAM_LIST@[27; 29)
-          L_PAREN@[27; 28) "("
-          R_PAREN@[28; 29) ")"
-        WHITESPACE@[29; 30) " "
-        BLOCK@[30; 32)
-          L_CURLY@[30; 31) "{"
-          R_CURLY@[31; 32) "}"
-      WHITESPACE@[32; 33) "\n"
-      R_CURLY@[33; 34) "}"
+    BLOCK_EXPR@[10; 34)
+      BLOCK@[10; 34)
+        L_CURLY@[10; 11) "{"
+        WHITESPACE@[11; 16) "\n    "
+        FN_DEF@[16; 32)
+          ABI@[16; 22)
+            EXTERN_KW@[16; 22) "extern"
+          WHITESPACE@[22; 23) " "
+          FN_KW@[23; 25) "fn"
+          WHITESPACE@[25; 26) " "
+          NAME@[26; 27)
+            IDENT@[26; 27) "f"
+          PARAM_LIST@[27; 29)
+            L_PAREN@[27; 28) "("
+            R_PAREN@[28; 29) ")"
+          WHITESPACE@[29; 30) " "
+          BLOCK_EXPR@[30; 32)
+            BLOCK@[30; 32)
+              L_CURLY@[30; 31) "{"
+              R_CURLY@[31; 32) "}"
+        WHITESPACE@[32; 33) "\n"
+        R_CURLY@[33; 34) "}"
   WHITESPACE@[34; 35) "\n"