8 files changed, 59 insertions, 30 deletions

diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
index fa3c9db9f..f3a5e3096 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
@@ -1,5 +1,5 @@
-SOURCE_FILE@0..52
-  FN_DEF@0..51
+[email protected]1
+  FN_DEF@0..20
     [email protected] "fn"
     [email protected] " "
     [email protected]
@@ -8,7 +8,7 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected] " "
-    BLOCK_EXPR@9..51
+    BLOCK_EXPR@9..20
       [email protected] "{"
       [email protected] "\n    "
       [email protected]
@@ -16,26 +16,6 @@ [email protected]
           [email protected] "{"
           [email protected] "}"
         [email protected] ";"
-      [email protected] "\n    "
-      [email protected]
-        [email protected]
-          [email protected] "unsafe"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
-        [email protected] ";"
-      [email protected] "\n    "
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "\'label"
-            [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
-        [email protected] ";"
-      [email protected] "\n"
-      [email protected] "}"
-  [email protected] "\n"
+      [email protected] "\n"
+      [email protected] "}"
+  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
index 2fed74c5e..9c6019fb1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
@@ -1,5 +1,3 @@
 fn foo() {
     {};
-    unsafe {};
-    'label: {};
 }
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
index aabcd422f..93cc41533 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
@@ -15,7 +15,7 @@ [email protected]
         [email protected]
           [email protected] "{"
           [email protected] " "
-          EFFEC[email protected]
+          TRY[email protected]
             [email protected]
               [email protected] "#"
               [email protected] "["
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
index b3ab326e3..8e8d9e992 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
@@ -39,7 +39,7 @@ [email protected]
       [email protected] "\n    "
       [email protected]
         [email protected]
-          EFFEC[email protected]
+          TRY[email protected]
             [email protected]
               [email protected]
                 [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast
new file mode 100644
index 000000000..9efebd8b8
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast
@@ -0,0 +1,26 @@
+[email protected]
+  [email protected]
+    [email protected] "fn"
+    [email protected] " "
+    [email protected]
+      [email protected] "f"
+    [email protected]
+      [email protected] "("
+      [email protected] ")"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "\'label"
+            [email protected] ":"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
+  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs
new file mode 100644
index 000000000..18b4ff4b1
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs
@@ -0,0 +1 @@
+fn f() { 'label: {}; }
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
new file mode 100644
index 000000000..4991f2c36
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
@@ -0,0 +1,23 @@
+[email protected]
+  [email protected]
+    [email protected] "fn"
+    [email protected] " "
+    [email protected]
+      [email protected] "f"
+    [email protected]
+      [email protected] "("
+      [email protected] ")"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "unsafe"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] " "
+      [email protected] "}"
+  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs
new file mode 100644
index 000000000..dfb9b2a1c
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs
@@ -0,0 +1 @@
+fn f() { unsafe { } }