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, 16 insertions, 15 deletions

diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs
index 1dbf22997..034ea639b 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/ra_mbe/src/tests.rs
@@ -678,21 +678,22 @@ fn test_expr_order() {
     PARAM_LIST@[5; 7)
       L_PAREN@[5; 6) "("
       R_PAREN@[6; 7) ")"
-    BLOCK@[7; 15)
-      L_CURLY@[7; 8) "{"
-      EXPR_STMT@[8; 14)
-        BIN_EXPR@[8; 13)
-          BIN_EXPR@[8; 11)
-            LITERAL@[8; 9)
-              INT_NUMBER@[8; 9) "1"
-            PLUS@[9; 10) "+"
-            LITERAL@[10; 11)
-              INT_NUMBER@[10; 11) "1"
-          STAR@[11; 12) "*"
-          LITERAL@[12; 13)
-            INT_NUMBER@[12; 13) "2"
-        SEMI@[13; 14) ";"
-      R_CURLY@[14; 15) "}""#,
+    BLOCK_EXPR@[7; 15)
+      BLOCK@[7; 15)
+        L_CURLY@[7; 8) "{"
+        EXPR_STMT@[8; 14)
+          BIN_EXPR@[8; 13)
+            BIN_EXPR@[8; 11)
+              LITERAL@[8; 9)
+                INT_NUMBER@[8; 9) "1"
+              PLUS@[9; 10) "+"
+              LITERAL@[10; 11)
+                INT_NUMBER@[10; 11) "1"
+            STAR@[11; 12) "*"
+            LITERAL@[12; 13)
+              INT_NUMBER@[12; 13) "2"
+          SEMI@[13; 14) ";"
+        R_CURLY@[14; 15) "}""#,
     );
 }