Merge #4257

4257: ast::EffectExpr r=matklad a=matklad

closes #4230 

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

crates/ra_assists/src/doc_tests/generated.rs

@@ -180,7 +180,9 @@ trait Trait<T> {
 }
 
 impl Trait<u32> for () {
-    fn foo(&self) -> u32 { todo!() }
+    fn foo(&self) -> u32 {
+        todo!()
+    }
 
 }
 "#####,

crates/ra_assists/src/handlers/add_missing_impl_members.rs

@@ -1,6 +1,10 @@
 use hir::HasSource;
 use ra_syntax::{
-    ast::{self, edit, make, AstNode, NameOwner},
+    ast::{
+        self,
+        edit::{self, IndentLevel},
+        make, AstNode, NameOwner,
+    },
     SmolStr,
 };
 
@@ -40,7 +44,9 @@ enum AddMissingImplMembersMode {
 // }
 //
 // impl Trait<u32> for () {
-//     fn foo(&self) -> u32 { todo!() }
+//     fn foo(&self) -> u32 {
+//         todo!()
+//     }
 //
 // }
 // ```
@@ -165,7 +171,9 @@ fn add_missing_impl_members_inner(
 
 fn add_body(fn_def: ast::FnDef) -> ast::FnDef {
     if fn_def.body().is_none() {
-        fn_def.with_body(make::block_from_expr(make::expr_todo()))
+        let body = make::block_expr(None, Some(make::expr_todo()));
+        let body = IndentLevel(1).increase_indent(body);
+        fn_def.with_body(body)
     } else {
         fn_def
     }
@@ -181,7 +189,7 @@ mod tests {
     fn test_add_missing_impl_members() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo {
     type Output;
 
@@ -197,8 +205,8 @@ struct S;
 impl Foo for S {
     fn bar(&self) {}
 <|>
-}",
-            "
+}"#,
+            r#"
 trait Foo {
     type Output;
 
@@ -215,10 +223,14 @@ impl Foo for S {
     fn bar(&self) {}
     <|>type Output;
     const CONST: usize = 42;
-    fn foo(&self) { todo!() }
-    fn baz(&self) { todo!() }
+    fn foo(&self) {
+        todo!()
+    }
+    fn baz(&self) {
+        todo!()
+    }
 
-}",
+}"#,
         );
     }
 
@@ -226,7 +238,7 @@ impl Foo for S {
     fn test_copied_overriden_members() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo {
     fn foo(&self);
     fn bar(&self) -> bool { true }
@@ -238,8 +250,8 @@ struct S;
 impl Foo for S {
     fn bar(&self) {}
 <|>
-}",
-            "
+}"#,
+            r#"
 trait Foo {
     fn foo(&self);
     fn bar(&self) -> bool { true }
@@ -250,9 +262,11 @@ struct S;
 
 impl Foo for S {
     fn bar(&self) {}
-    <|>fn foo(&self) { todo!() }
+    <|>fn foo(&self) {
+        todo!()
+    }
 
-}",
+}"#,
         );
     }
 
@@ -260,16 +274,18 @@ impl Foo for S {
     fn test_empty_impl_def() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S { <|> }",
-            "
+impl Foo for S { <|> }"#,
+            r#"
 trait Foo { fn foo(&self); }
 struct S;
 impl Foo for S {
-    <|>fn foo(&self) { todo!() }
-}",
+    <|>fn foo(&self) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -277,16 +293,18 @@ impl Foo for S {
     fn fill_in_type_params_1() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
-impl Foo<u32> for S { <|> }",
-            "
+impl Foo<u32> for S { <|> }"#,
+            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
 impl Foo<u32> for S {
-    <|>fn foo(&self, t: u32) -> &u32 { todo!() }
-}",
+    <|>fn foo(&self, t: u32) -> &u32 {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -294,16 +312,18 @@ impl Foo<u32> for S {
     fn fill_in_type_params_2() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
-impl<U> Foo<U> for S { <|> }",
-            "
+impl<U> Foo<U> for S { <|> }"#,
+            r#"
 trait Foo<T> { fn foo(&self, t: T) -> &T; }
 struct S;
 impl<U> Foo<U> for S {
-    <|>fn foo(&self, t: U) -> &U { todo!() }
-}",
+    <|>fn foo(&self, t: U) -> &U {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -311,16 +331,18 @@ impl<U> Foo<U> for S {
     fn test_cursor_after_empty_impl_def() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo { fn foo(&self); }
 struct S;
-impl Foo for S {}<|>",
-            "
+impl Foo for S {}<|>"#,
+            r#"
 trait Foo { fn foo(&self); }
 struct S;
 impl Foo for S {
-    <|>fn foo(&self) { todo!() }
-}",
+    <|>fn foo(&self) {
+        todo!()
+    }
+}"#,
         )
     }
 
@@ -328,22 +350,24 @@ impl Foo for S {
     fn test_qualify_path_1() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub struct Bar;
     trait Foo { fn foo(&self, bar: Bar); }
 }
 struct S;
-impl foo::Foo for S { <|> }",
-            "
+impl foo::Foo for S { <|> }"#,
+            r#"
 mod foo {
     pub struct Bar;
     trait Foo { fn foo(&self, bar: Bar); }
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar) { todo!() }
-}",
+    <|>fn foo(&self, bar: foo::Bar) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -351,22 +375,24 @@ impl foo::Foo for S {
     fn test_qualify_path_generic() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub struct Bar<T>;
     trait Foo { fn foo(&self, bar: Bar<u32>); }
 }
 struct S;
-impl foo::Foo for S { <|> }",
-            "
+impl foo::Foo for S { <|> }"#,
+            r#"
 mod foo {
     pub struct Bar<T>;
     trait Foo { fn foo(&self, bar: Bar<u32>); }
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar<u32>) { todo!() }
-}",
+    <|>fn foo(&self, bar: foo::Bar<u32>) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -374,22 +400,24 @@ impl foo::Foo for S {
     fn test_qualify_path_and_substitute_param() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub struct Bar<T>;
     trait Foo<T> { fn foo(&self, bar: Bar<T>); }
 }
 struct S;
-impl foo::Foo<u32> for S { <|> }",
-            "
+impl foo::Foo<u32> for S { <|> }"#,
+            r#"
 mod foo {
     pub struct Bar<T>;
     trait Foo<T> { fn foo(&self, bar: Bar<T>); }
 }
 struct S;
 impl foo::Foo<u32> for S {
-    <|>fn foo(&self, bar: foo::Bar<u32>) { todo!() }
-}",
+    <|>fn foo(&self, bar: foo::Bar<u32>) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -398,15 +426,15 @@ impl foo::Foo<u32> for S {
         // when substituting params, the substituted param should not be qualified!
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     trait Foo<T> { fn foo(&self, bar: T); }
     pub struct Param;
 }
 struct Param;
 struct S;
-impl foo::Foo<Param> for S { <|> }",
-            "
+impl foo::Foo<Param> for S { <|> }"#,
+            r#"
 mod foo {
     trait Foo<T> { fn foo(&self, bar: T); }
     pub struct Param;
@@ -414,8 +442,10 @@ mod foo {
 struct Param;
 struct S;
 impl foo::Foo<Param> for S {
-    <|>fn foo(&self, bar: Param) { todo!() }
-}",
+    <|>fn foo(&self, bar: Param) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -423,15 +453,15 @@ impl foo::Foo<Param> for S {
     fn test_qualify_path_associated_item() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub struct Bar<T>;
     impl Bar<T> { type Assoc = u32; }
     trait Foo { fn foo(&self, bar: Bar<u32>::Assoc); }
 }
 struct S;
-impl foo::Foo for S { <|> }",
-            "
+impl foo::Foo for S { <|> }"#,
+            r#"
 mod foo {
     pub struct Bar<T>;
     impl Bar<T> { type Assoc = u32; }
@@ -439,8 +469,10 @@ mod foo {
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar<u32>::Assoc) { todo!() }
-}",
+    <|>fn foo(&self, bar: foo::Bar<u32>::Assoc) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -448,15 +480,15 @@ impl foo::Foo for S {
     fn test_qualify_path_nested() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub struct Bar<T>;
     pub struct Baz;
     trait Foo { fn foo(&self, bar: Bar<Baz>); }
 }
 struct S;
-impl foo::Foo for S { <|> }",
-            "
+impl foo::Foo for S { <|> }"#,
+            r#"
 mod foo {
     pub struct Bar<T>;
     pub struct Baz;
@@ -464,8 +496,10 @@ mod foo {
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: foo::Bar<foo::Baz>) { todo!() }
-}",
+    <|>fn foo(&self, bar: foo::Bar<foo::Baz>) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -473,22 +507,24 @@ impl foo::Foo for S {
     fn test_qualify_path_fn_trait_notation() {
         check_assist(
             add_missing_impl_members,
-            "
+            r#"
 mod foo {
     pub trait Fn<Args> { type Output; }
     trait Foo { fn foo(&self, bar: dyn Fn(u32) -> i32); }
 }
 struct S;
-impl foo::Foo for S { <|> }",
-            "
+impl foo::Foo for S { <|> }"#,
+            r#"
 mod foo {
     pub trait Fn<Args> { type Output; }
     trait Foo { fn foo(&self, bar: dyn Fn(u32) -> i32); }
 }
 struct S;
 impl foo::Foo for S {
-    <|>fn foo(&self, bar: dyn Fn(u32) -> i32) { todo!() }
-}",
+    <|>fn foo(&self, bar: dyn Fn(u32) -> i32) {
+        todo!()
+    }
+}"#,
         );
     }
 
@@ -496,10 +532,10 @@ impl foo::Foo for S {
     fn test_empty_trait() {
         check_assist_not_applicable(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo;
 struct S;
-impl Foo for S { <|> }",
+impl Foo for S { <|> }"#,
         )
     }
 
@@ -507,13 +543,13 @@ impl Foo for S { <|> }",
     fn test_ignore_unnamed_trait_members_and_default_methods() {
         check_assist_not_applicable(
             add_missing_impl_members,
-            "
+            r#"
 trait Foo {
     fn (arg: u32);
     fn valid(some: u32) -> bool { false }
 }
 struct S;
-impl Foo for S { <|> }",
+impl Foo for S { <|> }"#,
         )
     }
 
@@ -544,7 +580,9 @@ trait Foo {
 struct S;
 impl Foo for S {
     <|>type Output;
-    fn foo(&self) { todo!() }
+    fn foo(&self) {
+        todo!()
+    }
 }"#,
         )
     }
@@ -553,7 +591,7 @@ impl Foo for S {
     fn test_default_methods() {
         check_assist(
             add_missing_default_members,
-            "
+            r#"
 trait Foo {
     type Output;
 
@@ -563,8 +601,8 @@ trait Foo {
     fn foo(some: u32) -> bool;
 }
 struct S;
-impl Foo for S { <|> }",
-            "
+impl Foo for S { <|> }"#,
+            r#"
 trait Foo {
     type Output;
 
@@ -576,7 +614,7 @@ trait Foo {
 struct S;
 impl Foo for S {
     <|>fn valid(some: u32) -> bool { false }
-}",
+}"#,
         )
     }
 }

crates/ra_assists/src/handlers/early_return.rs

@@ -2,7 +2,7 @@ use std::{iter::once, ops::RangeInclusive};
 
 use ra_syntax::{
     algo::replace_children,
-    ast::{self, edit::IndentLevel, make, Block, Pat::TupleStructPat},
+    ast::{self, edit::IndentLevel, make},
     AstNode,
     SyntaxKind::{FN_DEF, LOOP_EXPR, L_CURLY, R_CURLY, WHILE_EXPR, WHITESPACE},
     SyntaxNode,
@@ -47,7 +47,7 @@ pub(crate) fn convert_to_guarded_return(ctx: AssistCtx) -> Option<Assist> {
     // Check if there is an IfLet that we can handle.
     let if_let_pat = match cond.pat() {
         None => None, // No IfLet, supported.
-        Some(TupleStructPat(pat)) if pat.args().count() == 1 => {
+        Some(ast::Pat::TupleStructPat(pat)) if pat.args().count() == 1 => {
             let path = pat.path()?;
             match path.qualifier() {
                 None => {
@@ -61,9 +61,9 @@ pub(crate) fn convert_to_guarded_return(ctx: AssistCtx) -> Option<Assist> {
     };
 
     let cond_expr = cond.expr()?;
-    let then_block = if_expr.then_branch()?.block()?;
+    let then_block = if_expr.then_branch()?;
 
-    let parent_block = if_expr.syntax().parent()?.ancestors().find_map(ast::Block::cast)?;
+    let parent_block = if_expr.syntax().parent()?.ancestors().find_map(ast::BlockExpr::cast)?;
 
     if parent_block.expr()? != if_expr.clone().into() {
         return None;
@@ -80,7 +80,7 @@ pub(crate) fn convert_to_guarded_return(ctx: AssistCtx) -> Option<Assist> {
         return None;
     }
 
-    let parent_container = parent_block.syntax().parent()?.parent()?;
+    let parent_container = parent_block.syntax().parent()?;
 
     let early_expression: ast::Expr = match parent_container.kind() {
         WHILE_EXPR | LOOP_EXPR => make::expr_continue(),
@@ -144,13 +144,13 @@ pub(crate) fn convert_to_guarded_return(ctx: AssistCtx) -> Option<Assist> {
             }
         };
         edit.target(if_expr.syntax().text_range());
-        edit.replace_ast(parent_block, ast::Block::cast(new_block).unwrap());
+        edit.replace_ast(parent_block, ast::BlockExpr::cast(new_block).unwrap());
         edit.set_cursor(cursor_position);
 
         fn replace(
             new_expr: &SyntaxNode,
-            then_block: &Block,
-            parent_block: &Block,
+            then_block: &ast::BlockExpr,
+            parent_block: &ast::BlockExpr,
             if_expr: &ast::IfExpr,
         ) -> SyntaxNode {
             let then_block_items = IndentLevel::from(1).decrease_indent(then_block.clone());

crates/ra_assists/src/handlers/inline_local_variable.rs

@@ -89,6 +89,7 @@ pub(crate) fn inline_local_variable(ctx: AssistCtx) -> Option<Assist> {
             | (ast::Expr::ParenExpr(_), _)
             | (ast::Expr::PathExpr(_), _)
             | (ast::Expr::BlockExpr(_), _)
+            | (ast::Expr::EffectExpr(_), _)
             | (_, ast::Expr::CallExpr(_))
             | (_, ast::Expr::TupleExpr(_))
             | (_, ast::Expr::ArrayExpr(_))

crates/ra_assists/src/handlers/introduce_variable.rs

@@ -111,7 +111,7 @@ fn valid_target_expr(node: SyntaxNode) -> Option<ast::Expr> {
 /// expression like a lambda or match arm.
 fn anchor_stmt(expr: ast::Expr) -> Option<(SyntaxNode, bool)> {
     expr.syntax().ancestors().find_map(|node| {
-        if let Some(expr) = node.parent().and_then(ast::Block::cast).and_then(|it| it.expr()) {
+        if let Some(expr) = node.parent().and_then(ast::BlockExpr::cast).and_then(|it| it.expr()) {
             if expr.syntax() == &node {
                 tested_by!(test_introduce_var_last_expr);
                 return Some((node, false));

crates/ra_assists/src/handlers/move_guard.rs

@@ -113,9 +113,9 @@ pub(crate) fn move_arm_cond_to_match_guard(ctx: AssistCtx) -> Option<Assist> {
         "Move condition to match guard",
         |edit| {
             edit.target(if_expr.syntax().text_range());
-            let then_only_expr = then_block.block().and_then(|it| it.statements().next()).is_none();
+            let then_only_expr = then_block.statements().next().is_none();
 
-            match &then_block.block().and_then(|it| it.expr()) {
+            match &then_block.expr() {
                 Some(then_expr) if then_only_expr => {
                     edit.replace(if_expr.syntax().text_range(), then_expr.syntax().text())
                 }

crates/ra_fmt/src/lib.rs

@@ -42,7 +42,6 @@ pub fn unwrap_trivial_block(block: ast::BlockExpr) -> ast::Expr {
 }
 
 pub fn extract_trivial_expression(block: &ast::BlockExpr) -> Option<ast::Expr> {
-    let block = block.block()?;
     let has_anything_else = |thing: &SyntaxNode| -> bool {
         let mut non_trivial_children =
             block.syntax().children_with_tokens().filter(|it| match it.kind() {

crates/ra_hir_def/src/body/lower.rs

@@ -203,10 +203,16 @@ impl ExprCollector<'_> {
 
                 self.alloc_expr(Expr::If { condition, then_branch, else_branch }, syntax_ptr)
             }
-            ast::Expr::TryBlockExpr(e) => {
-                let body = self.collect_block_opt(e.body());
-                self.alloc_expr(Expr::TryBlock { body }, syntax_ptr)
-            }
+            ast::Expr::EffectExpr(e) => match e.effect() {
+                ast::Effect::Try(_) => {
+                    let body = self.collect_block_opt(e.block_expr());
+                    self.alloc_expr(Expr::TryBlock { body }, syntax_ptr)
+                }
+                // FIXME: we need to record these effects somewhere...
+                ast::Effect::Async(_) | ast::Effect::Label(_) | ast::Effect::Unsafe(_) => {
+                    self.collect_block_opt(e.block_expr())
+                }
+            },
             ast::Expr::BlockExpr(e) => self.collect_block(e),
             ast::Expr::LoopExpr(e) => {
                 let body = self.collect_block_opt(e.loop_body());
@@ -494,12 +500,8 @@ impl ExprCollector<'_> {
         }
     }
 
-    fn collect_block(&mut self, expr: ast::BlockExpr) -> ExprId {
-        let syntax_node_ptr = AstPtr::new(&expr.clone().into());
-        let block = match expr.block() {
-            Some(block) => block,
-            None => return self.alloc_expr(Expr::Missing, syntax_node_ptr),
-        };
+    fn collect_block(&mut self, block: ast::BlockExpr) -> ExprId {
+        let syntax_node_ptr = AstPtr::new(&block.clone().into());
         self.collect_block_items(&block);
         let statements = block
             .statements()
@@ -517,7 +519,7 @@ impl ExprCollector<'_> {
         self.alloc_expr(Expr::Block { statements, tail }, syntax_node_ptr)
     }
 
-    fn collect_block_items(&mut self, block: &ast::Block) {
+    fn collect_block_items(&mut self, block: &ast::BlockExpr) {
         let container = ContainerId::DefWithBodyId(self.def);
         for item in block.items() {
             let (def, name): (ModuleDefId, Option<ast::Name>) = match item {

crates/ra_hir_expand/src/db.rs

@@ -330,7 +330,7 @@ fn to_fragment_kind(db: &dyn AstDatabase, id: MacroCallId) -> FragmentKind {
             FragmentKind::Expr
         }
         // FIXME: Expand to statements in appropriate positions; HIR lowering needs to handle that
-        EXPR_STMT | BLOCK => FragmentKind::Expr,
+        EXPR_STMT | BLOCK_EXPR => FragmentKind::Expr,
         ARG_LIST => FragmentKind::Expr,
         TRY_EXPR => FragmentKind::Expr,
         TUPLE_EXPR => FragmentKind::Expr,
@@ -342,7 +342,6 @@ fn to_fragment_kind(db: &dyn AstDatabase, id: MacroCallId) -> FragmentKind {
         CONDITION => FragmentKind::Expr,
         BREAK_EXPR => FragmentKind::Expr,
         RETURN_EXPR => FragmentKind::Expr,
-        BLOCK_EXPR => FragmentKind::Expr,
         MATCH_EXPR => FragmentKind::Expr,
         MATCH_ARM => FragmentKind::Expr,
         MATCH_GUARD => FragmentKind::Expr,

crates/ra_hir_ty/src/tests/simple.rs

@@ -1755,3 +1755,35 @@ fn main() {
     "###
     );
 }
+
+#[test]
+fn effects_smoke_test() {
+    assert_snapshot!(
+        infer(r#"
+fn main() {
+    let x = unsafe { 92 };
+    let y = async { async { () }.await };
+    let z = try { () };
+    let t = 'a: { 92 };
+}
+"#),
+        @r###"
+    11..131 '{     ...2 }; }': ()
+    21..22 'x': i32
+    32..38 '{ 92 }': i32
+    34..36 '92': i32
+    48..49 'y': {unknown}
+    58..80 '{ asyn...wait }': {unknown}
+    60..78 'async ....await': {unknown}
+    66..72 '{ () }': ()
+    68..70 '()': ()
+    90..91 'z': {unknown}
+    94..104 'try { () }': {unknown}
+    98..104 '{ () }': ()
+    100..102 '()': ()
+    114..115 't': i32
+    122..128 '{ 92 }': i32
+    124..126 '92': i32
+    "###
+    )
+}

crates/ra_ide/src/completion/completion_context.rs

@@ -344,7 +344,7 @@ impl<'a> CompletionContext<'a> {
                                 stmt.syntax().text_range() == name_ref.syntax().text_range(),
                             );
                         }
-                        if let Some(block) = ast::Block::cast(node) {
+                        if let Some(block) = ast::BlockExpr::cast(node) {
                             return Some(
                                 block.expr().map(|e| e.syntax().text_range())
                                     == Some(name_ref.syntax().text_range()),

crates/ra_ide/src/folding_ranges.rs

@@ -88,7 +88,7 @@ fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
         | ITEM_LIST
         | EXTERN_ITEM_LIST
         | USE_TREE_LIST
-        | BLOCK
+        | BLOCK_EXPR
         | MATCH_ARM_LIST
         | ENUM_VARIANT_LIST
         | TOKEN_TREE => Some(FoldKind::Block),

crates/ra_ide/src/join_lines.rs

@@ -129,8 +129,7 @@ fn has_comma_after(node: &SyntaxNode) -> bool {
 }
 
 fn join_single_expr_block(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Option<()> {
-    let block = ast::Block::cast(token.parent())?;
-    let block_expr = ast::BlockExpr::cast(block.syntax().parent()?)?;
+    let block_expr = ast::BlockExpr::cast(token.parent())?;
     if !block_expr.is_standalone() {
         return None;
     }

crates/ra_ide/src/syntax_tree.rs

@@ -120,9 +120,8 @@ SOURCE_FILE@0..11
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..11
-      BLOCK@9..11
-        L_CURLY@9..10 "{"
-        R_CURLY@10..11 "}"
+      L_CURLY@9..10 "{"
+      R_CURLY@10..11 "}"
 "#
             .trim()
         );
@@ -153,26 +152,25 @@ SOURCE_FILE@0..60
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..60
-      BLOCK@10..60
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        EXPR_STMT@16..58
-          MACRO_CALL@16..57
-            PATH@16..22
-              PATH_SEGMENT@16..22
-                NAME_REF@16..22
-                  IDENT@16..22 "assert"
-            BANG@22..23 "!"
-            TOKEN_TREE@23..57
-              L_PAREN@23..24 "("
-              STRING@24..52 "\"\n    fn foo() {\n     ..."
-              COMMA@52..53 ","
-              WHITESPACE@53..54 " "
-              STRING@54..56 "\"\""
-              R_PAREN@56..57 ")"
-          SEMICOLON@57..58 ";"
-        WHITESPACE@58..59 "\n"
-        R_CURLY@59..60 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      EXPR_STMT@16..58
+        MACRO_CALL@16..57
+          PATH@16..22
+            PATH_SEGMENT@16..22
+              NAME_REF@16..22
+                IDENT@16..22 "assert"
+          BANG@22..23 "!"
+          TOKEN_TREE@23..57
+            L_PAREN@23..24 "("
+            STRING@24..52 "\"\n    fn foo() {\n     ..."
+            COMMA@52..53 ","
+            WHITESPACE@53..54 " "
+            STRING@54..56 "\"\""
+            R_PAREN@56..57 ")"
+        SEMICOLON@57..58 ";"
+      WHITESPACE@58..59 "\n"
+      R_CURLY@59..60 "}"
 "#
             .trim()
         );
@@ -196,9 +194,8 @@ FN_DEF@0..11
     R_PAREN@7..8 ")"
   WHITESPACE@8..9 " "
   BLOCK_EXPR@9..11
-    BLOCK@9..11
-      L_CURLY@9..10 "{"
-      R_CURLY@10..11 "}"
+    L_CURLY@9..10 "{"
+    R_CURLY@10..11 "}"
 "#
             .trim()
         );
@@ -265,10 +262,9 @@ SOURCE_FILE@0..12
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..12
-      BLOCK@9..12
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..11 "\n"
-        R_CURLY@11..12 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..11 "\n"
+      R_CURLY@11..12 "}"
 "#
             .trim()
         );
@@ -300,10 +296,9 @@ SOURCE_FILE@0..12
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..12
-      BLOCK@9..12
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..11 "\n"
-        R_CURLY@11..12 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..11 "\n"
+      R_CURLY@11..12 "}"
 "#
             .trim()
         );
@@ -334,10 +329,9 @@ SOURCE_FILE@0..25
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..12
-      BLOCK@9..12
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..11 "\n"
-        R_CURLY@11..12 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..11 "\n"
+      R_CURLY@11..12 "}"
   WHITESPACE@12..13 "\n"
   FN_DEF@13..25
     FN_KW@13..15 "fn"
@@ -349,10 +343,9 @@ SOURCE_FILE@0..25
       R_PAREN@20..21 ")"
     WHITESPACE@21..22 " "
     BLOCK_EXPR@22..25
-      BLOCK@22..25
-        L_CURLY@22..23 "{"
-        WHITESPACE@23..24 "\n"
-        R_CURLY@24..25 "}"
+      L_CURLY@22..23 "{"
+      WHITESPACE@23..24 "\n"
+      R_CURLY@24..25 "}"
 "#
             .trim()
         );

crates/ra_mbe/src/tests.rs

@@ -266,21 +266,20 @@ fn test_expr_order() {
       L_PAREN@5..6 "("
       R_PAREN@6..7 ")"
     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"
-          SEMICOLON@13..14 ";"
-        R_CURLY@14..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"
+        SEMICOLON@13..14 ";"
+      R_CURLY@14..15 "}""#,
     );
 }
 
@@ -1114,68 +1113,67 @@ fn test_vec() {
     assert_eq!(
         format!("{:#?}", tree).trim(),
         r#"BLOCK_EXPR@0..45
-  BLOCK@0..45
-    L_CURLY@0..1 "{"
-    LET_STMT@1..20
-      LET_KW@1..4 "let"
-      BIND_PAT@4..8
-        MUT_KW@4..7 "mut"
-        NAME@7..8
-          IDENT@7..8 "v"
-      EQ@8..9 "="
-      CALL_EXPR@9..19
-        PATH_EXPR@9..17
-          PATH@9..17
-            PATH@9..12
-              PATH_SEGMENT@9..12
-                NAME_REF@9..12
-                  IDENT@9..12 "Vec"
-            COLON2@12..14 "::"
-            PATH_SEGMENT@14..17
-              NAME_REF@14..17
-                IDENT@14..17 "new"
-        ARG_LIST@17..19
-          L_PAREN@17..18 "("
-          R_PAREN@18..19 ")"
-      SEMICOLON@19..20 ";"
-    EXPR_STMT@20..33
-      METHOD_CALL_EXPR@20..32
-        PATH_EXPR@20..21
-          PATH@20..21
-            PATH_SEGMENT@20..21
-              NAME_REF@20..21
-                IDENT@20..21 "v"
-        DOT@21..22 "."
-        NAME_REF@22..26
-          IDENT@22..26 "push"
-        ARG_LIST@26..32
-          L_PAREN@26..27 "("
-          LITERAL@27..31
-            INT_NUMBER@27..31 "1u32"
-          R_PAREN@31..32 ")"
-      SEMICOLON@32..33 ";"
-    EXPR_STMT@33..43
-      METHOD_CALL_EXPR@33..42
-        PATH_EXPR@33..34
-          PATH@33..34
-            PATH_SEGMENT@33..34
-              NAME_REF@33..34
-                IDENT@33..34 "v"
-        DOT@34..35 "."
-        NAME_REF@35..39
-          IDENT@35..39 "push"
-        ARG_LIST@39..42
-          L_PAREN@39..40 "("
-          LITERAL@40..41
-            INT_NUMBER@40..41 "2"
-          R_PAREN@41..42 ")"
-      SEMICOLON@42..43 ";"
-    PATH_EXPR@43..44
-      PATH@43..44
-        PATH_SEGMENT@43..44
-          NAME_REF@43..44
-            IDENT@43..44 "v"
-    R_CURLY@44..45 "}""#
+  L_CURLY@0..1 "{"
+  LET_STMT@1..20
+    LET_KW@1..4 "let"
+    BIND_PAT@4..8
+      MUT_KW@4..7 "mut"
+      NAME@7..8
+        IDENT@7..8 "v"
+    EQ@8..9 "="
+    CALL_EXPR@9..19
+      PATH_EXPR@9..17
+        PATH@9..17
+          PATH@9..12
+            PATH_SEGMENT@9..12
+              NAME_REF@9..12
+                IDENT@9..12 "Vec"
+          COLON2@12..14 "::"
+          PATH_SEGMENT@14..17
+            NAME_REF@14..17
+              IDENT@14..17 "new"
+      ARG_LIST@17..19
+        L_PAREN@17..18 "("
+        R_PAREN@18..19 ")"
+    SEMICOLON@19..20 ";"
+  EXPR_STMT@20..33
+    METHOD_CALL_EXPR@20..32
+      PATH_EXPR@20..21
+        PATH@20..21
+          PATH_SEGMENT@20..21
+            NAME_REF@20..21
+              IDENT@20..21 "v"
+      DOT@21..22 "."
+      NAME_REF@22..26
+        IDENT@22..26 "push"
+      ARG_LIST@26..32
+        L_PAREN@26..27 "("
+        LITERAL@27..31
+          INT_NUMBER@27..31 "1u32"
+        R_PAREN@31..32 ")"
+    SEMICOLON@32..33 ";"
+  EXPR_STMT@33..43
+    METHOD_CALL_EXPR@33..42
+      PATH_EXPR@33..34
+        PATH@33..34
+          PATH_SEGMENT@33..34
+            NAME_REF@33..34
+              IDENT@33..34 "v"
+      DOT@34..35 "."
+      NAME_REF@35..39
+        IDENT@35..39 "push"
+      ARG_LIST@39..42
+        L_PAREN@39..40 "("
+        LITERAL@40..41
+          INT_NUMBER@40..41 "2"
+        R_PAREN@41..42 ")"
+    SEMICOLON@42..43 ";"
+  PATH_EXPR@43..44
+    PATH@43..44
+      PATH_SEGMENT@43..44
+        NAME_REF@43..44
+          IDENT@43..44 "v"
+  R_CURLY@44..45 "}""#
     );
 }
 

crates/ra_parser/src/grammar.rs

@@ -143,7 +143,7 @@ pub(crate) fn reparser(
     parent: Option<SyntaxKind>,
 ) -> Option<fn(&mut Parser)> {
     let res = match node {
-        BLOCK => expressions::naked_block,
+        BLOCK_EXPR => expressions::block,
         RECORD_FIELD_DEF_LIST => items::record_field_def_list,
         RECORD_FIELD_LIST => items::record_field_list,
         ENUM_VARIANT_LIST => items::enum_variant_list,

crates/ra_parser/src/grammar/expressions.rs

@@ -59,16 +59,7 @@ pub(crate) fn block(p: &mut Parser) {
         p.error("expected a block");
         return;
     }
-    atom::block_expr(p, None);
-}
-
-pub(crate) fn naked_block(p: &mut Parser) {
-    assert!(p.at(T!['{']));
-    let m = p.start();
-    p.bump(T!['{']);
-    expr_block_contents(p);
-    p.expect(T!['}']);
-    m.complete(p, BLOCK);
+    atom::block_expr(p);
 }
 
 fn is_expr_stmt_attr_allowed(kind: SyntaxKind) -> bool {
@@ -197,7 +188,7 @@ pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi) {
     }
 }
 
-pub(crate) fn expr_block_contents(p: &mut Parser) {
+pub(super) fn expr_block_contents(p: &mut Parser) {
     // This is checked by a validator
     attributes::inner_attributes(p);
 

crates/ra_parser/src/grammar/expressions/atom.rs

@@ -92,7 +92,12 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
                 T![loop] => loop_expr(p, Some(m)),
                 T![for] => for_expr(p, Some(m)),
                 T![while] => while_expr(p, Some(m)),
-                T!['{'] => block_expr(p, Some(m)),
+                // test labeled_block
+                // fn f() { 'label: {}; }
+                T!['{'] => {
+                    block_expr(p);
+                    m.complete(p, EFFECT_EXPR)
+                }
                 _ => {
                     // test_err misplaced_label_err
                     // fn main() {
@@ -108,13 +113,17 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
             let m = p.start();
             p.bump(T![async]);
             p.eat(T![move]);
-            block_expr(p, Some(m))
+            block_expr(p);
+            m.complete(p, EFFECT_EXPR)
         }
         T![match] => match_expr(p),
+        // test unsafe_block
+        // fn f() { unsafe { } }
         T![unsafe] if la == T!['{'] => {
             let m = p.start();
             p.bump(T![unsafe]);
-            block_expr(p, Some(m))
+            block_expr(p);
+            m.complete(p, EFFECT_EXPR)
         }
         T!['{'] => {
             // test for_range_from
@@ -123,7 +132,7 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
             //        break;
             //    }
             // }
-            block_expr(p, None)
+            block_expr(p)
         }
         T![return] => return_expr(p),
         T![continue] => continue_expr(p),
@@ -134,7 +143,7 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
         }
     };
     let blocklike = match done.kind() {
-        IF_EXPR | WHILE_EXPR | FOR_EXPR | LOOP_EXPR | MATCH_EXPR | BLOCK_EXPR | TRY_BLOCK_EXPR => {
+        IF_EXPR | WHILE_EXPR | FOR_EXPR | LOOP_EXPR | MATCH_EXPR | BLOCK_EXPR | EFFECT_EXPR => {
             BlockLike::Block
         }
         _ => BlockLike::NotBlock,
@@ -234,7 +243,7 @@ fn lambda_expr(p: &mut Parser) -> CompletedMarker {
         if p.at(T!['{']) {
             // test lambda_ret_block
             // fn main() { || -> i32 { 92 }(); }
-            block_expr(p, None);
+            block_expr(p);
         } else {
             p.error("expected `{`");
         }
@@ -461,13 +470,13 @@ fn match_guard(p: &mut Parser) -> CompletedMarker {
 // test block_expr
 // fn foo() {
 //     {};
-//     unsafe {};
-//     'label: {};
 // }
-pub(super) fn block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
+pub(super) fn block_expr(p: &mut Parser) -> CompletedMarker {
     assert!(p.at(T!['{']));
-    let m = m.unwrap_or_else(|| p.start());
-    naked_block(p);
+    let m = p.start();
+    p.bump(T!['{']);
+    expr_block_contents(p);
+    p.expect(T!['}']);
     m.complete(p, BLOCK_EXPR)
 }
 
@@ -552,8 +561,8 @@ fn try_block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
     }
 
     p.bump(T![try]);
-    block(p);
-    m.complete(p, TRY_EXPR)
+    block_expr(p);
+    m.complete(p, EFFECT_EXPR)
 }
 
 // test box_expr

crates/ra_parser/src/syntax_kind/generated.rs

@@ -191,7 +191,7 @@ pub enum SyntaxKind {
     RECORD_LIT,
     RECORD_FIELD_LIST,
     RECORD_FIELD,
-    TRY_BLOCK_EXPR,
+    EFFECT_EXPR,
     BOX_EXPR,
     CALL_EXPR,
     INDEX_EXPR,
@@ -204,7 +204,6 @@ pub enum SyntaxKind {
     PREFIX_EXPR,
     RANGE_EXPR,
     BIN_EXPR,
-    BLOCK,
     EXTERN_BLOCK,
     EXTERN_ITEM_LIST,
     ENUM_VARIANT,

crates/ra_syntax/src/ast.rs

@@ -16,7 +16,7 @@ use crate::{
 };
 
 pub use self::{
-    expr_extensions::{ArrayExprKind, BinOp, ElseBranch, LiteralKind, PrefixOp, RangeOp},
+    expr_extensions::{ArrayExprKind, BinOp, Effect, ElseBranch, LiteralKind, PrefixOp, RangeOp},
     extensions::{
         AttrKind, FieldKind, NameOrNameRef, PathSegmentKind, SelfParamKind, SlicePatComponents,
         StructKind, TypeBoundKind, VisibilityKind,

crates/ra_syntax/src/ast/edit.rs

@@ -28,7 +28,7 @@ impl ast::BinExpr {
 
 impl ast::FnDef {
     #[must_use]
-    pub fn with_body(&self, body: ast::Block) -> ast::FnDef {
+    pub fn with_body(&self, body: ast::BlockExpr) -> ast::FnDef {
         let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new();
         let old_body_or_semi: SyntaxElement = if let Some(old_body) = self.body() {
             old_body.syntax().clone().into()

crates/ra_syntax/src/ast/expr_extensions.rs

@@ -16,7 +16,7 @@ impl ast::Expr {
             | ast::Expr::WhileExpr(_)
             | ast::Expr::BlockExpr(_)
             | ast::Expr::MatchExpr(_)
-            | ast::Expr::TryBlockExpr(_) => true,
+            | ast::Expr::EffectExpr(_) => true,
             _ => false,
         }
     }
@@ -359,6 +359,33 @@ impl ast::Literal {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Effect {
+    Async(SyntaxToken),
+    Unsafe(SyntaxToken),
+    Try(SyntaxToken),
+    // Very much not an effect, but we stuff it into this node anyway
+    Label(ast::Label),
+}
+
+impl ast::EffectExpr {
+    pub fn effect(&self) -> Effect {
+        if let Some(token) = self.async_token() {
+            return Effect::Async(token);
+        }
+        if let Some(token) = self.unsafe_token() {
+            return Effect::Unsafe(token);
+        }
+        if let Some(token) = self.try_token() {
+            return Effect::Try(token);
+        }
+        if let Some(label) = self.label() {
+            return Effect::Label(label);
+        }
+        unreachable!("ast::EffectExpr without Effect")
+    }
+}
+
 impl ast::BlockExpr {
     /// false if the block is an intrinsic part of the syntax and can't be
     /// replaced with arbitrary expression.
@@ -368,15 +395,12 @@ impl ast::BlockExpr {
     /// const FOO: () = { stand_alone };
     /// ```
     pub fn is_standalone(&self) -> bool {
-        if self.unsafe_token().is_some() || self.async_token().is_some() {
-            return false;
-        }
-        let kind = match self.syntax().parent() {
+        let parent = match self.syntax().parent() {
+            Some(it) => it,
             None => return true,
-            Some(it) => it.kind(),
         };
-        match kind {
-            FN_DEF | IF_EXPR | WHILE_EXPR | LOOP_EXPR | TRY_BLOCK_EXPR => false,
+        match parent.kind() {
+            FN_DEF | IF_EXPR | WHILE_EXPR | LOOP_EXPR | EFFECT_EXPR => false,
             _ => true,
         }
     }

crates/ra_syntax/src/ast/generated/nodes.rs

@@ -476,13 +476,16 @@ impl LoopExpr {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TryBlockExpr {
+pub struct EffectExpr {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for TryBlockExpr {}
-impl TryBlockExpr {
+impl ast::AttrsOwner for EffectExpr {}
+impl EffectExpr {
+    pub fn label(&self) -> Option<Label> { support::child(&self.syntax) }
     pub fn try_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![try]) }
-    pub fn body(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
+    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
+    pub fn block_expr(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -551,11 +554,12 @@ pub struct BlockExpr {
     pub(crate) syntax: SyntaxNode,
 }
 impl ast::AttrsOwner for BlockExpr {}
+impl ast::ModuleItemOwner for BlockExpr {}
 impl BlockExpr {
-    pub fn label(&self) -> Option<Label> { support::child(&self.syntax) }
-    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
-    pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
-    pub fn block(&self) -> Option<Block> { support::child(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
+    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
+    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -627,8 +631,8 @@ pub struct TryExpr {
 }
 impl ast::AttrsOwner for TryExpr {}
 impl TryExpr {
-    pub fn try_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![try]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn question_mark_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![?]) }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1121,19 +1125,6 @@ impl Condition {
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Block {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::AttrsOwner for Block {}
-impl ast::ModuleItemOwner for Block {}
-impl Block {
-    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
-    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ParamList {
     pub(crate) syntax: SyntaxNode,
@@ -1477,7 +1468,7 @@ pub enum Expr {
     FieldExpr(FieldExpr),
     AwaitExpr(AwaitExpr),
     TryExpr(TryExpr),
-    TryBlockExpr(TryBlockExpr),
+    EffectExpr(EffectExpr),
     CastExpr(CastExpr),
     RefExpr(RefExpr),
     PrefixExpr(PrefixExpr),
@@ -1960,8 +1951,8 @@ impl AstNode for LoopExpr {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TryBlockExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TRY_BLOCK_EXPR }
+impl AstNode for EffectExpr {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == EFFECT_EXPR }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2653,17 +2644,6 @@ impl AstNode for Condition {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Block {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BLOCK }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
 impl AstNode for ParamList {
     fn can_cast(kind: SyntaxKind) -> bool { kind == PARAM_LIST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -3312,8 +3292,8 @@ impl From<AwaitExpr> for Expr {
 impl From<TryExpr> for Expr {
     fn from(node: TryExpr) -> Expr { Expr::TryExpr(node) }
 }
-impl From<TryBlockExpr> for Expr {
-    fn from(node: TryBlockExpr) -> Expr { Expr::TryBlockExpr(node) }
+impl From<EffectExpr> for Expr {
+    fn from(node: EffectExpr) -> Expr { Expr::EffectExpr(node) }
 }
 impl From<CastExpr> for Expr {
     fn from(node: CastExpr) -> Expr { Expr::CastExpr(node) }
@@ -3345,9 +3325,10 @@ impl AstNode for Expr {
             TUPLE_EXPR | ARRAY_EXPR | PAREN_EXPR | PATH_EXPR | LAMBDA_EXPR | IF_EXPR
             | LOOP_EXPR | FOR_EXPR | WHILE_EXPR | CONTINUE_EXPR | BREAK_EXPR | LABEL
             | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | RECORD_LIT | CALL_EXPR | INDEX_EXPR
-            | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | TRY_BLOCK_EXPR
-            | CAST_EXPR | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL
-            | BOX_EXPR => true,
+            | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | EFFECT_EXPR | CAST_EXPR
+            | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL | BOX_EXPR => {
+                true
+            }
             _ => false,
         }
     }
@@ -3375,7 +3356,7 @@ impl AstNode for Expr {
             FIELD_EXPR => Expr::FieldExpr(FieldExpr { syntax }),
             AWAIT_EXPR => Expr::AwaitExpr(AwaitExpr { syntax }),
             TRY_EXPR => Expr::TryExpr(TryExpr { syntax }),
-            TRY_BLOCK_EXPR => Expr::TryBlockExpr(TryBlockExpr { syntax }),
+            EFFECT_EXPR => Expr::EffectExpr(EffectExpr { syntax }),
             CAST_EXPR => Expr::CastExpr(CastExpr { syntax }),
             REF_EXPR => Expr::RefExpr(RefExpr { syntax }),
             PREFIX_EXPR => Expr::PrefixExpr(PrefixExpr { syntax }),
@@ -3412,7 +3393,7 @@ impl AstNode for Expr {
             Expr::FieldExpr(it) => &it.syntax,
             Expr::AwaitExpr(it) => &it.syntax,
             Expr::TryExpr(it) => &it.syntax,
-            Expr::TryBlockExpr(it) => &it.syntax,
+            Expr::EffectExpr(it) => &it.syntax,
             Expr::CastExpr(it) => &it.syntax,
             Expr::RefExpr(it) => &it.syntax,
             Expr::PrefixExpr(it) => &it.syntax,
@@ -3893,7 +3874,7 @@ impl std::fmt::Display for LoopExpr {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for TryBlockExpr {
+impl std::fmt::Display for EffectExpr {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -4208,11 +4189,6 @@ impl std::fmt::Display for Condition {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for Block {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
 impl std::fmt::Display for ParamList {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)

crates/ra_syntax/src/ast/make.rs

@@ -82,14 +82,6 @@ pub fn block_expr(
     ast_from_text(&format!("fn f() {}", buf))
 }
 
-pub fn block_from_expr(e: ast::Expr) -> ast::Block {
-    return from_text(&format!("{{ {} }}", e));
-
-    fn from_text(text: &str) -> ast::Block {
-        ast_from_text(&format!("fn f() {}", text))
-    }
-}
-
 pub fn expr_unit() -> ast::Expr {
     expr_from_text("()")
 }

crates/ra_syntax/src/lib.rs

@@ -237,8 +237,7 @@ fn api_walkthrough() {
 
     // Let's get the `1 + 1` expression!
     let body: ast::BlockExpr = func.body().unwrap();
-    let block = body.block().unwrap();
-    let expr: ast::Expr = block.expr().unwrap();
+    let expr: ast::Expr = body.expr().unwrap();
 
     // Enums are used to group related ast nodes together, and can be used for
     // matching. However, because there are no public fields, it's possible to
@@ -274,8 +273,8 @@ fn api_walkthrough() {
     assert_eq!(text.to_string(), "1 + 1");
 
     // There's a bunch of traversal methods on `SyntaxNode`:
-    assert_eq!(expr_syntax.parent().as_ref(), Some(block.syntax()));
-    assert_eq!(block.syntax().first_child_or_token().map(|it| it.kind()), Some(T!['{']));
+    assert_eq!(expr_syntax.parent().as_ref(), Some(body.syntax()));
+    assert_eq!(body.syntax().first_child_or_token().map(|it| it.kind()), Some(T!['{']));
     assert_eq!(
         expr_syntax.next_sibling_or_token().map(|it| it.kind()),
         Some(SyntaxKind::WHITESPACE)

crates/ra_syntax/src/validation/block.rs

@@ -6,19 +6,17 @@ use crate::{
     SyntaxKind::*,
 };
 
-pub(crate) fn validate_block_expr(expr: ast::BlockExpr, errors: &mut Vec<SyntaxError>) {
-    if let Some(parent) = expr.syntax().parent() {
+pub(crate) fn validate_block_expr(block: ast::BlockExpr, errors: &mut Vec<SyntaxError>) {
+    if let Some(parent) = block.syntax().parent() {
         match parent.kind() {
-            FN_DEF | EXPR_STMT | BLOCK => return,
+            FN_DEF | EXPR_STMT | BLOCK_EXPR => return,
             _ => {}
         }
     }
-    if let Some(block) = expr.block() {
-        errors.extend(block.attrs().map(|attr| {
-            SyntaxError::new(
-                "A block in this position cannot accept inner attributes",
-                attr.syntax().text_range(),
-            )
-        }))
-    }
+    errors.extend(block.attrs().map(|attr| {
+        SyntaxError::new(
+            "A block in this position cannot accept inner attributes",
+            attr.syntax().text_range(),
+        )
+    }))
 }

crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast

@@ -28,10 +28,9 @@ SOURCE_FILE@0..54
       R_PAREN@26..27 ")"
     WHITESPACE@27..28 " "
     BLOCK_EXPR@28..31
-      BLOCK@28..31
-        L_CURLY@28..29 "{"
-        WHITESPACE@29..30 "\n"
-        R_CURLY@30..31 "}"
+      L_CURLY@28..29 "{"
+      WHITESPACE@29..30 "\n"
+      R_CURLY@30..31 "}"
   WHITESPACE@31..34 "\n\n\n"
   ATTR@34..53
     POUND@34..35 "#"

crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast

@@ -21,9 +21,8 @@ SOURCE_FILE@0..31
       L_PAREN@23..24 "("
       R_PAREN@24..25 ")"
     BLOCK_EXPR@25..27
-      BLOCK@25..27
-        L_CURLY@25..26 "{"
-        R_CURLY@26..27 "}"
+      L_CURLY@25..26 "{"
+      R_CURLY@26..27 "}"
   WHITESPACE@27..29 "\n\n"
   ERROR@29..30
     R_CURLY@29..30 "}"

crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast

@@ -9,10 +9,9 @@ SOURCE_FILE@0..95
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..12
-      BLOCK@9..12
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..11 "\n"
-        R_CURLY@11..12 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..11 "\n"
+      R_CURLY@11..12 "}"
   WHITESPACE@12..14 "\n\n"
   MACRO_CALL@14..19
     PATH@14..17
@@ -34,30 +33,28 @@ SOURCE_FILE@0..95
           TRUE_KW@29..33 "true"
       WHITESPACE@33..34 " "
       BLOCK_EXPR@34..51
-        BLOCK@34..51
-          L_CURLY@34..35 "{"
-          WHITESPACE@35..44 "\n        "
-          LITERAL@44..45
-            INT_NUMBER@44..45 "1"
-          WHITESPACE@45..50 "\n    "
-          R_CURLY@50..51 "}"
+        L_CURLY@34..35 "{"
+        WHITESPACE@35..44 "\n        "
+        LITERAL@44..45
+          INT_NUMBER@44..45 "1"
+        WHITESPACE@45..50 "\n    "
+        R_CURLY@50..51 "}"
       WHITESPACE@51..52 " "
       ELSE_KW@52..56 "else"
       WHITESPACE@56..57 " "
       BLOCK_EXPR@57..78
-        BLOCK@57..78
-          L_CURLY@57..58 "{"
-          WHITESPACE@58..67 "\n        "
-          BIN_EXPR@67..72
-            LITERAL@67..68
-              INT_NUMBER@67..68 "2"
-            WHITESPACE@68..69 " "
-            PLUS@69..70 "+"
-            WHITESPACE@70..71 " "
-            LITERAL@71..72
-              INT_NUMBER@71..72 "3"
-          WHITESPACE@72..77 "\n    "
-          R_CURLY@77..78 "}"
+        L_CURLY@57..58 "{"
+        WHITESPACE@58..67 "\n        "
+        BIN_EXPR@67..72
+          LITERAL@67..68
+            INT_NUMBER@67..68 "2"
+          WHITESPACE@68..69 " "
+          PLUS@69..70 "+"
+          WHITESPACE@70..71 " "
+          LITERAL@71..72
+            INT_NUMBER@71..72 "3"
+        WHITESPACE@72..77 "\n    "
+        R_CURLY@77..78 "}"
     WHITESPACE@78..79 "\n"
     R_CURLY@79..80 "}"
   WHITESPACE@80..82 "\n\n"
@@ -71,10 +68,9 @@ SOURCE_FILE@0..95
       R_PAREN@89..90 ")"
     WHITESPACE@90..91 " "
     BLOCK_EXPR@91..94
-      BLOCK@91..94
-        L_CURLY@91..92 "{"
-        WHITESPACE@92..93 "\n"
-        R_CURLY@93..94 "}"
+      L_CURLY@91..92 "{"
+      WHITESPACE@92..93 "\n"
+      R_CURLY@93..94 "}"
   WHITESPACE@94..95 "\n"
 error 17..17: expected BANG
 error 19..19: expected SEMICOLON

crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast

@@ -9,37 +9,36 @@ SOURCE_FILE@0..42
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..41
-      BLOCK@10..41
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        EXPR_STMT@16..24
-          LAMBDA_EXPR@16..24
-            PARAM_LIST@16..18
-              PIPE@16..17 "|"
-              PIPE@17..18 "|"
-            WHITESPACE@18..19 " "
-            RET_TYPE@19..24
-              THIN_ARROW@19..21 "->"
-              WHITESPACE@21..22 " "
-              TUPLE_TYPE@22..24
-                L_PAREN@22..23 "("
-                R_PAREN@23..24 ")"
-        WHITESPACE@24..25 " "
-        EXPR_STMT@25..39
-          BLOCK_EXPR@25..38
-            UNSAFE_KW@25..31 "unsafe"
-            WHITESPACE@31..32 " "
-            BLOCK@32..38
-              L_CURLY@32..33 "{"
-              WHITESPACE@33..34 " "
-              TUPLE_EXPR@34..36
-                L_PAREN@34..35 "("
-                R_PAREN@35..36 ")"
-              WHITESPACE@36..37 " "
-              R_CURLY@37..38 "}"
-          SEMICOLON@38..39 ";"
-        WHITESPACE@39..40 "\n"
-        R_CURLY@40..41 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      EXPR_STMT@16..24
+        LAMBDA_EXPR@16..24
+          PARAM_LIST@16..18
+            PIPE@16..17 "|"
+            PIPE@17..18 "|"
+          WHITESPACE@18..19 " "
+          RET_TYPE@19..24
+            THIN_ARROW@19..21 "->"
+            WHITESPACE@21..22 " "
+            TUPLE_TYPE@22..24
+              L_PAREN@22..23 "("
+              R_PAREN@23..24 ")"
+      WHITESPACE@24..25 " "
+      EXPR_STMT@25..39
+        EFFECT_EXPR@25..38
+          UNSAFE_KW@25..31 "unsafe"
+          WHITESPACE@31..32 " "
+          BLOCK_EXPR@32..38
+            L_CURLY@32..33 "{"
+            WHITESPACE@33..34 " "
+            TUPLE_EXPR@34..36
+              L_PAREN@34..35 "("
+              R_PAREN@35..36 ")"
+            WHITESPACE@36..37 " "
+            R_CURLY@37..38 "}"
+        SEMICOLON@38..39 ";"
+      WHITESPACE@39..40 "\n"
+      R_CURLY@40..41 "}"
   WHITESPACE@41..42 "\n"
 error 24..24: expected `{`
 error 24..24: expected SEMICOLON

crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast

@@ -25,8 +25,7 @@ SOURCE_FILE@0..23
                 IDENT@18..19 "T"
     WHITESPACE@19..20 " "
     BLOCK_EXPR@20..22
-      BLOCK@20..22
-        L_CURLY@20..21 "{"
-        R_CURLY@21..22 "}"
+      L_CURLY@20..21 "{"
+      R_CURLY@21..22 "}"
   WHITESPACE@22..23 "\n"
 error 19..19: expected colon

crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast

@@ -9,36 +9,35 @@ SOURCE_FILE@0..56
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..55
-      BLOCK@9..55
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..38
-          CALL_EXPR@15..38
-            PATH_EXPR@15..18
-              PATH@15..18
-                PATH_SEGMENT@15..18
-                  NAME_REF@15..18
-                    IDENT@15..18 "foo"
-            ARG_LIST@18..38
-              L_PAREN@18..19 "("
-              WHITESPACE@19..28 "\n        "
-              LITERAL@28..29
-                INT_NUMBER@28..29 "1"
-              COMMA@29..30 ","
-              WHITESPACE@30..31 " "
-              LITERAL@31..32
-                INT_NUMBER@31..32 "2"
-              WHITESPACE@32..37 "\n    "
-              R_PAREN@37..38 ")"
-        WHITESPACE@38..43 "\n    "
-        EXPR_STMT@43..53
-          RETURN_EXPR@43..52
-            RETURN_KW@43..49 "return"
-            WHITESPACE@49..50 " "
-            LITERAL@50..52
-              INT_NUMBER@50..52 "92"
-          SEMICOLON@52..53 ";"
-        WHITESPACE@53..54 "\n"
-        R_CURLY@54..55 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..38
+        CALL_EXPR@15..38
+          PATH_EXPR@15..18
+            PATH@15..18
+              PATH_SEGMENT@15..18
+                NAME_REF@15..18
+                  IDENT@15..18 "foo"
+          ARG_LIST@18..38
+            L_PAREN@18..19 "("
+            WHITESPACE@19..28 "\n        "
+            LITERAL@28..29
+              INT_NUMBER@28..29 "1"
+            COMMA@29..30 ","
+            WHITESPACE@30..31 " "
+            LITERAL@31..32
+              INT_NUMBER@31..32 "2"
+            WHITESPACE@32..37 "\n    "
+            R_PAREN@37..38 ")"
+      WHITESPACE@38..43 "\n    "
+      EXPR_STMT@43..53
+        RETURN_EXPR@43..52
+          RETURN_KW@43..49 "return"
+          WHITESPACE@49..50 " "
+          LITERAL@50..52
+            INT_NUMBER@50..52 "92"
+        SEMICOLON@52..53 ";"
+      WHITESPACE@53..54 "\n"
+      R_CURLY@54..55 "}"
   WHITESPACE@55..56 "\n"
 error 38..38: expected SEMICOLON

crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast

@@ -20,28 +20,27 @@ SOURCE_FILE@0..47
       R_PAREN@15..16 ")"
     WHITESPACE@16..17 " "
     BLOCK_EXPR@17..46
-      BLOCK@17..46
-        L_CURLY@17..18 "{"
-        WHITESPACE@18..23 "\n    "
-        LET_STMT@23..36
-          LET_KW@23..26 "let"
-          WHITESPACE@26..27 " "
-          BIND_PAT@27..30
-            NAME@27..30
-              IDENT@27..30 "bar"
-          WHITESPACE@30..31 " "
-          EQ@31..32 "="
-          WHITESPACE@32..33 " "
-          LITERAL@33..35
-            INT_NUMBER@33..35 "92"
-          SEMICOLON@35..36 ";"
-        WHITESPACE@36..41 "\n    "
-        BIN_EXPR@41..44
-          LITERAL@41..42
-            INT_NUMBER@41..42 "1"
-          WHITESPACE@42..43 " "
-          PLUS@43..44 "+"
-        WHITESPACE@44..45 "\n"
-        R_CURLY@45..46 "}"
+      L_CURLY@17..18 "{"
+      WHITESPACE@18..23 "\n    "
+      LET_STMT@23..36
+        LET_KW@23..26 "let"
+        WHITESPACE@26..27 " "
+        BIND_PAT@27..30
+          NAME@27..30
+            IDENT@27..30 "bar"
+        WHITESPACE@30..31 " "
+        EQ@31..32 "="
+        WHITESPACE@32..33 " "
+        LITERAL@33..35
+          INT_NUMBER@33..35 "92"
+        SEMICOLON@35..36 ";"
+      WHITESPACE@36..41 "\n    "
+      BIN_EXPR@41..44
+        LITERAL@41..42
+          INT_NUMBER@41..42 "1"
+        WHITESPACE@42..43 " "
+        PLUS@43..44 "+"
+      WHITESPACE@44..45 "\n"
+      R_CURLY@45..46 "}"
   WHITESPACE@46..47 "\n"
 error 44..44: expected expression

crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast

@@ -33,89 +33,88 @@ SOURCE_FILE@0..183
                   IDENT@39..46 "ScopeId"
         WHITESPACE@46..47 " "
         BLOCK_EXPR@47..161
-          BLOCK@47..161
-            L_CURLY@47..48 "{"
-            WHITESPACE@48..57 "\n        "
-            LET_STMT@57..85
-              LET_KW@57..60 "let"
-              WHITESPACE@60..61 " "
-              BIND_PAT@61..64
-                NAME@61..64
-                  IDENT@61..64 "res"
-              WHITESPACE@64..65 " "
-              EQ@65..66 "="
-              WHITESPACE@66..67 " "
-              METHOD_CALL_EXPR@67..84
-                FIELD_EXPR@67..78
-                  PATH_EXPR@67..71
-                    PATH@67..71
-                      PATH_SEGMENT@67..71
-                        SELF_KW@67..71 "self"
-                  DOT@71..72 "."
-                  NAME_REF@72..78
-                    IDENT@72..78 "scopes"
-                DOT@78..79 "."
-                NAME_REF@79..82
-                  IDENT@79..82 "len"
-                ARG_LIST@82..84
-                  L_PAREN@82..83 "("
-                  R_PAREN@83..84 ")"
-              SEMICOLON@84..85 ";"
-            WHITESPACE@85..94 "\n        "
-            METHOD_CALL_EXPR@94..155
-              FIELD_EXPR@94..105
-                PATH_EXPR@94..98
-                  PATH@94..98
-                    PATH_SEGMENT@94..98
-                      SELF_KW@94..98 "self"
-                DOT@98..99 "."
-                NAME_REF@99..105
-                  IDENT@99..105 "scopes"
-              DOT@105..106 "."
-              NAME_REF@106..110
-                IDENT@106..110 "push"
-              ARG_LIST@110..155
-                L_PAREN@110..111 "("
-                RECORD_LIT@111..154
-                  PATH@111..120
-                    PATH_SEGMENT@111..120
-                      NAME_REF@111..120
-                        IDENT@111..120 "ScopeData"
-                  WHITESPACE@120..121 " "
-                  RECORD_FIELD_LIST@121..154
-                    L_CURLY@121..122 "{"
-                    WHITESPACE@122..123 " "
-                    RECORD_FIELD@123..135
-                      NAME_REF@123..129
-                        IDENT@123..129 "parent"
-                      COLON@129..130 ":"
-                      WHITESPACE@130..131 " "
-                      PATH_EXPR@131..135
-                        PATH@131..135
-                          PATH_SEGMENT@131..135
-                            NAME_REF@131..135
-                              IDENT@131..135 "None"
-                    COMMA@135..136 ","
-                    WHITESPACE@136..137 " "
-                    RECORD_FIELD@137..152
-                      NAME_REF@137..144
-                        IDENT@137..144 "entries"
-                      COLON@144..145 ":"
-                      WHITESPACE@145..146 " "
-                      MACRO_CALL@146..152
-                        PATH@146..149
-                          PATH_SEGMENT@146..149
-                            NAME_REF@146..149
-                              IDENT@146..149 "vec"
-                        BANG@149..150 "!"
-                        TOKEN_TREE@150..152
-                          L_BRACK@150..151 "["
-                          R_BRACK@151..152 "]"
-                    WHITESPACE@152..153 " "
-                    R_CURLY@153..154 "}"
-                R_PAREN@154..155 ")"
-            WHITESPACE@155..160 "\n    "
-            R_CURLY@160..161 "}"
+          L_CURLY@47..48 "{"
+          WHITESPACE@48..57 "\n        "
+          LET_STMT@57..85
+            LET_KW@57..60 "let"
+            WHITESPACE@60..61 " "
+            BIND_PAT@61..64
+              NAME@61..64
+                IDENT@61..64 "res"
+            WHITESPACE@64..65 " "
+            EQ@65..66 "="
+            WHITESPACE@66..67 " "
+            METHOD_CALL_EXPR@67..84
+              FIELD_EXPR@67..78
+                PATH_EXPR@67..71
+                  PATH@67..71
+                    PATH_SEGMENT@67..71
+                      SELF_KW@67..71 "self"
+                DOT@71..72 "."
+                NAME_REF@72..78
+                  IDENT@72..78 "scopes"
+              DOT@78..79 "."
+              NAME_REF@79..82
+                IDENT@79..82 "len"
+              ARG_LIST@82..84
+                L_PAREN@82..83 "("
+                R_PAREN@83..84 ")"
+            SEMICOLON@84..85 ";"
+          WHITESPACE@85..94 "\n        "
+          METHOD_CALL_EXPR@94..155
+            FIELD_EXPR@94..105
+              PATH_EXPR@94..98
+                PATH@94..98
+                  PATH_SEGMENT@94..98
+                    SELF_KW@94..98 "self"
+              DOT@98..99 "."
+              NAME_REF@99..105
+                IDENT@99..105 "scopes"
+            DOT@105..106 "."
+            NAME_REF@106..110
+              IDENT@106..110 "push"
+            ARG_LIST@110..155
+              L_PAREN@110..111 "("
+              RECORD_LIT@111..154
+                PATH@111..120
+                  PATH_SEGMENT@111..120
+                    NAME_REF@111..120
+                      IDENT@111..120 "ScopeData"
+                WHITESPACE@120..121 " "
+                RECORD_FIELD_LIST@121..154
+                  L_CURLY@121..122 "{"
+                  WHITESPACE@122..123 " "
+                  RECORD_FIELD@123..135
+                    NAME_REF@123..129
+                      IDENT@123..129 "parent"
+                    COLON@129..130 ":"
+                    WHITESPACE@130..131 " "
+                    PATH_EXPR@131..135
+                      PATH@131..135
+                        PATH_SEGMENT@131..135
+                          NAME_REF@131..135
+                            IDENT@131..135 "None"
+                  COMMA@135..136 ","
+                  WHITESPACE@136..137 " "
+                  RECORD_FIELD@137..152
+                    NAME_REF@137..144
+                      IDENT@137..144 "entries"
+                    COLON@144..145 ":"
+                    WHITESPACE@145..146 " "
+                    MACRO_CALL@146..152
+                      PATH@146..149
+                        PATH_SEGMENT@146..149
+                          NAME_REF@146..149
+                            IDENT@146..149 "vec"
+                      BANG@149..150 "!"
+                      TOKEN_TREE@150..152
+                        L_BRACK@150..151 "["
+                        R_BRACK@151..152 "]"
+                  WHITESPACE@152..153 " "
+                  R_CURLY@153..154 "}"
+              R_PAREN@154..155 ")"
+          WHITESPACE@155..160 "\n    "
+          R_CURLY@160..161 "}"
       WHITESPACE@161..167 "\n\n    "
       FN_DEF@167..180
         FN_KW@167..169 "fn"

crates/ra_syntax/test_data/parser/err/0019_let_recover.rast

@@ -9,91 +9,87 @@ SOURCE_FILE@0..139
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..138
-      BLOCK@9..138
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        LET_STMT@15..24
-          LET_KW@15..18 "let"
-          WHITESPACE@18..19 " "
-          BIND_PAT@19..22
-            NAME@19..22
-              IDENT@19..22 "foo"
-          WHITESPACE@22..23 " "
-          EQ@23..24 "="
-        WHITESPACE@24..29 "\n    "
-        LET_STMT@29..41
-          LET_KW@29..32 "let"
-          WHITESPACE@32..33 " "
-          BIND_PAT@33..36
-            NAME@33..36
-              IDENT@33..36 "bar"
-          WHITESPACE@36..37 " "
-          EQ@37..38 "="
-          WHITESPACE@38..39 " "
-          LITERAL@39..40
-            INT_NUMBER@39..40 "1"
-          SEMICOLON@40..41 ";"
-        WHITESPACE@41..46 "\n    "
-        LET_STMT@46..49
-          LET_KW@46..49 "let"
-        WHITESPACE@49..54 "\n    "
-        LET_STMT@54..67
-          LET_KW@54..57 "let"
-          WHITESPACE@57..58 " "
-          BIND_PAT@58..61
-            NAME@58..61
-              IDENT@58..61 "baz"
-          WHITESPACE@61..62 " "
-          EQ@62..63 "="
-          WHITESPACE@63..64 " "
-          LITERAL@64..66
-            INT_NUMBER@64..66 "92"
-          SEMICOLON@66..67 ";"
-        WHITESPACE@67..72 "\n    "
-        LET_STMT@72..75
-          LET_KW@72..75 "let"
-        WHITESPACE@75..80 "\n    "
-        EXPR_STMT@80..90
-          IF_EXPR@80..90
-            IF_KW@80..82 "if"
-            WHITESPACE@82..83 " "
-            CONDITION@83..87
-              LITERAL@83..87
-                TRUE_KW@83..87 "true"
-            WHITESPACE@87..88 " "
-            BLOCK_EXPR@88..90
-              BLOCK@88..90
-                L_CURLY@88..89 "{"
-                R_CURLY@89..90 "}"
-        WHITESPACE@90..95 "\n    "
-        LET_STMT@95..98
-          LET_KW@95..98 "let"
-        WHITESPACE@98..103 "\n    "
-        EXPR_STMT@103..116
-          WHILE_EXPR@103..116
-            WHILE_KW@103..108 "while"
-            WHITESPACE@108..109 " "
-            CONDITION@109..113
-              LITERAL@109..113
-                TRUE_KW@109..113 "true"
-            WHITESPACE@113..114 " "
-            BLOCK_EXPR@114..116
-              BLOCK@114..116
-                L_CURLY@114..115 "{"
-                R_CURLY@115..116 "}"
-        WHITESPACE@116..121 "\n    "
-        LET_STMT@121..124
-          LET_KW@121..124 "let"
-        WHITESPACE@124..129 "\n    "
-        LOOP_EXPR@129..136
-          LOOP_KW@129..133 "loop"
-          WHITESPACE@133..134 " "
-          BLOCK_EXPR@134..136
-            BLOCK@134..136
-              L_CURLY@134..135 "{"
-              R_CURLY@135..136 "}"
-        WHITESPACE@136..137 "\n"
-        R_CURLY@137..138 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      LET_STMT@15..24
+        LET_KW@15..18 "let"
+        WHITESPACE@18..19 " "
+        BIND_PAT@19..22
+          NAME@19..22
+            IDENT@19..22 "foo"
+        WHITESPACE@22..23 " "
+        EQ@23..24 "="
+      WHITESPACE@24..29 "\n    "
+      LET_STMT@29..41
+        LET_KW@29..32 "let"
+        WHITESPACE@32..33 " "
+        BIND_PAT@33..36
+          NAME@33..36
+            IDENT@33..36 "bar"
+        WHITESPACE@36..37 " "
+        EQ@37..38 "="
+        WHITESPACE@38..39 " "
+        LITERAL@39..40
+          INT_NUMBER@39..40 "1"
+        SEMICOLON@40..41 ";"
+      WHITESPACE@41..46 "\n    "
+      LET_STMT@46..49
+        LET_KW@46..49 "let"
+      WHITESPACE@49..54 "\n    "
+      LET_STMT@54..67
+        LET_KW@54..57 "let"
+        WHITESPACE@57..58 " "
+        BIND_PAT@58..61
+          NAME@58..61
+            IDENT@58..61 "baz"
+        WHITESPACE@61..62 " "
+        EQ@62..63 "="
+        WHITESPACE@63..64 " "
+        LITERAL@64..66
+          INT_NUMBER@64..66 "92"
+        SEMICOLON@66..67 ";"
+      WHITESPACE@67..72 "\n    "
+      LET_STMT@72..75
+        LET_KW@72..75 "let"
+      WHITESPACE@75..80 "\n    "
+      EXPR_STMT@80..90
+        IF_EXPR@80..90
+          IF_KW@80..82 "if"
+          WHITESPACE@82..83 " "
+          CONDITION@83..87
+            LITERAL@83..87
+              TRUE_KW@83..87 "true"
+          WHITESPACE@87..88 " "
+          BLOCK_EXPR@88..90
+            L_CURLY@88..89 "{"
+            R_CURLY@89..90 "}"
+      WHITESPACE@90..95 "\n    "
+      LET_STMT@95..98
+        LET_KW@95..98 "let"
+      WHITESPACE@98..103 "\n    "
+      EXPR_STMT@103..116
+        WHILE_EXPR@103..116
+          WHILE_KW@103..108 "while"
+          WHITESPACE@108..109 " "
+          CONDITION@109..113
+            LITERAL@109..113
+              TRUE_KW@109..113 "true"
+          WHITESPACE@113..114 " "
+          BLOCK_EXPR@114..116
+            L_CURLY@114..115 "{"
+            R_CURLY@115..116 "}"
+      WHITESPACE@116..121 "\n    "
+      LET_STMT@121..124
+        LET_KW@121..124 "let"
+      WHITESPACE@124..129 "\n    "
+      LOOP_EXPR@129..136
+        LOOP_KW@129..133 "loop"
+        WHITESPACE@133..134 " "
+        BLOCK_EXPR@134..136
+          L_CURLY@134..135 "{"
+          R_CURLY@135..136 "}"
+      WHITESPACE@136..137 "\n"
+      R_CURLY@137..138 "}"
   WHITESPACE@138..139 "\n"
 error 24..24: expected expression
 error 24..24: expected SEMICOLON

crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast

@@ -12,9 +12,8 @@ SOURCE_FILE@0..16
       R_PAREN@11..12 ")"
     WHITESPACE@12..13 " "
     BLOCK_EXPR@13..15
-      BLOCK@13..15
-        L_CURLY@13..14 "{"
-        R_CURLY@14..15 "}"
+      L_CURLY@13..14 "{"
+      R_CURLY@14..15 "}"
   WHITESPACE@15..16 "\n"
 error 2..2: expected a name
 error 2..2: expected function arguments

crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast

@@ -26,10 +26,9 @@ SOURCE_FILE@0..22
       R_PAREN@16..17 ")"
     WHITESPACE@17..18 " "
     BLOCK_EXPR@18..21
-      BLOCK@18..21
-        L_CURLY@18..19 "{"
-        WHITESPACE@19..20 "\n"
-        R_CURLY@20..21 "}"
+      L_CURLY@18..19 "{"
+      WHITESPACE@19..20 "\n"
+      R_CURLY@20..21 "}"
   WHITESPACE@21..22 "\n"
 error 16..16: expected COLON
 error 16..16: expected type

crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast

@@ -9,37 +9,36 @@ SOURCE_FILE@0..112
       R_PAREN@5..6 ")"
     WHITESPACE@6..7 " "
     BLOCK_EXPR@7..33
-      BLOCK@7..33
-        L_CURLY@7..8 "{"
-        WHITESPACE@8..9 " "
-        EXPR_STMT@9..17
-          ARRAY_EXPR@9..17
-            L_BRACK@9..10 "["
-            LITERAL@10..11
-              INT_NUMBER@10..11 "1"
-            COMMA@11..12 ","
-            WHITESPACE@12..13 " "
-            LITERAL@13..14
-              INT_NUMBER@13..14 "2"
-            COMMA@14..15 ","
-            WHITESPACE@15..16 " "
-            ERROR@16..17
-              AT@16..17 "@"
-        EXPR_STMT@17..18
-          ERROR@17..18
-            COMMA@17..18 ","
-        WHITESPACE@18..19 " "
-        STRUCT_DEF@19..26
-          STRUCT_KW@19..25 "struct"
-          ERROR@25..26
-            COMMA@25..26 ","
-        WHITESPACE@26..27 " "
-        LET_STMT@27..31
-          LET_KW@27..30 "let"
-          ERROR@30..31
-            R_BRACK@30..31 "]"
-        WHITESPACE@31..32 " "
-        R_CURLY@32..33 "}"
+      L_CURLY@7..8 "{"
+      WHITESPACE@8..9 " "
+      EXPR_STMT@9..17
+        ARRAY_EXPR@9..17
+          L_BRACK@9..10 "["
+          LITERAL@10..11
+            INT_NUMBER@10..11 "1"
+          COMMA@11..12 ","
+          WHITESPACE@12..13 " "
+          LITERAL@13..14
+            INT_NUMBER@13..14 "2"
+          COMMA@14..15 ","
+          WHITESPACE@15..16 " "
+          ERROR@16..17
+            AT@16..17 "@"
+      EXPR_STMT@17..18
+        ERROR@17..18
+          COMMA@17..18 ","
+      WHITESPACE@18..19 " "
+      STRUCT_DEF@19..26
+        STRUCT_KW@19..25 "struct"
+        ERROR@25..26
+          COMMA@25..26 ","
+      WHITESPACE@26..27 " "
+      LET_STMT@27..31
+        LET_KW@27..30 "let"
+        ERROR@30..31
+          R_BRACK@30..31 "]"
+      WHITESPACE@31..32 " "
+      R_CURLY@32..33 "}"
   WHITESPACE@33..34 "\n"
   FN_DEF@34..68
     FN_KW@34..36 "fn"
@@ -51,44 +50,43 @@ SOURCE_FILE@0..112
       R_PAREN@39..40 ")"
     WHITESPACE@40..41 " "
     BLOCK_EXPR@41..68
-      BLOCK@41..68
-        L_CURLY@41..42 "{"
-        WHITESPACE@42..43 " "
-        EXPR_STMT@43..54
-          CALL_EXPR@43..54
-            PATH_EXPR@43..46
-              PATH@43..46
-                PATH_SEGMENT@43..46
-                  NAME_REF@43..46
-                    IDENT@43..46 "foo"
-            ARG_LIST@46..54
-              L_PAREN@46..47 "("
-              LITERAL@47..48
-                INT_NUMBER@47..48 "1"
-              COMMA@48..49 ","
-              WHITESPACE@49..50 " "
-              LITERAL@50..51
-                INT_NUMBER@50..51 "2"
-              COMMA@51..52 ","
-              WHITESPACE@52..53 " "
-              ERROR@53..54
-                AT@53..54 "@"
-        EXPR_STMT@54..55
-          ERROR@54..55
-            COMMA@54..55 ","
-        WHITESPACE@55..56 " "
-        IMPL_DEF@56..60
-          IMPL_KW@56..60 "impl"
-        EXPR_STMT@60..61
-          ERROR@60..61
-            COMMA@60..61 ","
-        WHITESPACE@61..62 " "
-        LET_STMT@62..65
-          LET_KW@62..65 "let"
-        ERROR@65..66
-          R_PAREN@65..66 ")"
-        WHITESPACE@66..67 " "
-        R_CURLY@67..68 "}"
+      L_CURLY@41..42 "{"
+      WHITESPACE@42..43 " "
+      EXPR_STMT@43..54
+        CALL_EXPR@43..54
+          PATH_EXPR@43..46
+            PATH@43..46
+              PATH_SEGMENT@43..46
+                NAME_REF@43..46
+                  IDENT@43..46 "foo"
+          ARG_LIST@46..54
+            L_PAREN@46..47 "("
+            LITERAL@47..48
+              INT_NUMBER@47..48 "1"
+            COMMA@48..49 ","
+            WHITESPACE@49..50 " "
+            LITERAL@50..51
+              INT_NUMBER@50..51 "2"
+            COMMA@51..52 ","
+            WHITESPACE@52..53 " "
+            ERROR@53..54
+              AT@53..54 "@"
+      EXPR_STMT@54..55
+        ERROR@54..55
+          COMMA@54..55 ","
+      WHITESPACE@55..56 " "
+      IMPL_DEF@56..60
+        IMPL_KW@56..60 "impl"
+      EXPR_STMT@60..61
+        ERROR@60..61
+          COMMA@60..61 ","
+      WHITESPACE@61..62 " "
+      LET_STMT@62..65
+        LET_KW@62..65 "let"
+      ERROR@65..66
+        R_PAREN@65..66 ")"
+      WHITESPACE@66..67 " "
+      R_CURLY@67..68 "}"
   WHITESPACE@68..69 "\n"
   FN_DEF@69..111
     FN_KW@69..71 "fn"
@@ -100,53 +98,52 @@ SOURCE_FILE@0..112
       R_PAREN@74..75 ")"
     WHITESPACE@75..76 " "
     BLOCK_EXPR@76..111
-      BLOCK@76..111
-        L_CURLY@76..77 "{"
-        WHITESPACE@77..78 " "
-        EXPR_STMT@78..93
-          METHOD_CALL_EXPR@78..93
-            PATH_EXPR@78..81
-              PATH@78..81
-                PATH_SEGMENT@78..81
-                  NAME_REF@78..81
-                    IDENT@78..81 "foo"
-            DOT@81..82 "."
-            NAME_REF@82..85
-              IDENT@82..85 "bar"
-            ARG_LIST@85..93
-              L_PAREN@85..86 "("
-              LITERAL@86..87
-                INT_NUMBER@86..87 "1"
-              COMMA@87..88 ","
-              WHITESPACE@88..89 " "
-              LITERAL@89..90
-                INT_NUMBER@89..90 "2"
-              COMMA@90..91 ","
-              WHITESPACE@91..92 " "
-              ERROR@92..93
-                AT@92..93 "@"
-        EXPR_STMT@93..94
-          ERROR@93..94
-            COMMA@93..94 ","
-        WHITESPACE@94..95 " "
-        EXPR_STMT@95..96
-          ERROR@95..96
-            R_BRACK@95..96 "]"
-        EXPR_STMT@96..97
-          ERROR@96..97
-            COMMA@96..97 ","
-        WHITESPACE@97..98 " "
-        TRAIT_DEF@98..104
-          TRAIT_KW@98..103 "trait"
-          ERROR@103..104
-            COMMA@103..104 ","
-        WHITESPACE@104..105 " "
-        LET_STMT@105..108
-          LET_KW@105..108 "let"
-        ERROR@108..109
-          R_PAREN@108..109 ")"
-        WHITESPACE@109..110 " "
-        R_CURLY@110..111 "}"
+      L_CURLY@76..77 "{"
+      WHITESPACE@77..78 " "
+      EXPR_STMT@78..93
+        METHOD_CALL_EXPR@78..93
+          PATH_EXPR@78..81
+            PATH@78..81
+              PATH_SEGMENT@78..81
+                NAME_REF@78..81
+                  IDENT@78..81 "foo"
+          DOT@81..82 "."
+          NAME_REF@82..85
+            IDENT@82..85 "bar"
+          ARG_LIST@85..93
+            L_PAREN@85..86 "("
+            LITERAL@86..87
+              INT_NUMBER@86..87 "1"
+            COMMA@87..88 ","
+            WHITESPACE@88..89 " "
+            LITERAL@89..90
+              INT_NUMBER@89..90 "2"
+            COMMA@90..91 ","
+            WHITESPACE@91..92 " "
+            ERROR@92..93
+              AT@92..93 "@"
+      EXPR_STMT@93..94
+        ERROR@93..94
+          COMMA@93..94 ","
+      WHITESPACE@94..95 " "
+      EXPR_STMT@95..96
+        ERROR@95..96
+          R_BRACK@95..96 "]"
+      EXPR_STMT@96..97
+        ERROR@96..97
+          COMMA@96..97 ","
+      WHITESPACE@97..98 " "
+      TRAIT_DEF@98..104
+        TRAIT_KW@98..103 "trait"
+        ERROR@103..104
+          COMMA@103..104 ","
+      WHITESPACE@104..105 " "
+      LET_STMT@105..108
+        LET_KW@105..108 "let"
+      ERROR@108..109
+        R_PAREN@108..109 ")"
+      WHITESPACE@109..110 " "
+      R_CURLY@110..111 "}"
   WHITESPACE@111..112 "\n"
 error 16..16: expected expression
 error 17..17: expected R_BRACK

crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast

@@ -9,31 +9,30 @@ SOURCE_FILE@0..94
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..55
-      BLOCK@10..55
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        MACRO_CALL@16..49
-          PATH@16..19
-            PATH_SEGMENT@16..19
-              NAME_REF@16..19
-                IDENT@16..19 "foo"
-          BANG@19..20 "!"
-          WHITESPACE@20..21 " "
-          TOKEN_TREE@21..49
-            L_PAREN@21..22 "("
-            WHITESPACE@22..31 "\n        "
-            IDENT@31..34 "bar"
-            COMMA@34..35 ","
-            WHITESPACE@35..36 " "
-            STRING@36..41 "\"baz\""
-            COMMA@41..42 ","
-            WHITESPACE@42..43 " "
-            INT_NUMBER@43..44 "1"
-            COMMA@44..45 ","
-            WHITESPACE@45..46 " "
-            FLOAT_NUMBER@46..49 "2.0"
-        WHITESPACE@49..54 "\n    "
-        R_CURLY@54..55 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      MACRO_CALL@16..49
+        PATH@16..19
+          PATH_SEGMENT@16..19
+            NAME_REF@16..19
+              IDENT@16..19 "foo"
+        BANG@19..20 "!"
+        WHITESPACE@20..21 " "
+        TOKEN_TREE@21..49
+          L_PAREN@21..22 "("
+          WHITESPACE@22..31 "\n        "
+          IDENT@31..34 "bar"
+          COMMA@34..35 ","
+          WHITESPACE@35..36 " "
+          STRING@36..41 "\"baz\""
+          COMMA@41..42 ","
+          WHITESPACE@42..43 " "
+          INT_NUMBER@43..44 "1"
+          COMMA@44..45 ","
+          WHITESPACE@45..46 " "
+          FLOAT_NUMBER@46..49 "2.0"
+      WHITESPACE@49..54 "\n    "
+      R_CURLY@54..55 "}"
   WHITESPACE@55..56 " "
   COMMENT@56..91 "//~ ERROR incorrect c ..."
   WHITESPACE@91..92 "\n"

crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast

@@ -62,9 +62,8 @@ SOURCE_FILE@0..240
       R_PAREN@49..50 ")"
     WHITESPACE@50..51 " "
     BLOCK_EXPR@51..53
-      BLOCK@51..53
-        L_CURLY@51..52 "{"
-        R_CURLY@52..53 "}"
+      L_CURLY@51..52 "{"
+      R_CURLY@52..53 "}"
   WHITESPACE@53..55 "\n\n"
   FN_DEF@55..239
     FN_KW@55..57 "fn"
@@ -76,219 +75,218 @@ SOURCE_FILE@0..240
       R_PAREN@63..64 ")"
     WHITESPACE@64..65 " "
     BLOCK_EXPR@65..239
-      BLOCK@65..239
-        L_CURLY@65..66 "{"
-        WHITESPACE@66..71 "\n    "
-        LET_STMT@71..121
-          LET_KW@71..74 "let"
-          WHITESPACE@74..75 " "
-          PLACEHOLDER_PAT@75..76
-            UNDERSCORE@75..76 "_"
-          COLON@76..77 ":"
-          WHITESPACE@77..78 " "
-          DYN_TRAIT_TYPE@78..121
-            TYPE_BOUND_LIST@78..121
-              TYPE_BOUND@78..88
-                PATH_TYPE@78..88
-                  PATH@78..88
-                    PATH_SEGMENT@78..88
-                      NAME_REF@78..81
-                        IDENT@78..81 "Box"
-                      TYPE_ARG_LIST@81..88
-                        L_ANGLE@81..82 "<"
-                        TYPE_ARG@82..88
-                          PAREN_TYPE@82..88
-                            L_PAREN@82..83 "("
-                            PATH_TYPE@83..87
-                              PATH@83..87
-                                PATH_SEGMENT@83..87
-                                  NAME_REF@83..87
-                                    IDENT@83..87 "Copy"
-                            R_PAREN@87..88 ")"
-              WHITESPACE@88..89 " "
-              PLUS@89..90 "+"
-              WHITESPACE@90..91 " "
-              TYPE_BOUND@91..99
-                L_PAREN@91..92 "("
-                QUESTION@92..93 "?"
-                PATH_TYPE@93..98
-                  PATH@93..98
-                    PATH_SEGMENT@93..98
-                      NAME_REF@93..98
-                        IDENT@93..98 "Sized"
-                R_PAREN@98..99 ")"
-              WHITESPACE@99..100 " "
-              PLUS@100..101 "+"
-              WHITESPACE@101..102 " "
-              TYPE_BOUND@102..121
-                L_PAREN@102..103 "("
-                FOR_TYPE@103..120
-                  FOR_KW@103..106 "for"
-                  TYPE_PARAM_LIST@106..110
-                    L_ANGLE@106..107 "<"
-                    LIFETIME_PARAM@107..109
-                      LIFETIME@107..109 "\'a"
-                    R_ANGLE@109..110 ">"
-                  WHITESPACE@110..111 " "
-                  PATH_TYPE@111..120
-                    PATH@111..120
-                      PATH_SEGMENT@111..120
-                        NAME_REF@111..116
-                          IDENT@111..116 "Trait"
-                        TYPE_ARG_LIST@116..120
-                          L_ANGLE@116..117 "<"
-                          LIFETIME_ARG@117..119
-                            LIFETIME@117..119 "\'a"
-                          R_ANGLE@119..120 ">"
-                R_PAREN@120..121 ")"
-        EXPR_STMT@121..123
-          ERROR@121..122
-            R_ANGLE@121..122 ">"
-          SEMICOLON@122..123 ";"
-        WHITESPACE@123..128 "\n    "
-        LET_STMT@128..141
-          LET_KW@128..131 "let"
-          WHITESPACE@131..132 " "
-          PLACEHOLDER_PAT@132..133
-            UNDERSCORE@132..133 "_"
-          COLON@133..134 ":"
-          WHITESPACE@134..135 " "
-          PATH_TYPE@135..141
-            PATH@135..141
-              PATH_SEGMENT@135..141
-                NAME_REF@135..138
-                  IDENT@135..138 "Box"
-                TYPE_ARG_LIST@138..141
-                  L_ANGLE@138..139 "<"
-                  TYPE_ARG@139..141
-                    PAREN_TYPE@139..141
-                      L_PAREN@139..140 "("
-                      ERROR@140..141
-                        QUESTION@140..141 "?"
-        EXPR_STMT@141..146
-          PATH_EXPR@141..146
-            PATH@141..146
-              PATH_SEGMENT@141..146
-                NAME_REF@141..146
-                  IDENT@141..146 "Sized"
-        EXPR_STMT@146..147
-          ERROR@146..147
-            R_PAREN@146..147 ")"
-        WHITESPACE@147..148 " "
-        EXPR_STMT@148..149
-          ERROR@148..149
-            PLUS@148..149 "+"
-        WHITESPACE@149..150 " "
-        EXPR_STMT@150..180
-          TUPLE_EXPR@150..180
-            L_PAREN@150..151 "("
-            BIN_EXPR@151..180
-              BIN_EXPR@151..178
-                BIN_EXPR@151..169
-                  BIN_EXPR@151..167
-                    BIN_EXPR@151..164
-                      FOR_EXPR@151..157
-                        FOR_KW@151..154 "for"
-                        ERROR@154..155
-                          L_ANGLE@154..155 "<"
-                        ERROR@155..157
-                          LIFETIME@155..157 "\'a"
-                      R_ANGLE@157..158 ">"
-                      WHITESPACE@158..159 " "
-                      PATH_EXPR@159..164
-                        PATH@159..164
-                          PATH_SEGMENT@159..164
-                            NAME_REF@159..164
-                              IDENT@159..164 "Trait"
-                    L_ANGLE@164..165 "<"
-                    ERROR@165..167
-                      LIFETIME@165..167 "\'a"
-                  R_ANGLE@167..168 ">"
-                  ERROR@168..169
-                    R_PAREN@168..169 ")"
-                WHITESPACE@169..170 " "
-                PLUS@170..171 "+"
-                WHITESPACE@171..172 " "
-                PAREN_EXPR@172..178
-                  L_PAREN@172..173 "("
-                  PATH_EXPR@173..177
-                    PATH@173..177
-                      PATH_SEGMENT@173..177
-                        NAME_REF@173..177
-                          IDENT@173..177 "Copy"
-                  R_PAREN@177..178 ")"
-              R_ANGLE@178..179 ">"
-              ERROR@179..180
-                SEMICOLON@179..180 ";"
-        WHITESPACE@180..185 "\n    "
-        LET_STMT@185..235
-          LET_KW@185..188 "let"
-          WHITESPACE@188..189 " "
-          PLACEHOLDER_PAT@189..190
-            UNDERSCORE@189..190 "_"
-          COLON@190..191 ":"
-          WHITESPACE@191..192 " "
-          DYN_TRAIT_TYPE@192..235
-            TYPE_BOUND_LIST@192..235
-              TYPE_BOUND@192..215
-                PATH_TYPE@192..215
-                  PATH@192..215
-                    PATH_SEGMENT@192..215
-                      NAME_REF@192..195
-                        IDENT@192..195 "Box"
-                      TYPE_ARG_LIST@195..215
-                        L_ANGLE@195..196 "<"
-                        TYPE_ARG@196..215
-                          PAREN_TYPE@196..215
-                            L_PAREN@196..197 "("
-                            FOR_TYPE@197..214
-                              FOR_KW@197..200 "for"
-                              TYPE_PARAM_LIST@200..204
-                                L_ANGLE@200..201 "<"
-                                LIFETIME_PARAM@201..203
-                                  LIFETIME@201..203 "\'a"
-                                R_ANGLE@203..204 ">"
-                              WHITESPACE@204..205 " "
-                              PATH_TYPE@205..214
-                                PATH@205..214
-                                  PATH_SEGMENT@205..214
-                                    NAME_REF@205..210
-                                      IDENT@205..210 "Trait"
-                                    TYPE_ARG_LIST@210..214
-                                      L_ANGLE@210..211 "<"
-                                      LIFETIME_ARG@211..213
-                                        LIFETIME@211..213 "\'a"
-                                      R_ANGLE@213..214 ">"
-                            R_PAREN@214..215 ")"
-              WHITESPACE@215..216 " "
-              PLUS@216..217 "+"
-              WHITESPACE@217..218 " "
-              TYPE_BOUND@218..224
-                L_PAREN@218..219 "("
-                PATH_TYPE@219..223
-                  PATH@219..223
-                    PATH_SEGMENT@219..223
-                      NAME_REF@219..223
-                        IDENT@219..223 "Copy"
-                R_PAREN@223..224 ")"
-              WHITESPACE@224..225 " "
-              PLUS@225..226 "+"
-              WHITESPACE@226..227 " "
-              TYPE_BOUND@227..235
-                L_PAREN@227..228 "("
-                QUESTION@228..229 "?"
-                PATH_TYPE@229..234
-                  PATH@229..234
-                    PATH_SEGMENT@229..234
-                      NAME_REF@229..234
-                        IDENT@229..234 "Sized"
-                R_PAREN@234..235 ")"
-        EXPR_STMT@235..237
-          ERROR@235..236
-            R_ANGLE@235..236 ">"
-          SEMICOLON@236..237 ";"
-        WHITESPACE@237..238 "\n"
-        R_CURLY@238..239 "}"
+      L_CURLY@65..66 "{"
+      WHITESPACE@66..71 "\n    "
+      LET_STMT@71..121
+        LET_KW@71..74 "let"
+        WHITESPACE@74..75 " "
+        PLACEHOLDER_PAT@75..76
+          UNDERSCORE@75..76 "_"
+        COLON@76..77 ":"
+        WHITESPACE@77..78 " "
+        DYN_TRAIT_TYPE@78..121
+          TYPE_BOUND_LIST@78..121
+            TYPE_BOUND@78..88
+              PATH_TYPE@78..88
+                PATH@78..88
+                  PATH_SEGMENT@78..88
+                    NAME_REF@78..81
+                      IDENT@78..81 "Box"
+                    TYPE_ARG_LIST@81..88
+                      L_ANGLE@81..82 "<"
+                      TYPE_ARG@82..88
+                        PAREN_TYPE@82..88
+                          L_PAREN@82..83 "("
+                          PATH_TYPE@83..87
+                            PATH@83..87
+                              PATH_SEGMENT@83..87
+                                NAME_REF@83..87
+                                  IDENT@83..87 "Copy"
+                          R_PAREN@87..88 ")"
+            WHITESPACE@88..89 " "
+            PLUS@89..90 "+"
+            WHITESPACE@90..91 " "
+            TYPE_BOUND@91..99
+              L_PAREN@91..92 "("
+              QUESTION@92..93 "?"
+              PATH_TYPE@93..98
+                PATH@93..98
+                  PATH_SEGMENT@93..98
+                    NAME_REF@93..98
+                      IDENT@93..98 "Sized"
+              R_PAREN@98..99 ")"
+            WHITESPACE@99..100 " "
+            PLUS@100..101 "+"
+            WHITESPACE@101..102 " "
+            TYPE_BOUND@102..121
+              L_PAREN@102..103 "("
+              FOR_TYPE@103..120
+                FOR_KW@103..106 "for"
+                TYPE_PARAM_LIST@106..110
+                  L_ANGLE@106..107 "<"
+                  LIFETIME_PARAM@107..109
+                    LIFETIME@107..109 "\'a"
+                  R_ANGLE@109..110 ">"
+                WHITESPACE@110..111 " "
+                PATH_TYPE@111..120
+                  PATH@111..120
+                    PATH_SEGMENT@111..120
+                      NAME_REF@111..116
+                        IDENT@111..116 "Trait"
+                      TYPE_ARG_LIST@116..120
+                        L_ANGLE@116..117 "<"
+                        LIFETIME_ARG@117..119
+                          LIFETIME@117..119 "\'a"
+                        R_ANGLE@119..120 ">"
+              R_PAREN@120..121 ")"
+      EXPR_STMT@121..123
+        ERROR@121..122
+          R_ANGLE@121..122 ">"
+        SEMICOLON@122..123 ";"
+      WHITESPACE@123..128 "\n    "
+      LET_STMT@128..141
+        LET_KW@128..131 "let"
+        WHITESPACE@131..132 " "
+        PLACEHOLDER_PAT@132..133
+          UNDERSCORE@132..133 "_"
+        COLON@133..134 ":"
+        WHITESPACE@134..135 " "
+        PATH_TYPE@135..141
+          PATH@135..141
+            PATH_SEGMENT@135..141
+              NAME_REF@135..138
+                IDENT@135..138 "Box"
+              TYPE_ARG_LIST@138..141
+                L_ANGLE@138..139 "<"
+                TYPE_ARG@139..141
+                  PAREN_TYPE@139..141
+                    L_PAREN@139..140 "("
+                    ERROR@140..141
+                      QUESTION@140..141 "?"
+      EXPR_STMT@141..146
+        PATH_EXPR@141..146
+          PATH@141..146
+            PATH_SEGMENT@141..146
+              NAME_REF@141..146
+                IDENT@141..146 "Sized"
+      EXPR_STMT@146..147
+        ERROR@146..147
+          R_PAREN@146..147 ")"
+      WHITESPACE@147..148 " "
+      EXPR_STMT@148..149
+        ERROR@148..149
+          PLUS@148..149 "+"
+      WHITESPACE@149..150 " "
+      EXPR_STMT@150..180
+        TUPLE_EXPR@150..180
+          L_PAREN@150..151 "("
+          BIN_EXPR@151..180
+            BIN_EXPR@151..178
+              BIN_EXPR@151..169
+                BIN_EXPR@151..167
+                  BIN_EXPR@151..164
+                    FOR_EXPR@151..157
+                      FOR_KW@151..154 "for"
+                      ERROR@154..155
+                        L_ANGLE@154..155 "<"
+                      ERROR@155..157
+                        LIFETIME@155..157 "\'a"
+                    R_ANGLE@157..158 ">"
+                    WHITESPACE@158..159 " "
+                    PATH_EXPR@159..164
+                      PATH@159..164
+                        PATH_SEGMENT@159..164
+                          NAME_REF@159..164
+                            IDENT@159..164 "Trait"
+                  L_ANGLE@164..165 "<"
+                  ERROR@165..167
+                    LIFETIME@165..167 "\'a"
+                R_ANGLE@167..168 ">"
+                ERROR@168..169
+                  R_PAREN@168..169 ")"
+              WHITESPACE@169..170 " "
+              PLUS@170..171 "+"
+              WHITESPACE@171..172 " "
+              PAREN_EXPR@172..178
+                L_PAREN@172..173 "("
+                PATH_EXPR@173..177
+                  PATH@173..177
+                    PATH_SEGMENT@173..177
+                      NAME_REF@173..177
+                        IDENT@173..177 "Copy"
+                R_PAREN@177..178 ")"
+            R_ANGLE@178..179 ">"
+            ERROR@179..180
+              SEMICOLON@179..180 ";"
+      WHITESPACE@180..185 "\n    "
+      LET_STMT@185..235
+        LET_KW@185..188 "let"
+        WHITESPACE@188..189 " "
+        PLACEHOLDER_PAT@189..190
+          UNDERSCORE@189..190 "_"
+        COLON@190..191 ":"
+        WHITESPACE@191..192 " "
+        DYN_TRAIT_TYPE@192..235
+          TYPE_BOUND_LIST@192..235
+            TYPE_BOUND@192..215
+              PATH_TYPE@192..215
+                PATH@192..215
+                  PATH_SEGMENT@192..215
+                    NAME_REF@192..195
+                      IDENT@192..195 "Box"
+                    TYPE_ARG_LIST@195..215
+                      L_ANGLE@195..196 "<"
+                      TYPE_ARG@196..215
+                        PAREN_TYPE@196..215
+                          L_PAREN@196..197 "("
+                          FOR_TYPE@197..214
+                            FOR_KW@197..200 "for"
+                            TYPE_PARAM_LIST@200..204
+                              L_ANGLE@200..201 "<"
+                              LIFETIME_PARAM@201..203
+                                LIFETIME@201..203 "\'a"
+                              R_ANGLE@203..204 ">"
+                            WHITESPACE@204..205 " "
+                            PATH_TYPE@205..214
+                              PATH@205..214
+                                PATH_SEGMENT@205..214
+                                  NAME_REF@205..210
+                                    IDENT@205..210 "Trait"
+                                  TYPE_ARG_LIST@210..214
+                                    L_ANGLE@210..211 "<"
+                                    LIFETIME_ARG@211..213
+                                      LIFETIME@211..213 "\'a"
+                                    R_ANGLE@213..214 ">"
+                          R_PAREN@214..215 ")"
+            WHITESPACE@215..216 " "
+            PLUS@216..217 "+"
+            WHITESPACE@217..218 " "
+            TYPE_BOUND@218..224
+              L_PAREN@218..219 "("
+              PATH_TYPE@219..223
+                PATH@219..223
+                  PATH_SEGMENT@219..223
+                    NAME_REF@219..223
+                      IDENT@219..223 "Copy"
+              R_PAREN@223..224 ")"
+            WHITESPACE@224..225 " "
+            PLUS@225..226 "+"
+            WHITESPACE@226..227 " "
+            TYPE_BOUND@227..235
+              L_PAREN@227..228 "("
+              QUESTION@228..229 "?"
+              PATH_TYPE@229..234
+                PATH@229..234
+                  PATH_SEGMENT@229..234
+                    NAME_REF@229..234
+                      IDENT@229..234 "Sized"
+              R_PAREN@234..235 ")"
+      EXPR_STMT@235..237
+        ERROR@235..236
+          R_ANGLE@235..236 ">"
+        SEMICOLON@236..237 ";"
+      WHITESPACE@237..238 "\n"
+      R_CURLY@238..239 "}"
   WHITESPACE@239..240 "\n"
 error 88..88: expected COMMA
 error 88..88: expected R_ANGLE

crates/ra_syntax/test_data/parser/err/0025_nope.rast

@@ -9,187 +9,185 @@ SOURCE_FILE@0..575
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..574
-      BLOCK@10..574
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        ENUM_DEF@16..152
-          ENUM_KW@16..20 "enum"
-          WHITESPACE@20..21 " "
-          NAME@21..25
-            IDENT@21..25 "Test"
-          WHITESPACE@25..26 " "
-          ENUM_VARIANT_LIST@26..152
-            L_CURLY@26..27 "{"
-            WHITESPACE@27..36 "\n        "
-            ENUM_VARIANT@36..40
-              NAME@36..40
-                IDENT@36..40 "Var1"
-            COMMA@40..41 ","
-            WHITESPACE@41..50 "\n        "
-            ENUM_VARIANT@50..62
-              NAME@50..54
-                IDENT@50..54 "Var2"
-              TUPLE_FIELD_DEF_LIST@54..62
-                L_PAREN@54..55 "("
-                TUPLE_FIELD_DEF@55..61
-                  PATH_TYPE@55..61
-                    PATH@55..61
-                      PATH_SEGMENT@55..61
-                        NAME_REF@55..61
-                          IDENT@55..61 "String"
-                R_PAREN@61..62 ")"
-            COMMA@62..63 ","
-            WHITESPACE@63..72 "\n        "
-            ENUM_VARIANT@72..145
-              NAME@72..76
-                IDENT@72..76 "Var3"
-              WHITESPACE@76..77 " "
-              RECORD_FIELD_DEF_LIST@77..145
-                L_CURLY@77..78 "{"
-                WHITESPACE@78..91 "\n            "
-                RECORD_FIELD_DEF@91..95
-                  NAME@91..94
-                    IDENT@91..94 "abc"
-                  COLON@94..95 ":"
-                WHITESPACE@95..96 " "
-                ERROR@96..98
-                  L_CURLY@96..97 "{"
-                  R_CURLY@97..98 "}"
-                ERROR@98..99
-                  COMMA@98..99 ","
-                WHITESPACE@99..100 " "
-                COMMENT@100..135 "//~ ERROR: expected t ..."
-                WHITESPACE@135..144 "\n        "
-                R_CURLY@144..145 "}"
-            COMMA@145..146 ","
-            WHITESPACE@146..151 "\n    "
-            R_CURLY@151..152 "}"
-        WHITESPACE@152..158 "\n\n    "
-        COMMENT@158..171 "// recover..."
-        WHITESPACE@171..176 "\n    "
-        LET_STMT@176..186
-          LET_KW@176..179 "let"
-          WHITESPACE@179..180 " "
-          BIND_PAT@180..181
-            NAME@180..181
-              IDENT@180..181 "a"
-          WHITESPACE@181..182 " "
-          EQ@182..183 "="
-          WHITESPACE@183..184 " "
-          LITERAL@184..185
-            INT_NUMBER@184..185 "1"
-          SEMICOLON@185..186 ";"
-        WHITESPACE@186..191 "\n    "
-        ENUM_DEF@191..223
-          ENUM_KW@191..195 "enum"
-          WHITESPACE@195..196 " "
-          NAME@196..201
-            IDENT@196..201 "Test2"
-          WHITESPACE@201..202 " "
-          ENUM_VARIANT_LIST@202..223
-            L_CURLY@202..203 "{"
-            WHITESPACE@203..212 "\n        "
-            ENUM_VARIANT@212..216
-              NAME@212..216
-                IDENT@212..216 "Fine"
-            COMMA@216..217 ","
-            WHITESPACE@217..222 "\n    "
-            R_CURLY@222..223 "}"
-        WHITESPACE@223..229 "\n\n    "
-        ENUM_DEF@229..300
-          ENUM_KW@229..233 "enum"
-          WHITESPACE@233..234 " "
-          NAME@234..239
-            IDENT@234..239 "Test3"
-          WHITESPACE@239..240 " "
-          ENUM_VARIANT_LIST@240..300
-            L_CURLY@240..241 "{"
-            WHITESPACE@241..250 "\n        "
-            ENUM_VARIANT@250..293
-              NAME@250..259
-                IDENT@250..259 "StillFine"
-              WHITESPACE@259..260 " "
-              RECORD_FIELD_DEF_LIST@260..293
-                L_CURLY@260..261 "{"
-                WHITESPACE@261..274 "\n            "
-                RECORD_FIELD_DEF@274..282
-                  NAME@274..277
-                    IDENT@274..277 "def"
-                  COLON@277..278 ":"
-                  WHITESPACE@278..279 " "
-                  PATH_TYPE@279..282
-                    PATH@279..282
-                      PATH_SEGMENT@279..282
-                        NAME_REF@279..282
-                          IDENT@279..282 "i32"
-                COMMA@282..283 ","
-                WHITESPACE@283..292 "\n        "
-                R_CURLY@292..293 "}"
-            COMMA@293..294 ","
-            WHITESPACE@294..299 "\n    "
-            R_CURLY@299..300 "}"
-        WHITESPACE@300..306 "\n\n    "
-        EXPR_STMT@306..459
-          BLOCK_EXPR@306..459
-            BLOCK@306..459
-              L_CURLY@306..307 "{"
-              WHITESPACE@307..316 "\n        "
-              ENUM_DEF@316..453
-                COMMENT@316..329 "// fail again"
-                WHITESPACE@329..338 "\n        "
-                ENUM_KW@338..342 "enum"
-                WHITESPACE@342..343 " "
-                NAME@343..348
-                  IDENT@343..348 "Test4"
-                WHITESPACE@348..349 " "
-                ENUM_VARIANT_LIST@349..453
-                  L_CURLY@349..350 "{"
-                  WHITESPACE@350..363 "\n            "
-                  ENUM_VARIANT@363..372
-                    NAME@363..367
-                      IDENT@363..367 "Nope"
-                    TUPLE_FIELD_DEF_LIST@367..372
-                      L_PAREN@367..368 "("
-                      TUPLE_FIELD_DEF@368..371
-                        PATH_TYPE@368..371
-                          PATH@368..371
-                            PATH_SEGMENT@368..371
-                              NAME_REF@368..371
-                                IDENT@368..371 "i32"
-                      WHITESPACE@371..372 " "
-                      ERROR@372..372
-                  ERROR@372..374
-                    L_CURLY@372..373 "{"
-                    R_CURLY@373..374 "}"
-                  ERROR@374..375
-                    R_PAREN@374..375 ")"
-                  WHITESPACE@375..376 " "
-                  COMMENT@376..396 "//~ ERROR: found `{`"
-                  WHITESPACE@396..422 "\n                     ..."
-                  COMMENT@422..443 "//~^ ERROR: found `{`"
-                  WHITESPACE@443..452 "\n        "
-                  R_CURLY@452..453 "}"
-              WHITESPACE@453..458 "\n    "
-              R_CURLY@458..459 "}"
-        WHITESPACE@459..464 "\n    "
-        COMMENT@464..486 "// still recover later"
-        WHITESPACE@486..491 "\n    "
-        LET_STMT@491..510
-          LET_KW@491..494 "let"
-          WHITESPACE@494..495 " "
-          BIND_PAT@495..505
-            NAME@495..505
-              IDENT@495..505 "bad_syntax"
-          WHITESPACE@505..506 " "
-          EQ@506..507 "="
-          WHITESPACE@507..508 " "
-          ERROR@508..509
-            UNDERSCORE@508..509 "_"
-          SEMICOLON@509..510 ";"
-        WHITESPACE@510..511 " "
-        COMMENT@511..572 "//~ ERROR: expected e ..."
-        WHITESPACE@572..573 "\n"
-        R_CURLY@573..574 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      ENUM_DEF@16..152
+        ENUM_KW@16..20 "enum"
+        WHITESPACE@20..21 " "
+        NAME@21..25
+          IDENT@21..25 "Test"
+        WHITESPACE@25..26 " "
+        ENUM_VARIANT_LIST@26..152
+          L_CURLY@26..27 "{"
+          WHITESPACE@27..36 "\n        "
+          ENUM_VARIANT@36..40
+            NAME@36..40
+              IDENT@36..40 "Var1"
+          COMMA@40..41 ","
+          WHITESPACE@41..50 "\n        "
+          ENUM_VARIANT@50..62
+            NAME@50..54
+              IDENT@50..54 "Var2"
+            TUPLE_FIELD_DEF_LIST@54..62
+              L_PAREN@54..55 "("
+              TUPLE_FIELD_DEF@55..61
+                PATH_TYPE@55..61
+                  PATH@55..61
+                    PATH_SEGMENT@55..61
+                      NAME_REF@55..61
+                        IDENT@55..61 "String"
+              R_PAREN@61..62 ")"
+          COMMA@62..63 ","
+          WHITESPACE@63..72 "\n        "
+          ENUM_VARIANT@72..145
+            NAME@72..76
+              IDENT@72..76 "Var3"
+            WHITESPACE@76..77 " "
+            RECORD_FIELD_DEF_LIST@77..145
+              L_CURLY@77..78 "{"
+              WHITESPACE@78..91 "\n            "
+              RECORD_FIELD_DEF@91..95
+                NAME@91..94
+                  IDENT@91..94 "abc"
+                COLON@94..95 ":"
+              WHITESPACE@95..96 " "
+              ERROR@96..98
+                L_CURLY@96..97 "{"
+                R_CURLY@97..98 "}"
+              ERROR@98..99
+                COMMA@98..99 ","
+              WHITESPACE@99..100 " "
+              COMMENT@100..135 "//~ ERROR: expected t ..."
+              WHITESPACE@135..144 "\n        "
+              R_CURLY@144..145 "}"
+          COMMA@145..146 ","
+          WHITESPACE@146..151 "\n    "
+          R_CURLY@151..152 "}"
+      WHITESPACE@152..158 "\n\n    "
+      COMMENT@158..171 "// recover..."
+      WHITESPACE@171..176 "\n    "
+      LET_STMT@176..186
+        LET_KW@176..179 "let"
+        WHITESPACE@179..180 " "
+        BIND_PAT@180..181
+          NAME@180..181
+            IDENT@180..181 "a"
+        WHITESPACE@181..182 " "
+        EQ@182..183 "="
+        WHITESPACE@183..184 " "
+        LITERAL@184..185
+          INT_NUMBER@184..185 "1"
+        SEMICOLON@185..186 ";"
+      WHITESPACE@186..191 "\n    "
+      ENUM_DEF@191..223
+        ENUM_KW@191..195 "enum"
+        WHITESPACE@195..196 " "
+        NAME@196..201
+          IDENT@196..201 "Test2"
+        WHITESPACE@201..202 " "
+        ENUM_VARIANT_LIST@202..223
+          L_CURLY@202..203 "{"
+          WHITESPACE@203..212 "\n        "
+          ENUM_VARIANT@212..216
+            NAME@212..216
+              IDENT@212..216 "Fine"
+          COMMA@216..217 ","
+          WHITESPACE@217..222 "\n    "
+          R_CURLY@222..223 "}"
+      WHITESPACE@223..229 "\n\n    "
+      ENUM_DEF@229..300
+        ENUM_KW@229..233 "enum"
+        WHITESPACE@233..234 " "
+        NAME@234..239
+          IDENT@234..239 "Test3"
+        WHITESPACE@239..240 " "
+        ENUM_VARIANT_LIST@240..300
+          L_CURLY@240..241 "{"
+          WHITESPACE@241..250 "\n        "
+          ENUM_VARIANT@250..293
+            NAME@250..259
+              IDENT@250..259 "StillFine"
+            WHITESPACE@259..260 " "
+            RECORD_FIELD_DEF_LIST@260..293
+              L_CURLY@260..261 "{"
+              WHITESPACE@261..274 "\n            "
+              RECORD_FIELD_DEF@274..282
+                NAME@274..277
+                  IDENT@274..277 "def"
+                COLON@277..278 ":"
+                WHITESPACE@278..279 " "
+                PATH_TYPE@279..282
+                  PATH@279..282
+                    PATH_SEGMENT@279..282
+                      NAME_REF@279..282
+                        IDENT@279..282 "i32"
+              COMMA@282..283 ","
+              WHITESPACE@283..292 "\n        "
+              R_CURLY@292..293 "}"
+          COMMA@293..294 ","
+          WHITESPACE@294..299 "\n    "
+          R_CURLY@299..300 "}"
+      WHITESPACE@300..306 "\n\n    "
+      EXPR_STMT@306..459
+        BLOCK_EXPR@306..459
+          L_CURLY@306..307 "{"
+          WHITESPACE@307..316 "\n        "
+          ENUM_DEF@316..453
+            COMMENT@316..329 "// fail again"
+            WHITESPACE@329..338 "\n        "
+            ENUM_KW@338..342 "enum"
+            WHITESPACE@342..343 " "
+            NAME@343..348
+              IDENT@343..348 "Test4"
+            WHITESPACE@348..349 " "
+            ENUM_VARIANT_LIST@349..453
+              L_CURLY@349..350 "{"
+              WHITESPACE@350..363 "\n            "
+              ENUM_VARIANT@363..372
+                NAME@363..367
+                  IDENT@363..367 "Nope"
+                TUPLE_FIELD_DEF_LIST@367..372
+                  L_PAREN@367..368 "("
+                  TUPLE_FIELD_DEF@368..371
+                    PATH_TYPE@368..371
+                      PATH@368..371
+                        PATH_SEGMENT@368..371
+                          NAME_REF@368..371
+                            IDENT@368..371 "i32"
+                  WHITESPACE@371..372 " "
+                  ERROR@372..372
+              ERROR@372..374
+                L_CURLY@372..373 "{"
+                R_CURLY@373..374 "}"
+              ERROR@374..375
+                R_PAREN@374..375 ")"
+              WHITESPACE@375..376 " "
+              COMMENT@376..396 "//~ ERROR: found `{`"
+              WHITESPACE@396..422 "\n                     ..."
+              COMMENT@422..443 "//~^ ERROR: found `{`"
+              WHITESPACE@443..452 "\n        "
+              R_CURLY@452..453 "}"
+          WHITESPACE@453..458 "\n    "
+          R_CURLY@458..459 "}"
+      WHITESPACE@459..464 "\n    "
+      COMMENT@464..486 "// still recover later"
+      WHITESPACE@486..491 "\n    "
+      LET_STMT@491..510
+        LET_KW@491..494 "let"
+        WHITESPACE@494..495 " "
+        BIND_PAT@495..505
+          NAME@495..505
+            IDENT@495..505 "bad_syntax"
+        WHITESPACE@505..506 " "
+        EQ@506..507 "="
+        WHITESPACE@507..508 " "
+        ERROR@508..509
+          UNDERSCORE@508..509 "_"
+        SEMICOLON@509..510 ";"
+      WHITESPACE@510..511 " "
+      COMMENT@511..572 "//~ ERROR: expected e ..."
+      WHITESPACE@572..573 "\n"
+      R_CURLY@573..574 "}"
   WHITESPACE@574..575 "\n"
 error 95..95: expected type
 error 95..95: expected COMMA

crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast

@@ -21,9 +21,8 @@ SOURCE_FILE@0..30
             R_ANGLE@25..26 ">"
     WHITESPACE@26..27 "\n"
     BLOCK_EXPR@27..29
-      BLOCK@27..29
-        L_CURLY@27..28 "{"
-        R_CURLY@28..29 "}"
+      L_CURLY@27..28 "{"
+      R_CURLY@28..29 "}"
   WHITESPACE@29..30 "\n"
 error 26..26: expected a path
 error 26..26: expected colon

crates/ra_syntax/test_data/parser/err/0029_field_completion.rast

@@ -20,17 +20,16 @@ SOURCE_FILE@0..24
       R_PAREN@11..12 ")"
     WHITESPACE@12..13 " "
     BLOCK_EXPR@13..23
-      BLOCK@13..23
-        L_CURLY@13..14 "{"
-        WHITESPACE@14..19 "\n    "
-        FIELD_EXPR@19..21
-          PATH_EXPR@19..20
-            PATH@19..20
-              PATH_SEGMENT@19..20
-                NAME_REF@19..20
-                  IDENT@19..20 "a"
-          DOT@20..21 "."
-        WHITESPACE@21..22 "\n"
-        R_CURLY@22..23 "}"
+      L_CURLY@13..14 "{"
+      WHITESPACE@14..19 "\n    "
+      FIELD_EXPR@19..21
+        PATH_EXPR@19..20
+          PATH@19..20
+            PATH_SEGMENT@19..20
+              NAME_REF@19..20
+                IDENT@19..20 "a"
+        DOT@20..21 "."
+      WHITESPACE@21..22 "\n"
+      R_CURLY@22..23 "}"
   WHITESPACE@23..24 "\n"
 error 21..21: expected field name or number

crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast

@@ -9,115 +9,111 @@ SOURCE_FILE@0..350
       R_PAREN@9..10 ")"
     WHITESPACE@10..11 " "
     BLOCK_EXPR@11..349
-      BLOCK@11..349
-        L_CURLY@11..12 "{"
-        WHITESPACE@12..17 "\n    "
-        LET_STMT@17..129
-          LET_KW@17..20 "let"
-          WHITESPACE@20..21 " "
-          BIND_PAT@21..26
-            NAME@21..26
-              IDENT@21..26 "inner"
-          WHITESPACE@26..27 " "
-          EQ@27..28 "="
-          WHITESPACE@28..29 " "
-          BLOCK_EXPR@29..128
-            BLOCK@29..128
-              L_CURLY@29..30 "{"
-              WHITESPACE@30..39 "\n        "
-              ATTR@39..83
-                POUND@39..40 "#"
-                BANG@40..41 "!"
-                L_BRACK@41..42 "["
-                PATH@42..45
-                  PATH_SEGMENT@42..45
-                    NAME_REF@42..45
-                      IDENT@42..45 "doc"
-                TOKEN_TREE@45..82
-                  L_PAREN@45..46 "("
-                  STRING@46..81 "\"Inner attributes not ..."
-                  R_PAREN@81..82 ")"
-                R_BRACK@82..83 "]"
-              WHITESPACE@83..92 "\n        "
-              COMMENT@92..122 "//! Nor are ModuleDoc ..."
-              WHITESPACE@122..127 "\n    "
-              R_CURLY@127..128 "}"
-          SEMICOLON@128..129 ";"
-        WHITESPACE@129..134 "\n    "
-        EXPR_STMT@134..257
-          IF_EXPR@134..257
-            IF_KW@134..136 "if"
-            WHITESPACE@136..137 " "
-            CONDITION@137..141
-              LITERAL@137..141
-                TRUE_KW@137..141 "true"
-            WHITESPACE@141..142 " "
-            BLOCK_EXPR@142..257
-              BLOCK@142..257
-                L_CURLY@142..143 "{"
-                WHITESPACE@143..152 "\n        "
-                ATTR@152..171
-                  POUND@152..153 "#"
-                  BANG@153..154 "!"
-                  L_BRACK@154..155 "["
-                  PATH@155..158
-                    PATH_SEGMENT@155..158
-                      NAME_REF@155..158
-                        IDENT@155..158 "doc"
-                  TOKEN_TREE@158..170
-                    L_PAREN@158..159 "("
-                    STRING@159..169 "\"Nor here\""
-                    R_PAREN@169..170 ")"
-                  R_BRACK@170..171 "]"
-                WHITESPACE@171..180 "\n        "
-                ATTR@180..212
-                  POUND@180..181 "#"
-                  BANG@181..182 "!"
-                  L_BRACK@182..183 "["
-                  PATH@183..186
-                    PATH_SEGMENT@183..186
-                      NAME_REF@183..186
-                        IDENT@183..186 "doc"
-                  TOKEN_TREE@186..211
-                    L_PAREN@186..187 "("
-                    STRING@187..210 "\"We error on each attr\""
-                    R_PAREN@210..211 ")"
-                  R_BRACK@211..212 "]"
-                WHITESPACE@212..221 "\n        "
-                COMMENT@221..251 "//! Nor are ModuleDoc ..."
-                WHITESPACE@251..256 "\n    "
-                R_CURLY@256..257 "}"
-        WHITESPACE@257..262 "\n    "
-        WHILE_EXPR@262..347
-          WHILE_KW@262..267 "while"
-          WHITESPACE@267..268 " "
-          CONDITION@268..272
-            LITERAL@268..272
-              TRUE_KW@268..272 "true"
-          WHITESPACE@272..273 " "
-          BLOCK_EXPR@273..347
-            BLOCK@273..347
-              L_CURLY@273..274 "{"
-              WHITESPACE@274..283 "\n        "
-              ATTR@283..302
-                POUND@283..284 "#"
-                BANG@284..285 "!"
-                L_BRACK@285..286 "["
-                PATH@286..289
-                  PATH_SEGMENT@286..289
-                    NAME_REF@286..289
-                      IDENT@286..289 "doc"
-                TOKEN_TREE@289..301
-                  L_PAREN@289..290 "("
-                  STRING@290..300 "\"Nor here\""
-                  R_PAREN@300..301 ")"
-                R_BRACK@301..302 "]"
-              WHITESPACE@302..311 "\n        "
-              COMMENT@311..341 "//! Nor are ModuleDoc ..."
-              WHITESPACE@341..346 "\n    "
-              R_CURLY@346..347 "}"
-        WHITESPACE@347..348 "\n"
-        R_CURLY@348..349 "}"
+      L_CURLY@11..12 "{"
+      WHITESPACE@12..17 "\n    "
+      LET_STMT@17..129
+        LET_KW@17..20 "let"
+        WHITESPACE@20..21 " "
+        BIND_PAT@21..26
+          NAME@21..26
+            IDENT@21..26 "inner"
+        WHITESPACE@26..27 " "
+        EQ@27..28 "="
+        WHITESPACE@28..29 " "
+        BLOCK_EXPR@29..128
+          L_CURLY@29..30 "{"
+          WHITESPACE@30..39 "\n        "
+          ATTR@39..83
+            POUND@39..40 "#"
+            BANG@40..41 "!"
+            L_BRACK@41..42 "["
+            PATH@42..45
+              PATH_SEGMENT@42..45
+                NAME_REF@42..45
+                  IDENT@42..45 "doc"
+            TOKEN_TREE@45..82
+              L_PAREN@45..46 "("
+              STRING@46..81 "\"Inner attributes not ..."
+              R_PAREN@81..82 ")"
+            R_BRACK@82..83 "]"
+          WHITESPACE@83..92 "\n        "
+          COMMENT@92..122 "//! Nor are ModuleDoc ..."
+          WHITESPACE@122..127 "\n    "
+          R_CURLY@127..128 "}"
+        SEMICOLON@128..129 ";"
+      WHITESPACE@129..134 "\n    "
+      EXPR_STMT@134..257
+        IF_EXPR@134..257
+          IF_KW@134..136 "if"
+          WHITESPACE@136..137 " "
+          CONDITION@137..141
+            LITERAL@137..141
+              TRUE_KW@137..141 "true"
+          WHITESPACE@141..142 " "
+          BLOCK_EXPR@142..257
+            L_CURLY@142..143 "{"
+            WHITESPACE@143..152 "\n        "
+            ATTR@152..171
+              POUND@152..153 "#"
+              BANG@153..154 "!"
+              L_BRACK@154..155 "["
+              PATH@155..158
+                PATH_SEGMENT@155..158
+                  NAME_REF@155..158
+                    IDENT@155..158 "doc"
+              TOKEN_TREE@158..170
+                L_PAREN@158..159 "("
+                STRING@159..169 "\"Nor here\""
+                R_PAREN@169..170 ")"
+              R_BRACK@170..171 "]"
+            WHITESPACE@171..180 "\n        "
+            ATTR@180..212
+              POUND@180..181 "#"
+              BANG@181..182 "!"
+              L_BRACK@182..183 "["
+              PATH@183..186
+                PATH_SEGMENT@183..186
+                  NAME_REF@183..186
+                    IDENT@183..186 "doc"
+              TOKEN_TREE@186..211
+                L_PAREN@186..187 "("
+                STRING@187..210 "\"We error on each attr\""
+                R_PAREN@210..211 ")"
+              R_BRACK@211..212 "]"
+            WHITESPACE@212..221 "\n        "
+            COMMENT@221..251 "//! Nor are ModuleDoc ..."
+            WHITESPACE@251..256 "\n    "
+            R_CURLY@256..257 "}"
+      WHITESPACE@257..262 "\n    "
+      WHILE_EXPR@262..347
+        WHILE_KW@262..267 "while"
+        WHITESPACE@267..268 " "
+        CONDITION@268..272
+          LITERAL@268..272
+            TRUE_KW@268..272 "true"
+        WHITESPACE@272..273 " "
+        BLOCK_EXPR@273..347
+          L_CURLY@273..274 "{"
+          WHITESPACE@274..283 "\n        "
+          ATTR@283..302
+            POUND@283..284 "#"
+            BANG@284..285 "!"
+            L_BRACK@285..286 "["
+            PATH@286..289
+              PATH_SEGMENT@286..289
+                NAME_REF@286..289
+                  IDENT@286..289 "doc"
+            TOKEN_TREE@289..301
+              L_PAREN@289..290 "("
+              STRING@290..300 "\"Nor here\""
+              R_PAREN@300..301 ")"
+            R_BRACK@301..302 "]"
+          WHITESPACE@302..311 "\n        "
+          COMMENT@311..341 "//! Nor are ModuleDoc ..."
+          WHITESPACE@341..346 "\n    "
+          R_CURLY@346..347 "}"
+      WHITESPACE@347..348 "\n"
+      R_CURLY@348..349 "}"
   WHITESPACE@349..350 "\n"
 error 39..83: A block in this position cannot accept inner attributes
 error 152..171: A block in this position cannot accept inner attributes

crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast

@@ -9,187 +9,186 @@ SOURCE_FILE@0..293
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..292
-      BLOCK@9..292
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..101
-          MATCH_EXPR@15..101
-            MATCH_KW@15..20 "match"
-            WHITESPACE@20..21 " "
-            TUPLE_EXPR@21..23
-              L_PAREN@21..22 "("
-              R_PAREN@22..23 ")"
-            WHITESPACE@23..24 " "
-            MATCH_ARM_LIST@24..101
-              L_CURLY@24..25 "{"
-              WHITESPACE@25..34 "\n        "
-              MATCH_ARM@34..41
-                PLACEHOLDER_PAT@34..35
-                  UNDERSCORE@34..35 "_"
-                WHITESPACE@35..36 " "
-                FAT_ARROW@36..38 "=>"
-                WHITESPACE@38..39 " "
-                TUPLE_EXPR@39..41
-                  L_PAREN@39..40 "("
-                  R_PAREN@40..41 ")"
-              COMMA@41..42 ","
-              WHITESPACE@42..51 "\n        "
-              MATCH_ARM@51..78
-                ATTR@51..52
-                  POUND@51..52 "#"
-                ERROR@52..53
-                  BANG@52..53 "!"
-                ARRAY_EXPR@53..78
-                  L_BRACK@53..54 "["
-                  CALL_EXPR@54..77
-                    PATH_EXPR@54..57
-                      PATH@54..57
-                        PATH_SEGMENT@54..57
-                          NAME_REF@54..57
-                            IDENT@54..57 "doc"
-                    ARG_LIST@57..77
-                      L_PAREN@57..58 "("
-                      LITERAL@58..76
-                        STRING@58..76 "\"Not allowed here\""
-                      R_PAREN@76..77 ")"
-                  R_BRACK@77..78 "]"
-              WHITESPACE@78..87 "\n        "
-              MATCH_ARM@87..94
-                PLACEHOLDER_PAT@87..88
-                  UNDERSCORE@87..88 "_"
-                WHITESPACE@88..89 " "
-                FAT_ARROW@89..91 "=>"
-                WHITESPACE@91..92 " "
-                TUPLE_EXPR@92..94
-                  L_PAREN@92..93 "("
-                  R_PAREN@93..94 ")"
-              COMMA@94..95 ","
-              WHITESPACE@95..100 "\n    "
-              R_CURLY@100..101 "}"
-        WHITESPACE@101..107 "\n\n    "
-        EXPR_STMT@107..185
-          MATCH_EXPR@107..185
-            MATCH_KW@107..112 "match"
-            WHITESPACE@112..113 " "
-            TUPLE_EXPR@113..115
-              L_PAREN@113..114 "("
-              R_PAREN@114..115 ")"
-            WHITESPACE@115..116 " "
-            MATCH_ARM_LIST@116..185
-              L_CURLY@116..117 "{"
-              WHITESPACE@117..126 "\n        "
-              MATCH_ARM@126..133
-                PLACEHOLDER_PAT@126..127
-                  UNDERSCORE@126..127 "_"
-                WHITESPACE@127..128 " "
-                FAT_ARROW@128..130 "=>"
-                WHITESPACE@130..131 " "
-                TUPLE_EXPR@131..133
-                  L_PAREN@131..132 "("
-                  R_PAREN@132..133 ")"
-              COMMA@133..134 ","
-              WHITESPACE@134..143 "\n        "
-              MATCH_ARM@143..150
-                PLACEHOLDER_PAT@143..144
-                  UNDERSCORE@143..144 "_"
-                WHITESPACE@144..145 " "
-                FAT_ARROW@145..147 "=>"
-                WHITESPACE@147..148 " "
-                TUPLE_EXPR@148..150
-                  L_PAREN@148..149 "("
-                  R_PAREN@149..150 ")"
-              COMMA@150..151 ","
-              WHITESPACE@151..160 "\n        "
-              MATCH_ARM@160..179
-                ATTR@160..161
-                  POUND@160..161 "#"
-                ERROR@161..162
-                  BANG@161..162 "!"
-                ARRAY_EXPR@162..179
-                  L_BRACK@162..163 "["
-                  CALL_EXPR@163..178
-                    PATH_EXPR@163..166
-                      PATH@163..166
-                        PATH_SEGMENT@163..166
-                          NAME_REF@163..166
-                            IDENT@163..166 "doc"
-                    ARG_LIST@166..178
-                      L_PAREN@166..167 "("
-                      LITERAL@167..177
-                        STRING@167..177 "\"Nor here\""
-                      R_PAREN@177..178 ")"
-                  R_BRACK@178..179 "]"
-              WHITESPACE@179..184 "\n    "
-              R_CURLY@184..185 "}"
-        WHITESPACE@185..191 "\n\n    "
-        MATCH_EXPR@191..290
-          MATCH_KW@191..196 "match"
-          WHITESPACE@196..197 " "
-          TUPLE_EXPR@197..199
-            L_PAREN@197..198 "("
-            R_PAREN@198..199 ")"
-          WHITESPACE@199..200 " "
-          MATCH_ARM_LIST@200..290
-            L_CURLY@200..201 "{"
-            WHITESPACE@201..210 "\n        "
-            MATCH_ARM@210..250
-              ATTR@210..222
-                POUND@210..211 "#"
-                L_BRACK@211..212 "["
-                PATH@212..215
-                  PATH_SEGMENT@212..215
-                    NAME_REF@212..215
-                      IDENT@212..215 "cfg"
-                TOKEN_TREE@215..221
-                  L_PAREN@215..216 "("
-                  IDENT@216..220 "test"
-                  R_PAREN@220..221 ")"
-                R_BRACK@221..222 "]"
-              WHITESPACE@222..231 "\n        "
-              ATTR@231..232
-                POUND@231..232 "#"
-              ERROR@232..233
-                BANG@232..233 "!"
-              ARRAY_EXPR@233..250
-                L_BRACK@233..234 "["
-                CALL_EXPR@234..249
-                  PATH_EXPR@234..237
-                    PATH@234..237
-                      PATH_SEGMENT@234..237
-                        NAME_REF@234..237
-                          IDENT@234..237 "doc"
-                  ARG_LIST@237..249
-                    L_PAREN@237..238 "("
-                    LITERAL@238..248
-                      STRING@238..248 "\"Nor here\""
-                    R_PAREN@248..249 ")"
-                R_BRACK@249..250 "]"
-            WHITESPACE@250..259 "\n        "
-            MATCH_ARM@259..266
-              PLACEHOLDER_PAT@259..260
-                UNDERSCORE@259..260 "_"
-              WHITESPACE@260..261 " "
-              FAT_ARROW@261..263 "=>"
-              WHITESPACE@263..264 " "
-              TUPLE_EXPR@264..266
-                L_PAREN@264..265 "("
-                R_PAREN@265..266 ")"
-            COMMA@266..267 ","
-            WHITESPACE@267..276 "\n        "
-            MATCH_ARM@276..283
-              PLACEHOLDER_PAT@276..277
-                UNDERSCORE@276..277 "_"
-              WHITESPACE@277..278 " "
-              FAT_ARROW@278..280 "=>"
-              WHITESPACE@280..281 " "
-              TUPLE_EXPR@281..283
-                L_PAREN@281..282 "("
-                R_PAREN@282..283 ")"
-            COMMA@283..284 ","
-            WHITESPACE@284..289 "\n    "
-            R_CURLY@289..290 "}"
-        WHITESPACE@290..291 "\n"
-        R_CURLY@291..292 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..101
+        MATCH_EXPR@15..101
+          MATCH_KW@15..20 "match"
+          WHITESPACE@20..21 " "
+          TUPLE_EXPR@21..23
+            L_PAREN@21..22 "("
+            R_PAREN@22..23 ")"
+          WHITESPACE@23..24 " "
+          MATCH_ARM_LIST@24..101
+            L_CURLY@24..25 "{"
+            WHITESPACE@25..34 "\n        "
+            MATCH_ARM@34..41
+              PLACEHOLDER_PAT@34..35
+                UNDERSCORE@34..35 "_"
+              WHITESPACE@35..36 " "
+              FAT_ARROW@36..38 "=>"
+              WHITESPACE@38..39 " "
+              TUPLE_EXPR@39..41
+                L_PAREN@39..40 "("
+                R_PAREN@40..41 ")"
+            COMMA@41..42 ","
+            WHITESPACE@42..51 "\n        "
+            MATCH_ARM@51..78
+              ATTR@51..52
+                POUND@51..52 "#"
+              ERROR@52..53
+                BANG@52..53 "!"
+              ARRAY_EXPR@53..78
+                L_BRACK@53..54 "["
+                CALL_EXPR@54..77
+                  PATH_EXPR@54..57
+                    PATH@54..57
+                      PATH_SEGMENT@54..57
+                        NAME_REF@54..57
+                          IDENT@54..57 "doc"
+                  ARG_LIST@57..77
+                    L_PAREN@57..58 "("
+                    LITERAL@58..76
+                      STRING@58..76 "\"Not allowed here\""
+                    R_PAREN@76..77 ")"
+                R_BRACK@77..78 "]"
+            WHITESPACE@78..87 "\n        "
+            MATCH_ARM@87..94
+              PLACEHOLDER_PAT@87..88
+                UNDERSCORE@87..88 "_"
+              WHITESPACE@88..89 " "
+              FAT_ARROW@89..91 "=>"
+              WHITESPACE@91..92 " "
+              TUPLE_EXPR@92..94
+                L_PAREN@92..93 "("
+                R_PAREN@93..94 ")"
+            COMMA@94..95 ","
+            WHITESPACE@95..100 "\n    "
+            R_CURLY@100..101 "}"
+      WHITESPACE@101..107 "\n\n    "
+      EXPR_STMT@107..185
+        MATCH_EXPR@107..185
+          MATCH_KW@107..112 "match"
+          WHITESPACE@112..113 " "
+          TUPLE_EXPR@113..115
+            L_PAREN@113..114 "("
+            R_PAREN@114..115 ")"
+          WHITESPACE@115..116 " "
+          MATCH_ARM_LIST@116..185
+            L_CURLY@116..117 "{"
+            WHITESPACE@117..126 "\n        "
+            MATCH_ARM@126..133
+              PLACEHOLDER_PAT@126..127
+                UNDERSCORE@126..127 "_"
+              WHITESPACE@127..128 " "
+              FAT_ARROW@128..130 "=>"
+              WHITESPACE@130..131 " "
+              TUPLE_EXPR@131..133
+                L_PAREN@131..132 "("
+                R_PAREN@132..133 ")"
+            COMMA@133..134 ","
+            WHITESPACE@134..143 "\n        "
+            MATCH_ARM@143..150
+              PLACEHOLDER_PAT@143..144
+                UNDERSCORE@143..144 "_"
+              WHITESPACE@144..145 " "
+              FAT_ARROW@145..147 "=>"
+              WHITESPACE@147..148 " "
+              TUPLE_EXPR@148..150
+                L_PAREN@148..149 "("
+                R_PAREN@149..150 ")"
+            COMMA@150..151 ","
+            WHITESPACE@151..160 "\n        "
+            MATCH_ARM@160..179
+              ATTR@160..161
+                POUND@160..161 "#"
+              ERROR@161..162
+                BANG@161..162 "!"
+              ARRAY_EXPR@162..179
+                L_BRACK@162..163 "["
+                CALL_EXPR@163..178
+                  PATH_EXPR@163..166
+                    PATH@163..166
+                      PATH_SEGMENT@163..166
+                        NAME_REF@163..166
+                          IDENT@163..166 "doc"
+                  ARG_LIST@166..178
+                    L_PAREN@166..167 "("
+                    LITERAL@167..177
+                      STRING@167..177 "\"Nor here\""
+                    R_PAREN@177..178 ")"
+                R_BRACK@178..179 "]"
+            WHITESPACE@179..184 "\n    "
+            R_CURLY@184..185 "}"
+      WHITESPACE@185..191 "\n\n    "
+      MATCH_EXPR@191..290
+        MATCH_KW@191..196 "match"
+        WHITESPACE@196..197 " "
+        TUPLE_EXPR@197..199
+          L_PAREN@197..198 "("
+          R_PAREN@198..199 ")"
+        WHITESPACE@199..200 " "
+        MATCH_ARM_LIST@200..290
+          L_CURLY@200..201 "{"
+          WHITESPACE@201..210 "\n        "
+          MATCH_ARM@210..250
+            ATTR@210..222
+              POUND@210..211 "#"
+              L_BRACK@211..212 "["
+              PATH@212..215
+                PATH_SEGMENT@212..215
+                  NAME_REF@212..215
+                    IDENT@212..215 "cfg"
+              TOKEN_TREE@215..221
+                L_PAREN@215..216 "("
+                IDENT@216..220 "test"
+                R_PAREN@220..221 ")"
+              R_BRACK@221..222 "]"
+            WHITESPACE@222..231 "\n        "
+            ATTR@231..232
+              POUND@231..232 "#"
+            ERROR@232..233
+              BANG@232..233 "!"
+            ARRAY_EXPR@233..250
+              L_BRACK@233..234 "["
+              CALL_EXPR@234..249
+                PATH_EXPR@234..237
+                  PATH@234..237
+                    PATH_SEGMENT@234..237
+                      NAME_REF@234..237
+                        IDENT@234..237 "doc"
+                ARG_LIST@237..249
+                  L_PAREN@237..238 "("
+                  LITERAL@238..248
+                    STRING@238..248 "\"Nor here\""
+                  R_PAREN@248..249 ")"
+              R_BRACK@249..250 "]"
+          WHITESPACE@250..259 "\n        "
+          MATCH_ARM@259..266
+            PLACEHOLDER_PAT@259..260
+              UNDERSCORE@259..260 "_"
+            WHITESPACE@260..261 " "
+            FAT_ARROW@261..263 "=>"
+            WHITESPACE@263..264 " "
+            TUPLE_EXPR@264..266
+              L_PAREN@264..265 "("
+              R_PAREN@265..266 ")"
+          COMMA@266..267 ","
+          WHITESPACE@267..276 "\n        "
+          MATCH_ARM@276..283
+            PLACEHOLDER_PAT@276..277
+              UNDERSCORE@276..277 "_"
+            WHITESPACE@277..278 " "
+            FAT_ARROW@278..280 "=>"
+            WHITESPACE@280..281 " "
+            TUPLE_EXPR@281..283
+              L_PAREN@281..282 "("
+              R_PAREN@282..283 ")"
+          COMMA@283..284 ","
+          WHITESPACE@284..289 "\n    "
+          R_CURLY@289..290 "}"
+      WHITESPACE@290..291 "\n"
+      R_CURLY@291..292 "}"
   WHITESPACE@292..293 "\n"
 error 52..52: expected `[`
 error 52..52: expected pattern

crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast

@@ -9,58 +9,57 @@ SOURCE_FILE@0..89
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..88
-      BLOCK@9..88
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        MATCH_EXPR@15..86
-          MATCH_KW@15..20 "match"
-          WHITESPACE@20..21 " "
-          TUPLE_EXPR@21..23
-            L_PAREN@21..22 "("
-            R_PAREN@22..23 ")"
-          WHITESPACE@23..24 " "
-          MATCH_ARM_LIST@24..86
-            L_CURLY@24..25 "{"
-            WHITESPACE@25..34 "\n        "
-            MATCH_ARM@34..41
-              PLACEHOLDER_PAT@34..35
-                UNDERSCORE@34..35 "_"
-              WHITESPACE@35..36 " "
-              FAT_ARROW@36..38 "=>"
-              WHITESPACE@38..39 " "
-              TUPLE_EXPR@39..41
-                L_PAREN@39..40 "("
-                R_PAREN@40..41 ")"
-            COMMA@41..42 ","
-            WHITESPACE@42..51 "\n        "
-            MATCH_ARM@51..58
-              PLACEHOLDER_PAT@51..52
-                UNDERSCORE@51..52 "_"
-              WHITESPACE@52..53 " "
-              FAT_ARROW@53..55 "=>"
-              WHITESPACE@55..56 " "
-              TUPLE_EXPR@56..58
-                L_PAREN@56..57 "("
-                R_PAREN@57..58 ")"
-            COMMA@58..59 ","
-            WHITESPACE@59..68 "\n        "
-            MATCH_ARM@68..80
-              ATTR@68..80
-                POUND@68..69 "#"
-                L_BRACK@69..70 "["
-                PATH@70..73
-                  PATH_SEGMENT@70..73
-                    NAME_REF@70..73
-                      IDENT@70..73 "cfg"
-                TOKEN_TREE@73..79
-                  L_PAREN@73..74 "("
-                  IDENT@74..78 "test"
-                  R_PAREN@78..79 ")"
-                R_BRACK@79..80 "]"
-            WHITESPACE@80..85 "\n    "
-            R_CURLY@85..86 "}"
-        WHITESPACE@86..87 "\n"
-        R_CURLY@87..88 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      MATCH_EXPR@15..86
+        MATCH_KW@15..20 "match"
+        WHITESPACE@20..21 " "
+        TUPLE_EXPR@21..23
+          L_PAREN@21..22 "("
+          R_PAREN@22..23 ")"
+        WHITESPACE@23..24 " "
+        MATCH_ARM_LIST@24..86
+          L_CURLY@24..25 "{"
+          WHITESPACE@25..34 "\n        "
+          MATCH_ARM@34..41
+            PLACEHOLDER_PAT@34..35
+              UNDERSCORE@34..35 "_"
+            WHITESPACE@35..36 " "
+            FAT_ARROW@36..38 "=>"
+            WHITESPACE@38..39 " "
+            TUPLE_EXPR@39..41
+              L_PAREN@39..40 "("
+              R_PAREN@40..41 ")"
+          COMMA@41..42 ","
+          WHITESPACE@42..51 "\n        "
+          MATCH_ARM@51..58
+            PLACEHOLDER_PAT@51..52
+              UNDERSCORE@51..52 "_"
+            WHITESPACE@52..53 " "
+            FAT_ARROW@53..55 "=>"
+            WHITESPACE@55..56 " "
+            TUPLE_EXPR@56..58
+              L_PAREN@56..57 "("
+              R_PAREN@57..58 ")"
+          COMMA@58..59 ","
+          WHITESPACE@59..68 "\n        "
+          MATCH_ARM@68..80
+            ATTR@68..80
+              POUND@68..69 "#"
+              L_BRACK@69..70 "["
+              PATH@70..73
+                PATH_SEGMENT@70..73
+                  NAME_REF@70..73
+                    IDENT@70..73 "cfg"
+              TOKEN_TREE@73..79
+                L_PAREN@73..74 "("
+                IDENT@74..78 "test"
+                R_PAREN@78..79 ")"
+              R_BRACK@79..80 "]"
+          WHITESPACE@80..85 "\n    "
+          R_CURLY@85..86 "}"
+      WHITESPACE@86..87 "\n"
+      R_CURLY@87..88 "}"
   WHITESPACE@88..89 "\n"
 error 80..80: expected pattern
 error 80..80: expected FAT_ARROW

crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast

@@ -9,84 +9,83 @@ SOURCE_FILE@0..91
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..89
-      BLOCK@10..89
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        LET_STMT@16..27
-          LET_KW@16..19 "let"
-          WHITESPACE@19..20 " "
-          BIND_PAT@20..27
-            REF_KW@20..23 "ref"
-            WHITESPACE@23..24 " "
-            ERROR@24..27
-              BOX_KW@24..27 "box"
-        WHITESPACE@27..28 " "
-        EXPR_STMT@28..35
-          BIN_EXPR@28..34
-            PATH_EXPR@28..29
-              PATH@28..29
-                PATH_SEGMENT@28..29
-                  NAME_REF@28..29
-                    IDENT@28..29 "i"
-            WHITESPACE@29..30 " "
-            EQ@30..31 "="
-            WHITESPACE@31..32 " "
-            TUPLE_EXPR@32..34
-              L_PAREN@32..33 "("
-              R_PAREN@33..34 ")"
-          SEMICOLON@34..35 ";"
-        WHITESPACE@35..40 "\n    "
-        LET_STMT@40..51
-          LET_KW@40..43 "let"
-          WHITESPACE@43..44 " "
-          BIND_PAT@44..51
-            MUT_KW@44..47 "mut"
-            WHITESPACE@47..48 " "
-            ERROR@48..51
-              BOX_KW@48..51 "box"
-        WHITESPACE@51..52 " "
-        EXPR_STMT@52..59
-          BIN_EXPR@52..58
-            PATH_EXPR@52..53
-              PATH@52..53
-                PATH_SEGMENT@52..53
-                  NAME_REF@52..53
-                    IDENT@52..53 "i"
-            WHITESPACE@53..54 " "
-            EQ@54..55 "="
-            WHITESPACE@55..56 " "
-            TUPLE_EXPR@56..58
-              L_PAREN@56..57 "("
-              R_PAREN@57..58 ")"
-          SEMICOLON@58..59 ";"
-        WHITESPACE@59..64 "\n    "
-        LET_STMT@64..79
-          LET_KW@64..67 "let"
-          WHITESPACE@67..68 " "
-          BIND_PAT@68..79
-            REF_KW@68..71 "ref"
-            WHITESPACE@71..72 " "
-            MUT_KW@72..75 "mut"
-            WHITESPACE@75..76 " "
-            ERROR@76..79
-              BOX_KW@76..79 "box"
-        WHITESPACE@79..80 " "
-        EXPR_STMT@80..87
-          BIN_EXPR@80..86
-            PATH_EXPR@80..81
-              PATH@80..81
-                PATH_SEGMENT@80..81
-                  NAME_REF@80..81
-                    IDENT@80..81 "i"
-            WHITESPACE@81..82 " "
-            EQ@82..83 "="
-            WHITESPACE@83..84 " "
-            TUPLE_EXPR@84..86
-              L_PAREN@84..85 "("
-              R_PAREN@85..86 ")"
-          SEMICOLON@86..87 ";"
-        WHITESPACE@87..88 "\n"
-        R_CURLY@88..89 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      LET_STMT@16..27
+        LET_KW@16..19 "let"
+        WHITESPACE@19..20 " "
+        BIND_PAT@20..27
+          REF_KW@20..23 "ref"
+          WHITESPACE@23..24 " "
+          ERROR@24..27
+            BOX_KW@24..27 "box"
+      WHITESPACE@27..28 " "
+      EXPR_STMT@28..35
+        BIN_EXPR@28..34
+          PATH_EXPR@28..29
+            PATH@28..29
+              PATH_SEGMENT@28..29
+                NAME_REF@28..29
+                  IDENT@28..29 "i"
+          WHITESPACE@29..30 " "
+          EQ@30..31 "="
+          WHITESPACE@31..32 " "
+          TUPLE_EXPR@32..34
+            L_PAREN@32..33 "("
+            R_PAREN@33..34 ")"
+        SEMICOLON@34..35 ";"
+      WHITESPACE@35..40 "\n    "
+      LET_STMT@40..51
+        LET_KW@40..43 "let"
+        WHITESPACE@43..44 " "
+        BIND_PAT@44..51
+          MUT_KW@44..47 "mut"
+          WHITESPACE@47..48 " "
+          ERROR@48..51
+            BOX_KW@48..51 "box"
+      WHITESPACE@51..52 " "
+      EXPR_STMT@52..59
+        BIN_EXPR@52..58
+          PATH_EXPR@52..53
+            PATH@52..53
+              PATH_SEGMENT@52..53
+                NAME_REF@52..53
+                  IDENT@52..53 "i"
+          WHITESPACE@53..54 " "
+          EQ@54..55 "="
+          WHITESPACE@55..56 " "
+          TUPLE_EXPR@56..58
+            L_PAREN@56..57 "("
+            R_PAREN@57..58 ")"
+        SEMICOLON@58..59 ";"
+      WHITESPACE@59..64 "\n    "
+      LET_STMT@64..79
+        LET_KW@64..67 "let"
+        WHITESPACE@67..68 " "
+        BIND_PAT@68..79
+          REF_KW@68..71 "ref"
+          WHITESPACE@71..72 " "
+          MUT_KW@72..75 "mut"
+          WHITESPACE@75..76 " "
+          ERROR@76..79
+            BOX_KW@76..79 "box"
+      WHITESPACE@79..80 " "
+      EXPR_STMT@80..87
+        BIN_EXPR@80..86
+          PATH_EXPR@80..81
+            PATH@80..81
+              PATH_SEGMENT@80..81
+                NAME_REF@80..81
+                  IDENT@80..81 "i"
+          WHITESPACE@81..82 " "
+          EQ@82..83 "="
+          WHITESPACE@83..84 " "
+          TUPLE_EXPR@84..86
+            L_PAREN@84..85 "("
+            R_PAREN@85..86 ")"
+        SEMICOLON@86..87 ";"
+      WHITESPACE@87..88 "\n"
+      R_CURLY@88..89 "}"
   WHITESPACE@89..91 "\n\n"
 error 24..24: expected a name
 error 27..27: expected SEMICOLON

crates/ra_syntax/test_data/parser/err/0035_use_recover.rast

@@ -44,9 +44,8 @@ SOURCE_FILE@0..48
       R_PAREN@43..44 ")"
     WHITESPACE@44..45 " "
     BLOCK_EXPR@45..47
-      BLOCK@45..47
-        L_CURLY@45..46 "{"
-        R_CURLY@46..47 "}"
+      L_CURLY@45..46 "{"
+      R_CURLY@46..47 "}"
   WHITESPACE@47..48 "\n"
 error 17..17: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
 error 17..17: expected SEMICOLON

crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast

@@ -27,9 +27,8 @@ SOURCE_FILE@0..118
           R_PAREN@27..28 ")"
         WHITESPACE@28..29 " "
         BLOCK_EXPR@29..31
-          BLOCK@29..31
-            L_CURLY@29..30 "{"
-            R_CURLY@30..31 "}"
+          L_CURLY@29..30 "{"
+          R_CURLY@30..31 "}"
       WHITESPACE@31..36 "\n    "
       FN_DEF@36..51
         VISIBILITY@36..39
@@ -44,9 +43,8 @@ SOURCE_FILE@0..118
           R_PAREN@47..48 ")"
         WHITESPACE@48..49 " "
         BLOCK_EXPR@49..51
-          BLOCK@49..51
-            L_CURLY@49..50 "{"
-            R_CURLY@50..51 "}"
+          L_CURLY@49..50 "{"
+          R_CURLY@50..51 "}"
       WHITESPACE@51..56 "\n    "
       TYPE_ALIAS_DEF@56..81
         VISIBILITY@56..66

crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast

@@ -9,22 +9,21 @@ SOURCE_FILE@0..33
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..32
-      BLOCK@10..32
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        EXPR_STMT@16..21
-          RANGE_EXPR@16..20
-            LITERAL@16..17
-              INT_NUMBER@16..17 "0"
-            DOT2EQ@17..20 "..="
-          SEMICOLON@20..21 ";"
-        WHITESPACE@21..26 "\n    "
-        EXPR_STMT@26..30
-          RANGE_EXPR@26..29
-            DOT2EQ@26..29 "..="
-          SEMICOLON@29..30 ";"
-        WHITESPACE@30..31 "\n"
-        R_CURLY@31..32 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      EXPR_STMT@16..21
+        RANGE_EXPR@16..20
+          LITERAL@16..17
+            INT_NUMBER@16..17 "0"
+          DOT2EQ@17..20 "..="
+        SEMICOLON@20..21 ";"
+      WHITESPACE@21..26 "\n    "
+      EXPR_STMT@26..30
+        RANGE_EXPR@26..29
+          DOT2EQ@26..29 "..="
+        SEMICOLON@29..30 ";"
+      WHITESPACE@30..31 "\n"
+      R_CURLY@31..32 "}"
   WHITESPACE@32..33 "\n"
 error 16..20: An inclusive range must have an end expression
 error 26..29: An inclusive range must have an end expression

crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast

@@ -18,66 +18,65 @@ SOURCE_FILE@0..83
               IDENT@12..15 "i32"
     WHITESPACE@15..16 " "
     BLOCK_EXPR@16..82
-      BLOCK@16..82
-        L_CURLY@16..17 "{"
-        WHITESPACE@17..22 "\n    "
-        EXPR_STMT@22..80
-          METHOD_CALL_EXPR@22..79
-            METHOD_CALL_EXPR@22..57
-              METHOD_CALL_EXPR@22..38
-                ARRAY_EXPR@22..31
-                  L_BRACK@22..23 "["
-                  LITERAL@23..24
-                    INT_NUMBER@23..24 "1"
-                  COMMA@24..25 ","
-                  WHITESPACE@25..26 " "
-                  LITERAL@26..27
-                    INT_NUMBER@26..27 "2"
-                  COMMA@27..28 ","
-                  WHITESPACE@28..29 " "
-                  LITERAL@29..30
-                    INT_NUMBER@29..30 "3"
-                  R_BRACK@30..31 "]"
-                DOT@31..32 "."
-                NAME_REF@32..36
-                  IDENT@32..36 "iter"
-                ARG_LIST@36..38
-                  L_PAREN@36..37 "("
-                  R_PAREN@37..38 ")"
-              WHITESPACE@38..47 "\n        "
-              DOT@47..48 "."
-              NAME_REF@48..51
-                IDENT@48..51 "map"
-              ARG_LIST@51..57
-                L_PAREN@51..52 "("
-                LAMBDA_EXPR@52..56
-                  PARAM_LIST@52..56
-                    PIPE@52..53 "|"
-                    PARAM@53..55
-                      BIND_PAT@53..55
-                        NAME@53..55
-                          IDENT@53..55 "it"
-                    PIPE@55..56 "|"
-                R_PAREN@56..57 ")"
-            WHITESPACE@57..66 "\n        "
-            DOT@66..67 "."
-            NAME_REF@67..70
-              IDENT@67..70 "max"
-            TYPE_ARG_LIST@70..77
-              COLON2@70..72 "::"
-              L_ANGLE@72..73 "<"
-              TYPE_ARG@73..76
-                PATH_TYPE@73..76
-                  PATH@73..76
-                    PATH_SEGMENT@73..76
-                      NAME_REF@73..76
-                        IDENT@73..76 "i32"
-              R_ANGLE@76..77 ">"
-            ARG_LIST@77..79
-              L_PAREN@77..78 "("
-              R_PAREN@78..79 ")"
-          SEMICOLON@79..80 ";"
-        WHITESPACE@80..81 "\n"
-        R_CURLY@81..82 "}"
+      L_CURLY@16..17 "{"
+      WHITESPACE@17..22 "\n    "
+      EXPR_STMT@22..80
+        METHOD_CALL_EXPR@22..79
+          METHOD_CALL_EXPR@22..57
+            METHOD_CALL_EXPR@22..38
+              ARRAY_EXPR@22..31
+                L_BRACK@22..23 "["
+                LITERAL@23..24
+                  INT_NUMBER@23..24 "1"
+                COMMA@24..25 ","
+                WHITESPACE@25..26 " "
+                LITERAL@26..27
+                  INT_NUMBER@26..27 "2"
+                COMMA@27..28 ","
+                WHITESPACE@28..29 " "
+                LITERAL@29..30
+                  INT_NUMBER@29..30 "3"
+                R_BRACK@30..31 "]"
+              DOT@31..32 "."
+              NAME_REF@32..36
+                IDENT@32..36 "iter"
+              ARG_LIST@36..38
+                L_PAREN@36..37 "("
+                R_PAREN@37..38 ")"
+            WHITESPACE@38..47 "\n        "
+            DOT@47..48 "."
+            NAME_REF@48..51
+              IDENT@48..51 "map"
+            ARG_LIST@51..57
+              L_PAREN@51..52 "("
+              LAMBDA_EXPR@52..56
+                PARAM_LIST@52..56
+                  PIPE@52..53 "|"
+                  PARAM@53..55
+                    BIND_PAT@53..55
+                      NAME@53..55
+                        IDENT@53..55 "it"
+                  PIPE@55..56 "|"
+              R_PAREN@56..57 ")"
+          WHITESPACE@57..66 "\n        "
+          DOT@66..67 "."
+          NAME_REF@67..70
+            IDENT@67..70 "max"
+          TYPE_ARG_LIST@70..77
+            COLON2@70..72 "::"
+            L_ANGLE@72..73 "<"
+            TYPE_ARG@73..76
+              PATH_TYPE@73..76
+                PATH@73..76
+                  PATH_SEGMENT@73..76
+                    NAME_REF@73..76
+                      IDENT@73..76 "i32"
+            R_ANGLE@76..77 ">"
+          ARG_LIST@77..79
+            L_PAREN@77..78 "("
+            R_PAREN@78..79 ")"
+        SEMICOLON@79..80 ";"
+      WHITESPACE@80..81 "\n"
+      R_CURLY@81..82 "}"
   WHITESPACE@82..83 "\n"
 error 56..56: expected expression

crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast

@@ -9,19 +9,18 @@ SOURCE_FILE@0..30
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..29
-      BLOCK@10..29
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        EXPR_STMT@16..22
-          ERROR@16..22
-            LABEL@16..22
-              LIFETIME@16..21 "\'loop"
-              COLON@21..22 ":"
-        WHITESPACE@22..23 " "
-        IMPL_DEF@23..27
-          IMPL_KW@23..27 "impl"
-        WHITESPACE@27..28 "\n"
-        R_CURLY@28..29 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      EXPR_STMT@16..22
+        ERROR@16..22
+          LABEL@16..22
+            LIFETIME@16..21 "\'loop"
+            COLON@21..22 ":"
+      WHITESPACE@22..23 " "
+      IMPL_DEF@23..27
+        IMPL_KW@23..27 "impl"
+      WHITESPACE@27..28 "\n"
+      R_CURLY@28..29 "}"
   WHITESPACE@29..30 "\n"
 error 22..22: expected a loop
 error 22..22: expected SEMICOLON

crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast

@@ -8,9 +8,8 @@ SOURCE_FILE@0..33
       L_PAREN@6..7 "("
       R_PAREN@7..8 ")"
     BLOCK_EXPR@8..10
-      BLOCK@8..10
-        L_CURLY@8..9 "{"
-        R_CURLY@9..10 "}"
+      L_CURLY@8..9 "{"
+      R_CURLY@9..10 "}"
   WHITESPACE@10..11 " "
   ERROR@11..17
     UNSAFE_KW@11..17 "unsafe"
@@ -29,9 +28,8 @@ SOURCE_FILE@0..33
       L_PAREN@28..29 "("
       R_PAREN@29..30 ")"
     BLOCK_EXPR@30..32
-      BLOCK@30..32
-        L_CURLY@30..31 "{"
-        R_CURLY@31..32 "}"
+      L_CURLY@30..31 "{"
+      R_CURLY@31..32 "}"
   WHITESPACE@32..33 "\n"
 error 11..11: expected an item
 error 18..18: expected an item

crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast

@@ -9,24 +9,23 @@ SOURCE_FILE@0..30
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..29
-      BLOCK@9..29
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..11 " "
-        LET_STMT@11..27
-          LET_KW@11..14 "let"
-          WHITESPACE@14..15 " "
-          PLACEHOLDER_PAT@15..16
-            UNDERSCORE@15..16 "_"
-          WHITESPACE@16..17 " "
-          EQ@17..18 "="
-          WHITESPACE@18..19 " "
-          BLOCK_EXPR@19..27
-            ASYNC_KW@19..24 "async"
-            WHITESPACE@24..25 " "
-            BLOCK@25..27
-              L_CURLY@25..26 "{"
-              R_CURLY@26..27 "}"
-        WHITESPACE@27..28 " "
-        R_CURLY@28..29 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..11 " "
+      LET_STMT@11..27
+        LET_KW@11..14 "let"
+        WHITESPACE@14..15 " "
+        PLACEHOLDER_PAT@15..16
+          UNDERSCORE@15..16 "_"
+        WHITESPACE@16..17 " "
+        EQ@17..18 "="
+        WHITESPACE@18..19 " "
+        EFFECT_EXPR@19..27
+          ASYNC_KW@19..24 "async"
+          WHITESPACE@24..25 " "
+          BLOCK_EXPR@25..27
+            L_CURLY@25..26 "{"
+            R_CURLY@26..27 "}"
+      WHITESPACE@27..28 " "
+      R_CURLY@28..29 "}"
   WHITESPACE@29..30 "\n"
 error 27..27: expected SEMICOLON

crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast

@@ -9,18 +9,17 @@ SOURCE_FILE@0..21
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..20
-      BLOCK@9..20
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..11 " "
-        ERROR@11..14
-          VISIBILITY@11..14
-            PUB_KW@11..14 "pub"
-        WHITESPACE@14..15 " "
-        EXPR_STMT@15..18
-          LITERAL@15..17
-            INT_NUMBER@15..17 "92"
-          SEMICOLON@17..18 ";"
-        WHITESPACE@18..19 " "
-        R_CURLY@19..20 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..11 " "
+      ERROR@11..14
+        VISIBILITY@11..14
+          PUB_KW@11..14 "pub"
+      WHITESPACE@14..15 " "
+      EXPR_STMT@15..18
+        LITERAL@15..17
+          INT_NUMBER@15..17 "92"
+        SEMICOLON@17..18 ";"
+      WHITESPACE@18..19 " "
+      R_CURLY@19..20 "}"
   WHITESPACE@20..21 "\n"
 error 14..14: expected an item

crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast

@@ -9,53 +9,51 @@ SOURCE_FILE@0..48
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..47
-      BLOCK@9..47
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..14 "\n   "
-        EXPR_STMT@14..25
-          ATTR@14..18
-            POUND@14..15 "#"
-            L_BRACK@15..16 "["
-            PATH@16..17
-              PATH_SEGMENT@16..17
-                NAME_REF@16..17
-                  IDENT@16..17 "A"
-            R_BRACK@17..18 "]"
-          WHITESPACE@18..19 " "
-          BIN_EXPR@19..24
-            LITERAL@19..20
-              INT_NUMBER@19..20 "1"
-            WHITESPACE@20..21 " "
-            PLUS@21..22 "+"
-            WHITESPACE@22..23 " "
-            LITERAL@23..24
-              INT_NUMBER@23..24 "2"
-          SEMICOLON@24..25 ";"
-        WHITESPACE@25..29 "\n   "
-        EXPR_STMT@29..45
-          ATTR@29..33
-            POUND@29..30 "#"
-            L_BRACK@30..31 "["
-            PATH@31..32
-              PATH_SEGMENT@31..32
-                NAME_REF@31..32
-                  IDENT@31..32 "B"
-            R_BRACK@32..33 "]"
-          WHITESPACE@33..34 " "
-          IF_EXPR@34..44
-            IF_KW@34..36 "if"
-            WHITESPACE@36..37 " "
-            CONDITION@37..41
-              LITERAL@37..41
-                TRUE_KW@37..41 "true"
-            WHITESPACE@41..42 " "
-            BLOCK_EXPR@42..44
-              BLOCK@42..44
-                L_CURLY@42..43 "{"
-                R_CURLY@43..44 "}"
-          SEMICOLON@44..45 ";"
-        WHITESPACE@45..46 "\n"
-        R_CURLY@46..47 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..14 "\n   "
+      EXPR_STMT@14..25
+        ATTR@14..18
+          POUND@14..15 "#"
+          L_BRACK@15..16 "["
+          PATH@16..17
+            PATH_SEGMENT@16..17
+              NAME_REF@16..17
+                IDENT@16..17 "A"
+          R_BRACK@17..18 "]"
+        WHITESPACE@18..19 " "
+        BIN_EXPR@19..24
+          LITERAL@19..20
+            INT_NUMBER@19..20 "1"
+          WHITESPACE@20..21 " "
+          PLUS@21..22 "+"
+          WHITESPACE@22..23 " "
+          LITERAL@23..24
+            INT_NUMBER@23..24 "2"
+        SEMICOLON@24..25 ";"
+      WHITESPACE@25..29 "\n   "
+      EXPR_STMT@29..45
+        ATTR@29..33
+          POUND@29..30 "#"
+          L_BRACK@30..31 "["
+          PATH@31..32
+            PATH_SEGMENT@31..32
+              NAME_REF@31..32
+                IDENT@31..32 "B"
+          R_BRACK@32..33 "]"
+        WHITESPACE@33..34 " "
+        IF_EXPR@34..44
+          IF_KW@34..36 "if"
+          WHITESPACE@36..37 " "
+          CONDITION@37..41
+            LITERAL@37..41
+              TRUE_KW@37..41 "true"
+          WHITESPACE@41..42 " "
+          BLOCK_EXPR@42..44
+            L_CURLY@42..43 "{"
+            R_CURLY@43..44 "}"
+        SEMICOLON@44..45 ";"
+      WHITESPACE@45..46 "\n"
+      R_CURLY@46..47 "}"
   WHITESPACE@47..48 "\n"
 error 24..24: attributes are not allowed on BIN_EXPR
 error 44..44: attributes are not allowed on IF_EXPR

crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast

@@ -9,45 +9,44 @@ SOURCE_FILE@0..47
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..46
-      BLOCK@9..46
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..20
-          FIELD_EXPR@15..19
-            PATH_EXPR@15..16
-              PATH@15..16
-                PATH_SEGMENT@15..16
-                  NAME_REF@15..16
-                    IDENT@15..16 "x"
-            DOT@16..17 "."
-            FLOAT_NUMBER@17..19 "0."
-          SEMICOLON@19..20 ";"
-        WHITESPACE@20..25 "\n    "
-        EXPR_STMT@25..32
-          FIELD_EXPR@25..31
-            PATH_EXPR@25..26
-              PATH@25..26
-                PATH_SEGMENT@25..26
-                  NAME_REF@25..26
-                    IDENT@25..26 "x"
-            DOT@26..27 "."
-            NAME_REF@27..31
-              INT_NUMBER@27..31 "1i32"
-          SEMICOLON@31..32 ";"
-        WHITESPACE@32..37 "\n    "
-        EXPR_STMT@37..44
-          FIELD_EXPR@37..43
-            PATH_EXPR@37..38
-              PATH@37..38
-                PATH_SEGMENT@37..38
-                  NAME_REF@37..38
-                    IDENT@37..38 "x"
-            DOT@38..39 "."
-            NAME_REF@39..43
-              INT_NUMBER@39..43 "0x01"
-          SEMICOLON@43..44 ";"
-        WHITESPACE@44..45 "\n"
-        R_CURLY@45..46 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..20
+        FIELD_EXPR@15..19
+          PATH_EXPR@15..16
+            PATH@15..16
+              PATH_SEGMENT@15..16
+                NAME_REF@15..16
+                  IDENT@15..16 "x"
+          DOT@16..17 "."
+          FLOAT_NUMBER@17..19 "0."
+        SEMICOLON@19..20 ";"
+      WHITESPACE@20..25 "\n    "
+      EXPR_STMT@25..32
+        FIELD_EXPR@25..31
+          PATH_EXPR@25..26
+            PATH@25..26
+              PATH_SEGMENT@25..26
+                NAME_REF@25..26
+                  IDENT@25..26 "x"
+          DOT@26..27 "."
+          NAME_REF@27..31
+            INT_NUMBER@27..31 "1i32"
+        SEMICOLON@31..32 ";"
+      WHITESPACE@32..37 "\n    "
+      EXPR_STMT@37..44
+        FIELD_EXPR@37..43
+          PATH_EXPR@37..38
+            PATH@37..38
+              PATH_SEGMENT@37..38
+                NAME_REF@37..38
+                  IDENT@37..38 "x"
+          DOT@38..39 "."
+          NAME_REF@39..43
+            INT_NUMBER@39..43 "0x01"
+        SEMICOLON@43..44 ";"
+      WHITESPACE@44..45 "\n"
+      R_CURLY@45..46 "}"
   WHITESPACE@46..47 "\n"
 error 27..31: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix
 error 39..43: Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix

crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast

@@ -14,9 +14,8 @@ SOURCE_FILE@0..50
       R_PAREN@20..21 ")"
     WHITESPACE@21..22 " "
     BLOCK_EXPR@22..24
-      BLOCK@22..24
-        L_CURLY@22..23 "{"
-        R_CURLY@23..24 "}"
+      L_CURLY@22..23 "{"
+      R_CURLY@23..24 "}"
   WHITESPACE@24..25 "\n"
   ERROR@25..31
     UNSAFE_KW@25..31 "unsafe"
@@ -33,9 +32,8 @@ SOURCE_FILE@0..50
       R_PAREN@45..46 ")"
     WHITESPACE@46..47 " "
     BLOCK_EXPR@47..49
-      BLOCK@47..49
-        L_CURLY@47..48 "{"
-        R_CURLY@48..49 "}"
+      L_CURLY@47..48 "{"
+      R_CURLY@48..49 "}"
   WHITESPACE@49..50 "\n"
 error 6..6: expected existential, fn, trait or impl
 error 31..31: expected existential, fn, trait or impl

crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast

@@ -45,9 +45,8 @@ SOURCE_FILE@0..62
           R_PAREN@55..56 ")"
         WHITESPACE@56..57 " "
         BLOCK_EXPR@57..59
-          BLOCK@57..59
-            L_CURLY@57..58 "{"
-            R_CURLY@58..59 "}"
+          L_CURLY@57..58 "{"
+          R_CURLY@58..59 "}"
       WHITESPACE@59..60 "\n"
       R_CURLY@60..61 "}"
   WHITESPACE@61..62 "\n"

crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast

@@ -9,41 +9,40 @@ SOURCE_FILE@0..45
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..44
-      BLOCK@10..44
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        RECORD_LIT@16..42
-          PATH@16..17
-            PATH_SEGMENT@16..17
-              NAME_REF@16..17
-                IDENT@16..17 "S"
-          WHITESPACE@17..18 " "
-          RECORD_FIELD_LIST@18..42
-            L_CURLY@18..19 "{"
-            WHITESPACE@19..20 " "
-            RECORD_FIELD@20..40
-              NAME_REF@20..25
-                IDENT@20..25 "field"
-              WHITESPACE@25..26 " "
-              RANGE_EXPR@26..40
-                DOT2@26..28 ".."
-                CALL_EXPR@28..40
-                  PATH_EXPR@28..38
-                    PATH@28..38
-                      PATH@28..29
-                        PATH_SEGMENT@28..29
-                          NAME_REF@28..29
-                            IDENT@28..29 "S"
-                      COLON2@29..31 "::"
-                      PATH_SEGMENT@31..38
-                        NAME_REF@31..38
-                          IDENT@31..38 "default"
-                  ARG_LIST@38..40
-                    L_PAREN@38..39 "("
-                    R_PAREN@39..40 ")"
-            WHITESPACE@40..41 " "
-            R_CURLY@41..42 "}"
-        WHITESPACE@42..43 "\n"
-        R_CURLY@43..44 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      RECORD_LIT@16..42
+        PATH@16..17
+          PATH_SEGMENT@16..17
+            NAME_REF@16..17
+              IDENT@16..17 "S"
+        WHITESPACE@17..18 " "
+        RECORD_FIELD_LIST@18..42
+          L_CURLY@18..19 "{"
+          WHITESPACE@19..20 " "
+          RECORD_FIELD@20..40
+            NAME_REF@20..25
+              IDENT@20..25 "field"
+            WHITESPACE@25..26 " "
+            RANGE_EXPR@26..40
+              DOT2@26..28 ".."
+              CALL_EXPR@28..40
+                PATH_EXPR@28..38
+                  PATH@28..38
+                    PATH@28..29
+                      PATH_SEGMENT@28..29
+                        NAME_REF@28..29
+                          IDENT@28..29 "S"
+                    COLON2@29..31 "::"
+                    PATH_SEGMENT@31..38
+                      NAME_REF@31..38
+                        IDENT@31..38 "default"
+                ARG_LIST@38..40
+                  L_PAREN@38..39 "("
+                  R_PAREN@39..40 ")"
+          WHITESPACE@40..41 " "
+          R_CURLY@41..42 "}"
+      WHITESPACE@42..43 "\n"
+      R_CURLY@43..44 "}"
   WHITESPACE@44..45 "\n"
 error 25..25: expected COLON

crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast

@@ -51,9 +51,8 @@ SOURCE_FILE@0..83
           R_PAREN@57..58 ")"
         WHITESPACE@58..59 " "
         BLOCK_EXPR@59..61
-          BLOCK@59..61
-            L_CURLY@59..60 "{"
-            R_CURLY@60..61 "}"
+          L_CURLY@59..60 "{"
+          R_CURLY@60..61 "}"
       WHITESPACE@61..66 "\n    "
       FN_DEF@66..80
         FN_KW@66..68 "fn"

crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast

@@ -55,8 +55,7 @@ SOURCE_FILE@0..49
                     R_PAREN@43..44 ")"
     WHITESPACE@44..45 "\n"
     BLOCK_EXPR@45..48
-      BLOCK@45..48
-        L_CURLY@45..46 "{"
-        WHITESPACE@46..47 " "
-        R_CURLY@47..48 "}"
+      L_CURLY@45..46 "{"
+      WHITESPACE@46..47 " "
+      R_CURLY@47..48 "}"
   WHITESPACE@48..49 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast

@@ -32,7 +32,6 @@ SOURCE_FILE@0..28
       L_PAREN@23..24 "("
       R_PAREN@24..25 ")"
     BLOCK_EXPR@25..27
-      BLOCK@25..27
-        L_CURLY@25..26 "{"
-        R_CURLY@26..27 "}"
+      L_CURLY@25..26 "{"
+      R_CURLY@26..27 "}"
   WHITESPACE@27..28 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast

@@ -23,9 +23,8 @@ SOURCE_FILE@0..128
           R_PAREN@22..23 ")"
         WHITESPACE@23..24 " "
         BLOCK_EXPR@24..26
-          BLOCK@24..26
-            L_CURLY@24..25 "{"
-            R_CURLY@25..26 "}"
+          L_CURLY@24..25 "{"
+          R_CURLY@25..26 "}"
       WHITESPACE@26..31 "\n    "
       FN_DEF@31..46
         FN_KW@31..33 "fn"
@@ -41,9 +40,8 @@ SOURCE_FILE@0..128
           R_PAREN@42..43 ")"
         WHITESPACE@43..44 " "
         BLOCK_EXPR@44..46
-          BLOCK@44..46
-            L_CURLY@44..45 "{"
-            R_CURLY@45..46 "}"
+          L_CURLY@44..45 "{"
+          R_CURLY@45..46 "}"
       WHITESPACE@46..51 "\n    "
       FN_DEF@51..69
         FN_KW@51..53 "fn"
@@ -61,9 +59,8 @@ SOURCE_FILE@0..128
           R_PAREN@65..66 ")"
         WHITESPACE@66..67 " "
         BLOCK_EXPR@67..69
-          BLOCK@67..69
-            L_CURLY@67..68 "{"
-            R_CURLY@68..69 "}"
+          L_CURLY@67..68 "{"
+          R_CURLY@68..69 "}"
       WHITESPACE@69..74 "\n    "
       FN_DEF@74..103
         FN_KW@74..76 "fn"
@@ -95,9 +92,8 @@ SOURCE_FILE@0..128
           R_PAREN@99..100 ")"
         WHITESPACE@100..101 " "
         BLOCK_EXPR@101..103
-          BLOCK@101..103
-            L_CURLY@101..102 "{"
-            R_CURLY@102..103 "}"
+          L_CURLY@101..102 "{"
+          R_CURLY@102..103 "}"
       WHITESPACE@103..108 "\n    "
       FN_DEF@108..125
         FN_KW@108..110 "fn"
@@ -113,9 +109,8 @@ SOURCE_FILE@0..128
           R_PAREN@121..122 ")"
         WHITESPACE@122..123 " "
         BLOCK_EXPR@123..125
-          BLOCK@123..125
-            L_CURLY@123..124 "{"
-            R_CURLY@124..125 "}"
+          L_CURLY@123..124 "{"
+          R_CURLY@124..125 "}"
       WHITESPACE@125..126 "\n"
       R_CURLY@126..127 "}"
   WHITESPACE@127..128 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast

@@ -9,89 +9,88 @@ SOURCE_FILE@0..103
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..102
-      BLOCK@9..102
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        LET_STMT@15..33
-          LET_KW@15..18 "let"
-          WHITESPACE@18..19 " "
-          PATH_PAT@19..27
-            PATH@19..27
-              PATH@19..22
-                PATH_SEGMENT@19..22
-                  NAME_REF@19..22
-                    IDENT@19..22 "foo"
-              COLON2@22..24 "::"
-              PATH_SEGMENT@24..27
-                NAME_REF@24..27
-                  IDENT@24..27 "Bar"
-          WHITESPACE@27..28 " "
-          EQ@28..29 "="
-          WHITESPACE@29..30 " "
-          TUPLE_EXPR@30..32
-            L_PAREN@30..31 "("
-            R_PAREN@31..32 ")"
-          SEMICOLON@32..33 ";"
-        WHITESPACE@33..38 "\n    "
-        LET_STMT@38..53
-          LET_KW@38..41 "let"
-          WHITESPACE@41..42 " "
-          PATH_PAT@42..47
-            PATH@42..47
-              PATH_SEGMENT@42..47
-                COLON2@42..44 "::"
-                NAME_REF@44..47
-                  IDENT@44..47 "Bar"
-          WHITESPACE@47..48 " "
-          EQ@48..49 "="
-          WHITESPACE@49..50 " "
-          TUPLE_EXPR@50..52
-            L_PAREN@50..51 "("
-            R_PAREN@51..52 ")"
-          SEMICOLON@52..53 ";"
-        WHITESPACE@53..58 "\n    "
-        LET_STMT@58..78
-          LET_KW@58..61 "let"
-          WHITESPACE@61..62 " "
-          RECORD_PAT@62..72
-            PATH@62..65
-              PATH_SEGMENT@62..65
-                NAME_REF@62..65
-                  IDENT@62..65 "Bar"
-            WHITESPACE@65..66 " "
-            RECORD_FIELD_PAT_LIST@66..72
-              L_CURLY@66..67 "{"
-              WHITESPACE@67..68 " "
-              DOT2@68..70 ".."
-              WHITESPACE@70..71 " "
-              R_CURLY@71..72 "}"
-          WHITESPACE@72..73 " "
-          EQ@73..74 "="
-          WHITESPACE@74..75 " "
-          TUPLE_EXPR@75..77
-            L_PAREN@75..76 "("
-            R_PAREN@76..77 ")"
-          SEMICOLON@77..78 ";"
-        WHITESPACE@78..83 "\n    "
-        LET_STMT@83..100
-          LET_KW@83..86 "let"
-          WHITESPACE@86..87 " "
-          TUPLE_STRUCT_PAT@87..94
-            PATH@87..90
-              PATH_SEGMENT@87..90
-                NAME_REF@87..90
-                  IDENT@87..90 "Bar"
-            L_PAREN@90..91 "("
-            DOT_DOT_PAT@91..93
-              DOT2@91..93 ".."
-            R_PAREN@93..94 ")"
-          WHITESPACE@94..95 " "
-          EQ@95..96 "="
-          WHITESPACE@96..97 " "
-          TUPLE_EXPR@97..99
-            L_PAREN@97..98 "("
-            R_PAREN@98..99 ")"
-          SEMICOLON@99..100 ";"
-        WHITESPACE@100..101 "\n"
-        R_CURLY@101..102 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      LET_STMT@15..33
+        LET_KW@15..18 "let"
+        WHITESPACE@18..19 " "
+        PATH_PAT@19..27
+          PATH@19..27
+            PATH@19..22
+              PATH_SEGMENT@19..22
+                NAME_REF@19..22
+                  IDENT@19..22 "foo"
+            COLON2@22..24 "::"
+            PATH_SEGMENT@24..27
+              NAME_REF@24..27
+                IDENT@24..27 "Bar"
+        WHITESPACE@27..28 " "
+        EQ@28..29 "="
+        WHITESPACE@29..30 " "
+        TUPLE_EXPR@30..32
+          L_PAREN@30..31 "("
+          R_PAREN@31..32 ")"
+        SEMICOLON@32..33 ";"
+      WHITESPACE@33..38 "\n    "
+      LET_STMT@38..53
+        LET_KW@38..41 "let"
+        WHITESPACE@41..42 " "
+        PATH_PAT@42..47
+          PATH@42..47
+            PATH_SEGMENT@42..47
+              COLON2@42..44 "::"
+              NAME_REF@44..47
+                IDENT@44..47 "Bar"
+        WHITESPACE@47..48 " "
+        EQ@48..49 "="
+        WHITESPACE@49..50 " "
+        TUPLE_EXPR@50..52
+          L_PAREN@50..51 "("
+          R_PAREN@51..52 ")"
+        SEMICOLON@52..53 ";"
+      WHITESPACE@53..58 "\n    "
+      LET_STMT@58..78
+        LET_KW@58..61 "let"
+        WHITESPACE@61..62 " "
+        RECORD_PAT@62..72
+          PATH@62..65
+            PATH_SEGMENT@62..65
+              NAME_REF@62..65
+                IDENT@62..65 "Bar"
+          WHITESPACE@65..66 " "
+          RECORD_FIELD_PAT_LIST@66..72
+            L_CURLY@66..67 "{"
+            WHITESPACE@67..68 " "
+            DOT2@68..70 ".."
+            WHITESPACE@70..71 " "
+            R_CURLY@71..72 "}"
+        WHITESPACE@72..73 " "
+        EQ@73..74 "="
+        WHITESPACE@74..75 " "
+        TUPLE_EXPR@75..77
+          L_PAREN@75..76 "("
+          R_PAREN@76..77 ")"
+        SEMICOLON@77..78 ";"
+      WHITESPACE@78..83 "\n    "
+      LET_STMT@83..100
+        LET_KW@83..86 "let"
+        WHITESPACE@86..87 " "
+        TUPLE_STRUCT_PAT@87..94
+          PATH@87..90
+            PATH_SEGMENT@87..90
+              NAME_REF@87..90
+                IDENT@87..90 "Bar"
+          L_PAREN@90..91 "("
+          DOT_DOT_PAT@91..93
+            DOT2@91..93 ".."
+          R_PAREN@93..94 ")"
+        WHITESPACE@94..95 " "
+        EQ@95..96 "="
+        WHITESPACE@96..97 " "
+        TUPLE_EXPR@97..99
+          L_PAREN@97..98 "("
+          R_PAREN@98..99 ")"
+        SEMICOLON@99..100 ";"
+      WHITESPACE@100..101 "\n"
+      R_CURLY@101..102 "}"
   WHITESPACE@102..103 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast

@@ -9,18 +9,16 @@ SOURCE_FILE@0..26
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..25
-      BLOCK@9..25
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..23
-          LOOP_EXPR@15..22
-            LOOP_KW@15..19 "loop"
-            WHITESPACE@19..20 " "
-            BLOCK_EXPR@20..22
-              BLOCK@20..22
-                L_CURLY@20..21 "{"
-                R_CURLY@21..22 "}"
-          SEMICOLON@22..23 ";"
-        WHITESPACE@23..24 "\n"
-        R_CURLY@24..25 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..23
+        LOOP_EXPR@15..22
+          LOOP_KW@15..19 "loop"
+          WHITESPACE@19..20 " "
+          BLOCK_EXPR@20..22
+            L_CURLY@20..21 "{"
+            R_CURLY@21..22 "}"
+        SEMICOLON@22..23 ";"
+      WHITESPACE@23..24 "\n"
+      R_CURLY@24..25 "}"
   WHITESPACE@25..26 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast

@@ -9,52 +9,51 @@ SOURCE_FILE@0..48
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..47
-      BLOCK@9..47
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..21
-          FIELD_EXPR@15..20
-            PATH_EXPR@15..16
-              PATH@15..16
-                PATH_SEGMENT@15..16
-                  NAME_REF@15..16
-                    IDENT@15..16 "x"
-            DOT@16..17 "."
-            NAME_REF@17..20
-              IDENT@17..20 "foo"
-          SEMICOLON@20..21 ";"
-        WHITESPACE@21..26 "\n    "
-        EXPR_STMT@26..34
-          FIELD_EXPR@26..33
-            FIELD_EXPR@26..29
-              PATH_EXPR@26..27
-                PATH@26..27
-                  PATH_SEGMENT@26..27
-                    NAME_REF@26..27
-                      IDENT@26..27 "x"
-              DOT@27..28 "."
-              NAME_REF@28..29
-                INT_NUMBER@28..29 "0"
-            DOT@29..30 "."
-            NAME_REF@30..33
-              IDENT@30..33 "bar"
-          SEMICOLON@33..34 ";"
-        WHITESPACE@34..39 "\n    "
-        EXPR_STMT@39..45
-          CALL_EXPR@39..44
-            FIELD_EXPR@39..42
-              PATH_EXPR@39..40
-                PATH@39..40
-                  PATH_SEGMENT@39..40
-                    NAME_REF@39..40
-                      IDENT@39..40 "x"
-              DOT@40..41 "."
-              NAME_REF@41..42
-                INT_NUMBER@41..42 "0"
-            ARG_LIST@42..44
-              L_PAREN@42..43 "("
-              R_PAREN@43..44 ")"
-          SEMICOLON@44..45 ";"
-        WHITESPACE@45..46 "\n"
-        R_CURLY@46..47 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..21
+        FIELD_EXPR@15..20
+          PATH_EXPR@15..16
+            PATH@15..16
+              PATH_SEGMENT@15..16
+                NAME_REF@15..16
+                  IDENT@15..16 "x"
+          DOT@16..17 "."
+          NAME_REF@17..20
+            IDENT@17..20 "foo"
+        SEMICOLON@20..21 ";"
+      WHITESPACE@21..26 "\n    "
+      EXPR_STMT@26..34
+        FIELD_EXPR@26..33
+          FIELD_EXPR@26..29
+            PATH_EXPR@26..27
+              PATH@26..27
+                PATH_SEGMENT@26..27
+                  NAME_REF@26..27
+                    IDENT@26..27 "x"
+            DOT@27..28 "."
+            NAME_REF@28..29
+              INT_NUMBER@28..29 "0"
+          DOT@29..30 "."
+          NAME_REF@30..33
+            IDENT@30..33 "bar"
+        SEMICOLON@33..34 ";"
+      WHITESPACE@34..39 "\n    "
+      EXPR_STMT@39..45
+        CALL_EXPR@39..44
+          FIELD_EXPR@39..42
+            PATH_EXPR@39..40
+              PATH@39..40
+                PATH_SEGMENT@39..40
+                  NAME_REF@39..40
+                    IDENT@39..40 "x"
+            DOT@40..41 "."
+            NAME_REF@41..42
+              INT_NUMBER@41..42 "0"
+          ARG_LIST@42..44
+            L_PAREN@42..43 "("
+            R_PAREN@43..44 ")"
+        SEMICOLON@44..45 ";"
+      WHITESPACE@45..46 "\n"
+      R_CURLY@46..47 "}"
   WHITESPACE@47..48 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast

@@ -9,29 +9,27 @@ SOURCE_FILE@0..69
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..68
-      BLOCK@9..68
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        LOOP_EXPR@15..66
-          LOOP_KW@15..19 "loop"
-          WHITESPACE@19..20 " "
-          BLOCK_EXPR@20..66
-            BLOCK@20..66
-              L_CURLY@20..21 "{"
-              WHITESPACE@21..30 "\n        "
-              EXPR_STMT@30..39
-                CONTINUE_EXPR@30..38
-                  CONTINUE_KW@30..38 "continue"
-                SEMICOLON@38..39 ";"
-              WHITESPACE@39..48 "\n        "
-              EXPR_STMT@48..60
-                CONTINUE_EXPR@48..59
-                  CONTINUE_KW@48..56 "continue"
-                  WHITESPACE@56..57 " "
-                  LIFETIME@57..59 "\'l"
-                SEMICOLON@59..60 ";"
-              WHITESPACE@60..65 "\n    "
-              R_CURLY@65..66 "}"
-        WHITESPACE@66..67 "\n"
-        R_CURLY@67..68 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      LOOP_EXPR@15..66
+        LOOP_KW@15..19 "loop"
+        WHITESPACE@19..20 " "
+        BLOCK_EXPR@20..66
+          L_CURLY@20..21 "{"
+          WHITESPACE@21..30 "\n        "
+          EXPR_STMT@30..39
+            CONTINUE_EXPR@30..38
+              CONTINUE_KW@30..38 "continue"
+            SEMICOLON@38..39 ";"
+          WHITESPACE@39..48 "\n        "
+          EXPR_STMT@48..60
+            CONTINUE_EXPR@48..59
+              CONTINUE_KW@48..56 "continue"
+              WHITESPACE@56..57 " "
+              LIFETIME@57..59 "\'l"
+            SEMICOLON@59..60 ";"
+          WHITESPACE@60..65 "\n    "
+          R_CURLY@65..66 "}"
+      WHITESPACE@66..67 "\n"
+      R_CURLY@67..68 "}"
   WHITESPACE@68..69 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast

@@ -32,9 +32,8 @@ SOURCE_FILE@0..69
           R_PAREN@29..30 ")"
         WHITESPACE@30..31 " "
         BLOCK_EXPR@31..33
-          BLOCK@31..33
-            L_CURLY@31..32 "{"
-            R_CURLY@32..33 "}"
+          L_CURLY@31..32 "{"
+          R_CURLY@32..33 "}"
       WHITESPACE@33..38 "\n    "
       FN_DEF@38..66
         FN_KW@38..40 "fn"
@@ -66,9 +65,8 @@ SOURCE_FILE@0..69
           R_PAREN@62..63 ")"
         WHITESPACE@63..64 " "
         BLOCK_EXPR@64..66
-          BLOCK@64..66
-            L_CURLY@64..65 "{"
-            R_CURLY@65..66 "}"
+          L_CURLY@64..65 "{"
+          R_CURLY@65..66 "}"
       WHITESPACE@66..67 "\n"
       R_CURLY@67..68 "}"
   WHITESPACE@68..69 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast

@@ -9,37 +9,36 @@ SOURCE_FILE@0..44
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..43
-      BLOCK@9..43
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..20
-          PREFIX_EXPR@15..19
-            STAR@15..16 "*"
-            PREFIX_EXPR@16..19
-              STAR@16..17 "*"
-              REF_EXPR@17..19
-                AMP@17..18 "&"
-                LITERAL@18..19
-                  INT_NUMBER@18..19 "1"
-          SEMICOLON@19..20 ";"
-        WHITESPACE@20..25 "\n    "
-        EXPR_STMT@25..32
-          PREFIX_EXPR@25..31
-            BANG@25..26 "!"
-            PREFIX_EXPR@26..31
-              BANG@26..27 "!"
-              LITERAL@27..31
-                TRUE_KW@27..31 "true"
-          SEMICOLON@31..32 ";"
-        WHITESPACE@32..37 "\n    "
-        EXPR_STMT@37..41
-          PREFIX_EXPR@37..40
-            MINUS@37..38 "-"
-            PREFIX_EXPR@38..40
-              MINUS@38..39 "-"
-              LITERAL@39..40
-                INT_NUMBER@39..40 "1"
-          SEMICOLON@40..41 ";"
-        WHITESPACE@41..42 "\n"
-        R_CURLY@42..43 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..20
+        PREFIX_EXPR@15..19
+          STAR@15..16 "*"
+          PREFIX_EXPR@16..19
+            STAR@16..17 "*"
+            REF_EXPR@17..19
+              AMP@17..18 "&"
+              LITERAL@18..19
+                INT_NUMBER@18..19 "1"
+        SEMICOLON@19..20 ";"
+      WHITESPACE@20..25 "\n    "
+      EXPR_STMT@25..32
+        PREFIX_EXPR@25..31
+          BANG@25..26 "!"
+          PREFIX_EXPR@26..31
+            BANG@26..27 "!"
+            LITERAL@27..31
+              TRUE_KW@27..31 "true"
+        SEMICOLON@31..32 ";"
+      WHITESPACE@32..37 "\n    "
+      EXPR_STMT@37..41
+        PREFIX_EXPR@37..40
+          MINUS@37..38 "-"
+          PREFIX_EXPR@38..40
+            MINUS@38..39 "-"
+            LITERAL@39..40
+              INT_NUMBER@39..40 "1"
+        SEMICOLON@40..41 ";"
+      WHITESPACE@41..42 "\n"
+      R_CURLY@42..43 "}"
   WHITESPACE@43..44 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast

@@ -55,9 +55,8 @@ SOURCE_FILE@0..89
           R_PAREN@61..62 ")"
         WHITESPACE@62..63 " "
         BLOCK_EXPR@63..65
-          BLOCK@63..65
-            L_CURLY@63..64 "{"
-            R_CURLY@64..65 "}"
+          L_CURLY@63..64 "{"
+          R_CURLY@64..65 "}"
       WHITESPACE@65..70 "\n    "
       FN_DEF@70..86
         FN_KW@70..72 "fn"
@@ -72,9 +71,8 @@ SOURCE_FILE@0..89
           R_PAREN@82..83 ")"
         WHITESPACE@83..84 " "
         BLOCK_EXPR@84..86
-          BLOCK@84..86
-            L_CURLY@84..85 "{"
-            R_CURLY@85..86 "}"
+          L_CURLY@84..85 "{"
+          R_CURLY@85..86 "}"
       WHITESPACE@86..87 "\n"
       R_CURLY@87..88 "}"
   WHITESPACE@88..89 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast

@@ -9,34 +9,33 @@ SOURCE_FILE@0..39
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     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 " "
-            DOT_DOT_PAT@27..29
-              DOT2@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 "]"
-          SEMICOLON@35..36 ";"
-        WHITESPACE@36..37 "\n"
-        R_CURLY@37..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 " "
+          DOT_DOT_PAT@27..29
+            DOT2@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 "]"
+        SEMICOLON@35..36 ";"
+      WHITESPACE@36..37 "\n"
+      R_CURLY@37..38 "}"
   WHITESPACE@38..39 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast

@@ -9,97 +9,96 @@ SOURCE_FILE@0..97
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..96
-      BLOCK@9..96
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        LET_STMT@15..28
-          LET_KW@15..18 "let"
-          WHITESPACE@18..19 " "
-          TUPLE_STRUCT_PAT@19..22
-            PATH@19..20
-              PATH_SEGMENT@19..20
-                NAME_REF@19..20
-                  IDENT@19..20 "S"
-            L_PAREN@20..21 "("
-            R_PAREN@21..22 ")"
-          WHITESPACE@22..23 " "
-          EQ@23..24 "="
-          WHITESPACE@24..25 " "
-          TUPLE_EXPR@25..27
-            L_PAREN@25..26 "("
-            R_PAREN@26..27 ")"
-          SEMICOLON@27..28 ";"
-        WHITESPACE@28..33 "\n    "
-        LET_STMT@33..47
-          LET_KW@33..36 "let"
-          WHITESPACE@36..37 " "
-          TUPLE_STRUCT_PAT@37..41
-            PATH@37..38
-              PATH_SEGMENT@37..38
-                NAME_REF@37..38
-                  IDENT@37..38 "S"
-            L_PAREN@38..39 "("
-            PLACEHOLDER_PAT@39..40
-              UNDERSCORE@39..40 "_"
-            R_PAREN@40..41 ")"
-          WHITESPACE@41..42 " "
-          EQ@42..43 "="
-          WHITESPACE@43..44 " "
-          TUPLE_EXPR@44..46
-            L_PAREN@44..45 "("
-            R_PAREN@45..46 ")"
-          SEMICOLON@46..47 ";"
-        WHITESPACE@47..52 "\n    "
-        LET_STMT@52..67
-          LET_KW@52..55 "let"
-          WHITESPACE@55..56 " "
-          TUPLE_STRUCT_PAT@56..61
-            PATH@56..57
-              PATH_SEGMENT@56..57
-                NAME_REF@56..57
-                  IDENT@56..57 "S"
-            L_PAREN@57..58 "("
-            PLACEHOLDER_PAT@58..59
-              UNDERSCORE@58..59 "_"
-            COMMA@59..60 ","
-            R_PAREN@60..61 ")"
-          WHITESPACE@61..62 " "
-          EQ@62..63 "="
-          WHITESPACE@63..64 " "
-          TUPLE_EXPR@64..66
-            L_PAREN@64..65 "("
-            R_PAREN@65..66 ")"
-          SEMICOLON@66..67 ";"
-        WHITESPACE@67..72 "\n    "
-        LET_STMT@72..94
-          LET_KW@72..75 "let"
-          WHITESPACE@75..76 " "
-          TUPLE_STRUCT_PAT@76..88
-            PATH@76..77
-              PATH_SEGMENT@76..77
-                NAME_REF@76..77
-                  IDENT@76..77 "S"
-            L_PAREN@77..78 "("
-            PLACEHOLDER_PAT@78..79
-              UNDERSCORE@78..79 "_"
-            COMMA@79..80 ","
-            WHITESPACE@80..81 " "
-            DOT_DOT_PAT@81..83
-              DOT2@81..83 ".."
-            WHITESPACE@83..84 " "
-            COMMA@84..85 ","
-            WHITESPACE@85..86 " "
-            BIND_PAT@86..87
-              NAME@86..87
-                IDENT@86..87 "x"
-            R_PAREN@87..88 ")"
-          WHITESPACE@88..89 " "
-          EQ@89..90 "="
-          WHITESPACE@90..91 " "
-          TUPLE_EXPR@91..93
-            L_PAREN@91..92 "("
-            R_PAREN@92..93 ")"
-          SEMICOLON@93..94 ";"
-        WHITESPACE@94..95 "\n"
-        R_CURLY@95..96 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      LET_STMT@15..28
+        LET_KW@15..18 "let"
+        WHITESPACE@18..19 " "
+        TUPLE_STRUCT_PAT@19..22
+          PATH@19..20
+            PATH_SEGMENT@19..20
+              NAME_REF@19..20
+                IDENT@19..20 "S"
+          L_PAREN@20..21 "("
+          R_PAREN@21..22 ")"
+        WHITESPACE@22..23 " "
+        EQ@23..24 "="
+        WHITESPACE@24..25 " "
+        TUPLE_EXPR@25..27
+          L_PAREN@25..26 "("
+          R_PAREN@26..27 ")"
+        SEMICOLON@27..28 ";"
+      WHITESPACE@28..33 "\n    "
+      LET_STMT@33..47
+        LET_KW@33..36 "let"
+        WHITESPACE@36..37 " "
+        TUPLE_STRUCT_PAT@37..41
+          PATH@37..38
+            PATH_SEGMENT@37..38
+              NAME_REF@37..38
+                IDENT@37..38 "S"
+          L_PAREN@38..39 "("
+          PLACEHOLDER_PAT@39..40
+            UNDERSCORE@39..40 "_"
+          R_PAREN@40..41 ")"
+        WHITESPACE@41..42 " "
+        EQ@42..43 "="
+        WHITESPACE@43..44 " "
+        TUPLE_EXPR@44..46
+          L_PAREN@44..45 "("
+          R_PAREN@45..46 ")"
+        SEMICOLON@46..47 ";"
+      WHITESPACE@47..52 "\n    "
+      LET_STMT@52..67
+        LET_KW@52..55 "let"
+        WHITESPACE@55..56 " "
+        TUPLE_STRUCT_PAT@56..61
+          PATH@56..57
+            PATH_SEGMENT@56..57
+              NAME_REF@56..57
+                IDENT@56..57 "S"
+          L_PAREN@57..58 "("
+          PLACEHOLDER_PAT@58..59
+            UNDERSCORE@58..59 "_"
+          COMMA@59..60 ","
+          R_PAREN@60..61 ")"
+        WHITESPACE@61..62 " "
+        EQ@62..63 "="
+        WHITESPACE@63..64 " "
+        TUPLE_EXPR@64..66
+          L_PAREN@64..65 "("
+          R_PAREN@65..66 ")"
+        SEMICOLON@66..67 ";"
+      WHITESPACE@67..72 "\n    "
+      LET_STMT@72..94
+        LET_KW@72..75 "let"
+        WHITESPACE@75..76 " "
+        TUPLE_STRUCT_PAT@76..88
+          PATH@76..77
+            PATH_SEGMENT@76..77
+              NAME_REF@76..77
+                IDENT@76..77 "S"
+          L_PAREN@77..78 "("
+          PLACEHOLDER_PAT@78..79
+            UNDERSCORE@78..79 "_"
+          COMMA@79..80 ","
+          WHITESPACE@80..81 " "
+          DOT_DOT_PAT@81..83
+            DOT2@81..83 ".."
+          WHITESPACE@83..84 " "
+          COMMA@84..85 ","
+          WHITESPACE@85..86 " "
+          BIND_PAT@86..87
+            NAME@86..87
+              IDENT@86..87 "x"
+          R_PAREN@87..88 ")"
+        WHITESPACE@88..89 " "
+        EQ@89..90 "="
+        WHITESPACE@90..91 " "
+        TUPLE_EXPR@91..93
+          L_PAREN@91..92 "("
+          R_PAREN@92..93 ")"
+        SEMICOLON@93..94 ";"
+      WHITESPACE@94..95 "\n"
+      R_CURLY@95..96 "}"
   WHITESPACE@96..97 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast

@@ -9,42 +9,41 @@ SOURCE_FILE@0..52
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..51
-      BLOCK@10..51
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        LET_STMT@16..28
-          LET_KW@16..19 "let"
-          WHITESPACE@19..20 " "
-          REF_PAT@20..22
-            AMP@20..21 "&"
-            BIND_PAT@21..22
-              NAME@21..22
-                IDENT@21..22 "a"
-          WHITESPACE@22..23 " "
-          EQ@23..24 "="
-          WHITESPACE@24..25 " "
-          TUPLE_EXPR@25..27
-            L_PAREN@25..26 "("
-            R_PAREN@26..27 ")"
-          SEMICOLON@27..28 ";"
-        WHITESPACE@28..33 "\n    "
-        LET_STMT@33..49
-          LET_KW@33..36 "let"
-          WHITESPACE@36..37 " "
-          REF_PAT@37..43
-            AMP@37..38 "&"
-            MUT_KW@38..41 "mut"
-            WHITESPACE@41..42 " "
-            BIND_PAT@42..43
-              NAME@42..43
-                IDENT@42..43 "b"
-          WHITESPACE@43..44 " "
-          EQ@44..45 "="
-          WHITESPACE@45..46 " "
-          TUPLE_EXPR@46..48
-            L_PAREN@46..47 "("
-            R_PAREN@47..48 ")"
-          SEMICOLON@48..49 ";"
-        WHITESPACE@49..50 "\n"
-        R_CURLY@50..51 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      LET_STMT@16..28
+        LET_KW@16..19 "let"
+        WHITESPACE@19..20 " "
+        REF_PAT@20..22
+          AMP@20..21 "&"
+          BIND_PAT@21..22
+            NAME@21..22
+              IDENT@21..22 "a"
+        WHITESPACE@22..23 " "
+        EQ@23..24 "="
+        WHITESPACE@24..25 " "
+        TUPLE_EXPR@25..27
+          L_PAREN@25..26 "("
+          R_PAREN@26..27 ")"
+        SEMICOLON@27..28 ";"
+      WHITESPACE@28..33 "\n    "
+      LET_STMT@33..49
+        LET_KW@33..36 "let"
+        WHITESPACE@36..37 " "
+        REF_PAT@37..43
+          AMP@37..38 "&"
+          MUT_KW@38..41 "mut"
+          WHITESPACE@41..42 " "
+          BIND_PAT@42..43
+            NAME@42..43
+              IDENT@42..43 "b"
+        WHITESPACE@43..44 " "
+        EQ@44..45 "="
+        WHITESPACE@45..46 " "
+        TUPLE_EXPR@46..48
+          L_PAREN@46..47 "("
+          R_PAREN@47..48 ")"
+        SEMICOLON@48..49 ";"
+      WHITESPACE@49..50 "\n"
+      R_CURLY@50..51 "}"
   WHITESPACE@51..52 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast

@@ -9,82 +9,81 @@ SOURCE_FILE@0..89
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..88
-      BLOCK@9..88
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..25
-          CAST_EXPR@15..24
-            LITERAL@15..17
-              INT_NUMBER@15..17 "82"
-            WHITESPACE@17..18 " "
-            AS_KW@18..20 "as"
-            WHITESPACE@20..21 " "
-            PATH_TYPE@21..24
-              PATH@21..24
-                PATH_SEGMENT@21..24
-                  NAME_REF@21..24
-                    IDENT@21..24 "i32"
-          SEMICOLON@24..25 ";"
-        WHITESPACE@25..30 "\n    "
-        EXPR_STMT@30..43
-          BIN_EXPR@30..42
-            CAST_EXPR@30..38
-              LITERAL@30..32
-                INT_NUMBER@30..32 "81"
-              WHITESPACE@32..33 " "
-              AS_KW@33..35 "as"
-              WHITESPACE@35..36 " "
-              PATH_TYPE@36..38
-                PATH@36..38
-                  PATH_SEGMENT@36..38
-                    NAME_REF@36..38
-                      IDENT@36..38 "i8"
-            WHITESPACE@38..39 " "
-            PLUS@39..40 "+"
-            WHITESPACE@40..41 " "
-            LITERAL@41..42
-              INT_NUMBER@41..42 "1"
-          SEMICOLON@42..43 ";"
-        WHITESPACE@43..48 "\n    "
-        EXPR_STMT@48..62
-          BIN_EXPR@48..61
-            CAST_EXPR@48..57
-              LITERAL@48..50
-                INT_NUMBER@48..50 "79"
-              WHITESPACE@50..51 " "
-              AS_KW@51..53 "as"
-              WHITESPACE@53..54 " "
-              PATH_TYPE@54..57
-                PATH@54..57
-                  PATH_SEGMENT@54..57
-                    NAME_REF@54..57
-                      IDENT@54..57 "i16"
-            WHITESPACE@57..58 " "
-            MINUS@58..59 "-"
-            WHITESPACE@59..60 " "
-            LITERAL@60..61
-              INT_NUMBER@60..61 "1"
-          SEMICOLON@61..62 ";"
-        WHITESPACE@62..67 "\n    "
-        EXPR_STMT@67..86
-          BIN_EXPR@67..85
-            CAST_EXPR@67..77
-              LITERAL@67..71
-                INT_NUMBER@67..71 "0x36"
-              WHITESPACE@71..72 " "
-              AS_KW@72..74 "as"
-              WHITESPACE@74..75 " "
-              PATH_TYPE@75..77
-                PATH@75..77
-                  PATH_SEGMENT@75..77
-                    NAME_REF@75..77
-                      IDENT@75..77 "u8"
-            WHITESPACE@77..78 " "
-            LTEQ@78..80 "<="
-            WHITESPACE@80..81 " "
-            LITERAL@81..85
-              INT_NUMBER@81..85 "0x37"
-          SEMICOLON@85..86 ";"
-        WHITESPACE@86..87 "\n"
-        R_CURLY@87..88 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..25
+        CAST_EXPR@15..24
+          LITERAL@15..17
+            INT_NUMBER@15..17 "82"
+          WHITESPACE@17..18 " "
+          AS_KW@18..20 "as"
+          WHITESPACE@20..21 " "
+          PATH_TYPE@21..24
+            PATH@21..24
+              PATH_SEGMENT@21..24
+                NAME_REF@21..24
+                  IDENT@21..24 "i32"
+        SEMICOLON@24..25 ";"
+      WHITESPACE@25..30 "\n    "
+      EXPR_STMT@30..43
+        BIN_EXPR@30..42
+          CAST_EXPR@30..38
+            LITERAL@30..32
+              INT_NUMBER@30..32 "81"
+            WHITESPACE@32..33 " "
+            AS_KW@33..35 "as"
+            WHITESPACE@35..36 " "
+            PATH_TYPE@36..38
+              PATH@36..38
+                PATH_SEGMENT@36..38
+                  NAME_REF@36..38
+                    IDENT@36..38 "i8"
+          WHITESPACE@38..39 " "
+          PLUS@39..40 "+"
+          WHITESPACE@40..41 " "
+          LITERAL@41..42
+            INT_NUMBER@41..42 "1"
+        SEMICOLON@42..43 ";"
+      WHITESPACE@43..48 "\n    "
+      EXPR_STMT@48..62
+        BIN_EXPR@48..61
+          CAST_EXPR@48..57
+            LITERAL@48..50
+              INT_NUMBER@48..50 "79"
+            WHITESPACE@50..51 " "
+            AS_KW@51..53 "as"
+            WHITESPACE@53..54 " "
+            PATH_TYPE@54..57
+              PATH@54..57
+                PATH_SEGMENT@54..57
+                  NAME_REF@54..57
+                    IDENT@54..57 "i16"
+          WHITESPACE@57..58 " "
+          MINUS@58..59 "-"
+          WHITESPACE@59..60 " "
+          LITERAL@60..61
+            INT_NUMBER@60..61 "1"
+        SEMICOLON@61..62 ";"
+      WHITESPACE@62..67 "\n    "
+      EXPR_STMT@67..86
+        BIN_EXPR@67..85
+          CAST_EXPR@67..77
+            LITERAL@67..71
+              INT_NUMBER@67..71 "0x36"
+            WHITESPACE@71..72 " "
+            AS_KW@72..74 "as"
+            WHITESPACE@74..75 " "
+            PATH_TYPE@75..77
+              PATH@75..77
+                PATH_SEGMENT@75..77
+                  NAME_REF@75..77
+                    IDENT@75..77 "u8"
+          WHITESPACE@77..78 " "
+          LTEQ@78..80 "<="
+          WHITESPACE@80..81 " "
+          LITERAL@81..85
+            INT_NUMBER@81..85 "0x37"
+        SEMICOLON@85..86 ";"
+      WHITESPACE@86..87 "\n"
+      R_CURLY@87..88 "}"
   WHITESPACE@88..89 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast

@@ -9,39 +9,37 @@ SOURCE_FILE@0..197
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..37
-      BLOCK@9..37
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..11 " "
-        IF_EXPR@11..35
-          IF_KW@11..13 "if"
-          WHITESPACE@13..14 " "
-          CONDITION@14..32
-            LET_KW@14..17 "let"
-            WHITESPACE@17..18 " "
-            TUPLE_STRUCT_PAT@18..25
-              PATH@18..22
-                PATH_SEGMENT@18..22
-                  NAME_REF@18..22
-                    IDENT@18..22 "Some"
-              L_PAREN@22..23 "("
-              PLACEHOLDER_PAT@23..24
-                UNDERSCORE@23..24 "_"
-              R_PAREN@24..25 ")"
-            WHITESPACE@25..26 " "
-            EQ@26..27 "="
-            WHITESPACE@27..28 " "
-            PATH_EXPR@28..32
-              PATH@28..32
-                PATH_SEGMENT@28..32
-                  NAME_REF@28..32
-                    IDENT@28..32 "None"
-          WHITESPACE@32..33 " "
-          BLOCK_EXPR@33..35
-            BLOCK@33..35
-              L_CURLY@33..34 "{"
-              R_CURLY@34..35 "}"
-        WHITESPACE@35..36 " "
-        R_CURLY@36..37 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..11 " "
+      IF_EXPR@11..35
+        IF_KW@11..13 "if"
+        WHITESPACE@13..14 " "
+        CONDITION@14..32
+          LET_KW@14..17 "let"
+          WHITESPACE@17..18 " "
+          TUPLE_STRUCT_PAT@18..25
+            PATH@18..22
+              PATH_SEGMENT@18..22
+                NAME_REF@18..22
+                  IDENT@18..22 "Some"
+            L_PAREN@22..23 "("
+            PLACEHOLDER_PAT@23..24
+              UNDERSCORE@23..24 "_"
+            R_PAREN@24..25 ")"
+          WHITESPACE@25..26 " "
+          EQ@26..27 "="
+          WHITESPACE@27..28 " "
+          PATH_EXPR@28..32
+            PATH@28..32
+              PATH_SEGMENT@28..32
+                NAME_REF@28..32
+                  IDENT@28..32 "None"
+        WHITESPACE@32..33 " "
+        BLOCK_EXPR@33..35
+          L_CURLY@33..34 "{"
+          R_CURLY@34..35 "}"
+      WHITESPACE@35..36 " "
+      R_CURLY@36..37 "}"
   WHITESPACE@37..38 "\n"
   FN_DEF@38..196
     FN_KW@38..40 "fn"
@@ -53,157 +51,152 @@ SOURCE_FILE@0..197
       R_PAREN@45..46 ")"
     WHITESPACE@46..47 " "
     BLOCK_EXPR@47..196
-      BLOCK@47..196
-        L_CURLY@47..48 "{"
-        WHITESPACE@48..53 "\n    "
-        EXPR_STMT@53..87
-          IF_EXPR@53..87
-            IF_KW@53..55 "if"
-            WHITESPACE@55..56 " "
-            CONDITION@56..84
-              LET_KW@56..59 "let"
-              WHITESPACE@59..60 " "
-              OR_PAT@60..77
-                TUPLE_STRUCT_PAT@60..67
-                  PATH@60..64
-                    PATH_SEGMENT@60..64
-                      NAME_REF@60..64
-                        IDENT@60..64 "Some"
-                  L_PAREN@64..65 "("
-                  PLACEHOLDER_PAT@65..66
-                    UNDERSCORE@65..66 "_"
-                  R_PAREN@66..67 ")"
-                WHITESPACE@67..68 " "
-                PIPE@68..69 "|"
-                WHITESPACE@69..70 " "
-                TUPLE_STRUCT_PAT@70..77
-                  PATH@70..74
-                    PATH_SEGMENT@70..74
-                      NAME_REF@70..74
-                        IDENT@70..74 "Some"
-                  L_PAREN@74..75 "("
-                  PLACEHOLDER_PAT@75..76
-                    UNDERSCORE@75..76 "_"
-                  R_PAREN@76..77 ")"
-              WHITESPACE@77..78 " "
-              EQ@78..79 "="
-              WHITESPACE@79..80 " "
-              PATH_EXPR@80..84
-                PATH@80..84
-                  PATH_SEGMENT@80..84
-                    NAME_REF@80..84
-                      IDENT@80..84 "None"
-            WHITESPACE@84..85 " "
-            BLOCK_EXPR@85..87
-              BLOCK@85..87
-                L_CURLY@85..86 "{"
-                R_CURLY@86..87 "}"
-        WHITESPACE@87..92 "\n    "
-        EXPR_STMT@92..118
-          IF_EXPR@92..118
-            IF_KW@92..94 "if"
-            WHITESPACE@94..95 " "
-            CONDITION@95..115
-              LET_KW@95..98 "let"
-              WHITESPACE@98..99 " "
-              PIPE@99..100 "|"
-              WHITESPACE@100..101 " "
-              TUPLE_STRUCT_PAT@101..108
-                PATH@101..105
-                  PATH_SEGMENT@101..105
-                    NAME_REF@101..105
-                      IDENT@101..105 "Some"
-                L_PAREN@105..106 "("
-                PLACEHOLDER_PAT@106..107
-                  UNDERSCORE@106..107 "_"
-                R_PAREN@107..108 ")"
-              WHITESPACE@108..109 " "
-              EQ@109..110 "="
-              WHITESPACE@110..111 " "
-              PATH_EXPR@111..115
-                PATH@111..115
-                  PATH_SEGMENT@111..115
-                    NAME_REF@111..115
-                      IDENT@111..115 "None"
-            WHITESPACE@115..116 " "
-            BLOCK_EXPR@116..118
-              BLOCK@116..118
-                L_CURLY@116..117 "{"
-                R_CURLY@117..118 "}"
-        WHITESPACE@118..123 "\n    "
-        EXPR_STMT@123..160
-          WHILE_EXPR@123..160
-            WHILE_KW@123..128 "while"
-            WHITESPACE@128..129 " "
-            CONDITION@129..157
-              LET_KW@129..132 "let"
-              WHITESPACE@132..133 " "
-              OR_PAT@133..150
-                TUPLE_STRUCT_PAT@133..140
-                  PATH@133..137
-                    PATH_SEGMENT@133..137
-                      NAME_REF@133..137
-                        IDENT@133..137 "Some"
-                  L_PAREN@137..138 "("
-                  PLACEHOLDER_PAT@138..139
-                    UNDERSCORE@138..139 "_"
-                  R_PAREN@139..140 ")"
-                WHITESPACE@140..141 " "
-                PIPE@141..142 "|"
-                WHITESPACE@142..143 " "
-                TUPLE_STRUCT_PAT@143..150
-                  PATH@143..147
-                    PATH_SEGMENT@143..147
-                      NAME_REF@143..147
-                        IDENT@143..147 "Some"
-                  L_PAREN@147..148 "("
-                  PLACEHOLDER_PAT@148..149
-                    UNDERSCORE@148..149 "_"
-                  R_PAREN@149..150 ")"
-              WHITESPACE@150..151 " "
-              EQ@151..152 "="
-              WHITESPACE@152..153 " "
-              PATH_EXPR@153..157
-                PATH@153..157
-                  PATH_SEGMENT@153..157
-                    NAME_REF@153..157
-                      IDENT@153..157 "None"
-            WHITESPACE@157..158 " "
-            BLOCK_EXPR@158..160
-              BLOCK@158..160
-                L_CURLY@158..159 "{"
-                R_CURLY@159..160 "}"
-        WHITESPACE@160..165 "\n    "
-        WHILE_EXPR@165..194
-          WHILE_KW@165..170 "while"
-          WHITESPACE@170..171 " "
-          CONDITION@171..191
-            LET_KW@171..174 "let"
-            WHITESPACE@174..175 " "
-            PIPE@175..176 "|"
-            WHITESPACE@176..177 " "
-            TUPLE_STRUCT_PAT@177..184
-              PATH@177..181
-                PATH_SEGMENT@177..181
-                  NAME_REF@177..181
-                    IDENT@177..181 "Some"
-              L_PAREN@181..182 "("
-              PLACEHOLDER_PAT@182..183
-                UNDERSCORE@182..183 "_"
-              R_PAREN@183..184 ")"
-            WHITESPACE@184..185 " "
-            EQ@185..186 "="
-            WHITESPACE@186..187 " "
-            PATH_EXPR@187..191
-              PATH@187..191
-                PATH_SEGMENT@187..191
-                  NAME_REF@187..191
-                    IDENT@187..191 "None"
-          WHITESPACE@191..192 " "
-          BLOCK_EXPR@192..194
-            BLOCK@192..194
-              L_CURLY@192..193 "{"
-              R_CURLY@193..194 "}"
-        WHITESPACE@194..195 "\n"
-        R_CURLY@195..196 "}"
+      L_CURLY@47..48 "{"
+      WHITESPACE@48..53 "\n    "
+      EXPR_STMT@53..87
+        IF_EXPR@53..87
+          IF_KW@53..55 "if"
+          WHITESPACE@55..56 " "
+          CONDITION@56..84
+            LET_KW@56..59 "let"
+            WHITESPACE@59..60 " "
+            OR_PAT@60..77
+              TUPLE_STRUCT_PAT@60..67
+                PATH@60..64
+                  PATH_SEGMENT@60..64
+                    NAME_REF@60..64
+                      IDENT@60..64 "Some"
+                L_PAREN@64..65 "("
+                PLACEHOLDER_PAT@65..66
+                  UNDERSCORE@65..66 "_"
+                R_PAREN@66..67 ")"
+              WHITESPACE@67..68 " "
+              PIPE@68..69 "|"
+              WHITESPACE@69..70 " "
+              TUPLE_STRUCT_PAT@70..77
+                PATH@70..74
+                  PATH_SEGMENT@70..74
+                    NAME_REF@70..74
+                      IDENT@70..74 "Some"
+                L_PAREN@74..75 "("
+                PLACEHOLDER_PAT@75..76
+                  UNDERSCORE@75..76 "_"
+                R_PAREN@76..77 ")"
+            WHITESPACE@77..78 " "
+            EQ@78..79 "="
+            WHITESPACE@79..80 " "
+            PATH_EXPR@80..84
+              PATH@80..84
+                PATH_SEGMENT@80..84
+                  NAME_REF@80..84
+                    IDENT@80..84 "None"
+          WHITESPACE@84..85 " "
+          BLOCK_EXPR@85..87
+            L_CURLY@85..86 "{"
+            R_CURLY@86..87 "}"
+      WHITESPACE@87..92 "\n    "
+      EXPR_STMT@92..118
+        IF_EXPR@92..118
+          IF_KW@92..94 "if"
+          WHITESPACE@94..95 " "
+          CONDITION@95..115
+            LET_KW@95..98 "let"
+            WHITESPACE@98..99 " "
+            PIPE@99..100 "|"
+            WHITESPACE@100..101 " "
+            TUPLE_STRUCT_PAT@101..108
+              PATH@101..105
+                PATH_SEGMENT@101..105
+                  NAME_REF@101..105
+                    IDENT@101..105 "Some"
+              L_PAREN@105..106 "("
+              PLACEHOLDER_PAT@106..107
+                UNDERSCORE@106..107 "_"
+              R_PAREN@107..108 ")"
+            WHITESPACE@108..109 " "
+            EQ@109..110 "="
+            WHITESPACE@110..111 " "
+            PATH_EXPR@111..115
+              PATH@111..115
+                PATH_SEGMENT@111..115
+                  NAME_REF@111..115
+                    IDENT@111..115 "None"
+          WHITESPACE@115..116 " "
+          BLOCK_EXPR@116..118
+            L_CURLY@116..117 "{"
+            R_CURLY@117..118 "}"
+      WHITESPACE@118..123 "\n    "
+      EXPR_STMT@123..160
+        WHILE_EXPR@123..160
+          WHILE_KW@123..128 "while"
+          WHITESPACE@128..129 " "
+          CONDITION@129..157
+            LET_KW@129..132 "let"
+            WHITESPACE@132..133 " "
+            OR_PAT@133..150
+              TUPLE_STRUCT_PAT@133..140
+                PATH@133..137
+                  PATH_SEGMENT@133..137
+                    NAME_REF@133..137
+                      IDENT@133..137 "Some"
+                L_PAREN@137..138 "("
+                PLACEHOLDER_PAT@138..139
+                  UNDERSCORE@138..139 "_"
+                R_PAREN@139..140 ")"
+              WHITESPACE@140..141 " "
+              PIPE@141..142 "|"
+              WHITESPACE@142..143 " "
+              TUPLE_STRUCT_PAT@143..150
+                PATH@143..147
+                  PATH_SEGMENT@143..147
+                    NAME_REF@143..147
+                      IDENT@143..147 "Some"
+                L_PAREN@147..148 "("
+                PLACEHOLDER_PAT@148..149
+                  UNDERSCORE@148..149 "_"
+                R_PAREN@149..150 ")"
+            WHITESPACE@150..151 " "
+            EQ@151..152 "="
+            WHITESPACE@152..153 " "
+            PATH_EXPR@153..157
+              PATH@153..157
+                PATH_SEGMENT@153..157
+                  NAME_REF@153..157
+                    IDENT@153..157 "None"
+          WHITESPACE@157..158 " "
+          BLOCK_EXPR@158..160
+            L_CURLY@158..159 "{"
+            R_CURLY@159..160 "}"
+      WHITESPACE@160..165 "\n    "
+      WHILE_EXPR@165..194
+        WHILE_KW@165..170 "while"
+        WHITESPACE@170..171 " "
+        CONDITION@171..191
+          LET_KW@171..174 "let"
+          WHITESPACE@174..175 " "
+          PIPE@175..176 "|"
+          WHITESPACE@176..177 " "
+          TUPLE_STRUCT_PAT@177..184
+            PATH@177..181
+              PATH_SEGMENT@177..181
+                NAME_REF@177..181
+                  IDENT@177..181 "Some"
+            L_PAREN@181..182 "("
+            PLACEHOLDER_PAT@182..183
+              UNDERSCORE@182..183 "_"
+            R_PAREN@183..184 ")"
+          WHITESPACE@184..185 " "
+          EQ@185..186 "="
+          WHITESPACE@186..187 " "
+          PATH_EXPR@187..191
+            PATH@187..191
+              PATH_SEGMENT@187..191
+                NAME_REF@187..191
+                  IDENT@187..191 "None"
+        WHITESPACE@191..192 " "
+        BLOCK_EXPR@192..194
+          L_CURLY@192..193 "{"
+          R_CURLY@193..194 "}"
+      WHITESPACE@194..195 "\n"
+      R_CURLY@195..196 "}"
   WHITESPACE@196..197 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast

@@ -9,81 +9,76 @@ SOURCE_FILE@0..93
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..92
-      BLOCK@9..92
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..29
-          WHILE_EXPR@15..28
-            WHILE_KW@15..20 "while"
-            WHITESPACE@20..21 " "
-            CONDITION@21..25
-              LITERAL@21..25
-                TRUE_KW@21..25 "true"
-            WHITESPACE@25..26 " "
-            BLOCK_EXPR@26..28
-              BLOCK@26..28
-                L_CURLY@26..27 "{"
-                R_CURLY@27..28 "}"
-          SEMICOLON@28..29 ";"
-        WHITESPACE@29..34 "\n    "
-        EXPR_STMT@34..67
-          WHILE_EXPR@34..66
-            WHILE_KW@34..39 "while"
-            WHITESPACE@39..40 " "
-            CONDITION@40..63
-              LET_KW@40..43 "let"
-              WHITESPACE@43..44 " "
-              TUPLE_STRUCT_PAT@44..51
-                PATH@44..48
-                  PATH_SEGMENT@44..48
-                    NAME_REF@44..48
-                      IDENT@44..48 "Some"
-                L_PAREN@48..49 "("
-                BIND_PAT@49..50
-                  NAME@49..50
-                    IDENT@49..50 "x"
-                R_PAREN@50..51 ")"
-              WHITESPACE@51..52 " "
-              EQ@52..53 "="
-              WHITESPACE@53..54 " "
-              METHOD_CALL_EXPR@54..63
-                PATH_EXPR@54..56
-                  PATH@54..56
-                    PATH_SEGMENT@54..56
-                      NAME_REF@54..56
-                        IDENT@54..56 "it"
-                DOT@56..57 "."
-                NAME_REF@57..61
-                  IDENT@57..61 "next"
-                ARG_LIST@61..63
-                  L_PAREN@61..62 "("
-                  R_PAREN@62..63 ")"
-            WHITESPACE@63..64 " "
-            BLOCK_EXPR@64..66
-              BLOCK@64..66
-                L_CURLY@64..65 "{"
-                R_CURLY@65..66 "}"
-          SEMICOLON@66..67 ";"
-        WHITESPACE@67..72 "\n    "
-        EXPR_STMT@72..90
-          WHILE_EXPR@72..89
-            WHILE_KW@72..77 "while"
-            WHITESPACE@77..78 " "
-            CONDITION@78..86
-              BLOCK_EXPR@78..86
-                BLOCK@78..86
-                  L_CURLY@78..79 "{"
-                  WHITESPACE@79..80 " "
-                  LITERAL@80..84
-                    TRUE_KW@80..84 "true"
-                  WHITESPACE@84..85 " "
-                  R_CURLY@85..86 "}"
-            WHITESPACE@86..87 " "
-            BLOCK_EXPR@87..89
-              BLOCK@87..89
-                L_CURLY@87..88 "{"
-                R_CURLY@88..89 "}"
-          SEMICOLON@89..90 ";"
-        WHITESPACE@90..91 "\n"
-        R_CURLY@91..92 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..29
+        WHILE_EXPR@15..28
+          WHILE_KW@15..20 "while"
+          WHITESPACE@20..21 " "
+          CONDITION@21..25
+            LITERAL@21..25
+              TRUE_KW@21..25 "true"
+          WHITESPACE@25..26 " "
+          BLOCK_EXPR@26..28
+            L_CURLY@26..27 "{"
+            R_CURLY@27..28 "}"
+        SEMICOLON@28..29 ";"
+      WHITESPACE@29..34 "\n    "
+      EXPR_STMT@34..67
+        WHILE_EXPR@34..66
+          WHILE_KW@34..39 "while"
+          WHITESPACE@39..40 " "
+          CONDITION@40..63
+            LET_KW@40..43 "let"
+            WHITESPACE@43..44 " "
+            TUPLE_STRUCT_PAT@44..51
+              PATH@44..48
+                PATH_SEGMENT@44..48
+                  NAME_REF@44..48
+                    IDENT@44..48 "Some"
+              L_PAREN@48..49 "("
+              BIND_PAT@49..50
+                NAME@49..50
+                  IDENT@49..50 "x"
+              R_PAREN@50..51 ")"
+            WHITESPACE@51..52 " "
+            EQ@52..53 "="
+            WHITESPACE@53..54 " "
+            METHOD_CALL_EXPR@54..63
+              PATH_EXPR@54..56
+                PATH@54..56
+                  PATH_SEGMENT@54..56
+                    NAME_REF@54..56
+                      IDENT@54..56 "it"
+              DOT@56..57 "."
+              NAME_REF@57..61
+                IDENT@57..61 "next"
+              ARG_LIST@61..63
+                L_PAREN@61..62 "("
+                R_PAREN@62..63 ")"
+          WHITESPACE@63..64 " "
+          BLOCK_EXPR@64..66
+            L_CURLY@64..65 "{"
+            R_CURLY@65..66 "}"
+        SEMICOLON@66..67 ";"
+      WHITESPACE@67..72 "\n    "
+      EXPR_STMT@72..90
+        WHILE_EXPR@72..89
+          WHILE_KW@72..77 "while"
+          WHITESPACE@77..78 " "
+          CONDITION@78..86
+            BLOCK_EXPR@78..86
+              L_CURLY@78..79 "{"
+              WHITESPACE@79..80 " "
+              LITERAL@80..84
+                TRUE_KW@80..84 "true"
+              WHITESPACE@84..85 " "
+              R_CURLY@85..86 "}"
+          WHITESPACE@86..87 " "
+          BLOCK_EXPR@87..89
+            L_CURLY@87..88 "{"
+            R_CURLY@88..89 "}"
+        SEMICOLON@89..90 ";"
+      WHITESPACE@90..91 "\n"
+      R_CURLY@91..92 "}"
   WHITESPACE@92..93 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast

@@ -9,47 +9,45 @@ SOURCE_FILE@0..102
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..101
-      BLOCK@9..101
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        LOOP_EXPR@15..99
-          LOOP_KW@15..19 "loop"
-          WHITESPACE@19..20 " "
-          BLOCK_EXPR@20..99
-            BLOCK@20..99
-              L_CURLY@20..21 "{"
-              WHITESPACE@21..30 "\n        "
-              EXPR_STMT@30..36
-                BREAK_EXPR@30..35
-                  BREAK_KW@30..35 "break"
-                SEMICOLON@35..36 ";"
-              WHITESPACE@36..45 "\n        "
-              EXPR_STMT@45..54
-                BREAK_EXPR@45..53
-                  BREAK_KW@45..50 "break"
-                  WHITESPACE@50..51 " "
-                  LIFETIME@51..53 "\'l"
-                SEMICOLON@53..54 ";"
-              WHITESPACE@54..63 "\n        "
-              EXPR_STMT@63..72
-                BREAK_EXPR@63..71
-                  BREAK_KW@63..68 "break"
-                  WHITESPACE@68..69 " "
-                  LITERAL@69..71
-                    INT_NUMBER@69..71 "92"
-                SEMICOLON@71..72 ";"
-              WHITESPACE@72..81 "\n        "
-              EXPR_STMT@81..93
-                BREAK_EXPR@81..92
-                  BREAK_KW@81..86 "break"
-                  WHITESPACE@86..87 " "
-                  LIFETIME@87..89 "\'l"
-                  WHITESPACE@89..90 " "
-                  LITERAL@90..92
-                    INT_NUMBER@90..92 "92"
-                SEMICOLON@92..93 ";"
-              WHITESPACE@93..98 "\n    "
-              R_CURLY@98..99 "}"
-        WHITESPACE@99..100 "\n"
-        R_CURLY@100..101 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      LOOP_EXPR@15..99
+        LOOP_KW@15..19 "loop"
+        WHITESPACE@19..20 " "
+        BLOCK_EXPR@20..99
+          L_CURLY@20..21 "{"
+          WHITESPACE@21..30 "\n        "
+          EXPR_STMT@30..36
+            BREAK_EXPR@30..35
+              BREAK_KW@30..35 "break"
+            SEMICOLON@35..36 ";"
+          WHITESPACE@36..45 "\n        "
+          EXPR_STMT@45..54
+            BREAK_EXPR@45..53
+              BREAK_KW@45..50 "break"
+              WHITESPACE@50..51 " "
+              LIFETIME@51..53 "\'l"
+            SEMICOLON@53..54 ";"
+          WHITESPACE@54..63 "\n        "
+          EXPR_STMT@63..72
+            BREAK_EXPR@63..71
+              BREAK_KW@63..68 "break"
+              WHITESPACE@68..69 " "
+              LITERAL@69..71
+                INT_NUMBER@69..71 "92"
+            SEMICOLON@71..72 ";"
+          WHITESPACE@72..81 "\n        "
+          EXPR_STMT@81..93
+            BREAK_EXPR@81..92
+              BREAK_KW@81..86 "break"
+              WHITESPACE@86..87 " "
+              LIFETIME@87..89 "\'l"
+              WHITESPACE@89..90 " "
+              LITERAL@90..92
+                INT_NUMBER@90..92 "92"
+            SEMICOLON@92..93 ";"
+          WHITESPACE@93..98 "\n    "
+          R_CURLY@98..99 "}"
+      WHITESPACE@99..100 "\n"
+      R_CURLY@100..101 "}"
   WHITESPACE@101..102 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast

@@ -16,7 +16,6 @@ SOURCE_FILE@0..30
       R_PAREN@25..26 ")"
     WHITESPACE@26..27 " "
     BLOCK_EXPR@27..29
-      BLOCK@27..29
-        L_CURLY@27..28 "{"
-        R_CURLY@28..29 "}"
+      L_CURLY@27..28 "{"
+      R_CURLY@28..29 "}"
   WHITESPACE@29..30 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast

@@ -42,38 +42,37 @@ SOURCE_FILE@0..71
       R_PAREN@34..35 ")"
     WHITESPACE@35..36 " "
     BLOCK_EXPR@36..70
-      BLOCK@36..70
-        L_CURLY@36..37 "{"
-        WHITESPACE@37..38 " "
-        EXPR_STMT@38..68
-          CALL_EXPR@38..67
-            PATH_EXPR@38..65
-              PATH@38..65
-                PATH@38..56
-                  PATH_SEGMENT@38..56
-                    L_ANGLE@38..39 "<"
-                    PATH_TYPE@39..44
-                      PATH@39..44
-                        PATH_SEGMENT@39..44
-                          NAME_REF@39..44
-                            IDENT@39..44 "usize"
-                    WHITESPACE@44..45 " "
-                    AS_KW@45..47 "as"
-                    WHITESPACE@47..48 " "
-                    PATH_TYPE@48..55
-                      PATH@48..55
-                        PATH_SEGMENT@48..55
-                          NAME_REF@48..55
-                            IDENT@48..55 "Default"
-                    R_ANGLE@55..56 ">"
-                COLON2@56..58 "::"
-                PATH_SEGMENT@58..65
-                  NAME_REF@58..65
-                    IDENT@58..65 "default"
-            ARG_LIST@65..67
-              L_PAREN@65..66 "("
-              R_PAREN@66..67 ")"
-          SEMICOLON@67..68 ";"
-        WHITESPACE@68..69 " "
-        R_CURLY@69..70 "}"
+      L_CURLY@36..37 "{"
+      WHITESPACE@37..38 " "
+      EXPR_STMT@38..68
+        CALL_EXPR@38..67
+          PATH_EXPR@38..65
+            PATH@38..65
+              PATH@38..56
+                PATH_SEGMENT@38..56
+                  L_ANGLE@38..39 "<"
+                  PATH_TYPE@39..44
+                    PATH@39..44
+                      PATH_SEGMENT@39..44
+                        NAME_REF@39..44
+                          IDENT@39..44 "usize"
+                  WHITESPACE@44..45 " "
+                  AS_KW@45..47 "as"
+                  WHITESPACE@47..48 " "
+                  PATH_TYPE@48..55
+                    PATH@48..55
+                      PATH_SEGMENT@48..55
+                        NAME_REF@48..55
+                          IDENT@48..55 "Default"
+                  R_ANGLE@55..56 ">"
+              COLON2@56..58 "::"
+              PATH_SEGMENT@58..65
+                NAME_REF@58..65
+                  IDENT@58..65 "default"
+          ARG_LIST@65..67
+            L_PAREN@65..66 "("
+            R_PAREN@66..67 ")"
+        SEMICOLON@67..68 ";"
+      WHITESPACE@68..69 " "
+      R_CURLY@69..70 "}"
   WHITESPACE@70..71 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast

@@ -9,21 +9,20 @@ SOURCE_FILE@0..21
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..20
-      BLOCK@9..20
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..11 " "
-        EXPR_STMT@11..18
-          INDEX_EXPR@11..17
-            PATH_EXPR@11..13
-              PATH@11..13
-                PATH_SEGMENT@11..13
-                  NAME_REF@11..13
-                    IDENT@11..13 "xs"
-            L_BRACK@13..14 "["
-            RANGE_EXPR@14..16
-              DOT2@14..16 ".."
-            R_BRACK@16..17 "]"
-          SEMICOLON@17..18 ";"
-        WHITESPACE@18..19 " "
-        R_CURLY@19..20 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..11 " "
+      EXPR_STMT@11..18
+        INDEX_EXPR@11..17
+          PATH_EXPR@11..13
+            PATH@11..13
+              PATH_SEGMENT@11..13
+                NAME_REF@11..13
+                  IDENT@11..13 "xs"
+          L_BRACK@13..14 "["
+          RANGE_EXPR@14..16
+            DOT2@14..16 ".."
+          R_BRACK@16..17 "]"
+        SEMICOLON@17..18 ";"
+      WHITESPACE@18..19 " "
+      R_CURLY@19..20 "}"
   WHITESPACE@20..21 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast

@@ -32,13 +32,12 @@ SOURCE_FILE@0..46
             WHITESPACE@27..28 " "
             CONST_ARG@28..33
               BLOCK_EXPR@28..33
-                BLOCK@28..33
-                  L_CURLY@28..29 "{"
-                  WHITESPACE@29..30 " "
-                  LITERAL@30..31
-                    INT_NUMBER@30..31 "2"
-                  WHITESPACE@31..32 " "
-                  R_CURLY@32..33 "}"
+                L_CURLY@28..29 "{"
+                WHITESPACE@29..30 " "
+                LITERAL@30..31
+                  INT_NUMBER@30..31 "2"
+                WHITESPACE@31..32 " "
+                R_CURLY@32..33 "}"
             COMMA@33..34 ","
             WHITESPACE@34..35 " "
             ASSOC_TYPE_ARG@35..43

crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast

@@ -12,10 +12,9 @@ SOURCE_FILE@0..71
       R_PAREN@14..15 ")"
     WHITESPACE@15..16 " "
     BLOCK_EXPR@16..19
-      BLOCK@16..19
-        L_CURLY@16..17 "{"
-        WHITESPACE@17..18 " "
-        R_CURLY@18..19 "}"
+      L_CURLY@16..17 "{"
+      WHITESPACE@17..18 " "
+      R_CURLY@18..19 "}"
   WHITESPACE@19..20 "\n"
   STRUCT_DEF@20..49
     STRUCT_KW@20..26 "struct"

crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast

@@ -9,140 +9,139 @@ SOURCE_FILE@0..118
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..117
-      BLOCK@9..117
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        LET_STMT@15..27
-          LET_KW@15..18 "let"
-          WHITESPACE@18..19 " "
-          PLACEHOLDER_PAT@19..20
-            UNDERSCORE@19..20 "_"
-          WHITESPACE@20..21 " "
-          EQ@21..22 "="
-          WHITESPACE@22..23 " "
-          CALL_EXPR@23..26
-            PATH_EXPR@23..24
-              PATH@23..24
-                PATH_SEGMENT@23..24
-                  NAME_REF@23..24
-                    IDENT@23..24 "f"
-            ARG_LIST@24..26
-              L_PAREN@24..25 "("
-              R_PAREN@25..26 ")"
-          SEMICOLON@26..27 ";"
-        WHITESPACE@27..32 "\n    "
-        LET_STMT@32..54
-          LET_KW@32..35 "let"
-          WHITESPACE@35..36 " "
-          PLACEHOLDER_PAT@36..37
-            UNDERSCORE@36..37 "_"
-          WHITESPACE@37..38 " "
-          EQ@38..39 "="
-          WHITESPACE@39..40 " "
-          CALL_EXPR@40..53
-            CALL_EXPR@40..46
-              CALL_EXPR@40..43
-                PATH_EXPR@40..41
-                  PATH@40..41
-                    PATH_SEGMENT@40..41
-                      NAME_REF@40..41
-                        IDENT@40..41 "f"
-                ARG_LIST@41..43
-                  L_PAREN@41..42 "("
-                  R_PAREN@42..43 ")"
-              ARG_LIST@43..46
-                L_PAREN@43..44 "("
-                LITERAL@44..45
-                  INT_NUMBER@44..45 "1"
-                R_PAREN@45..46 ")"
-            ARG_LIST@46..53
-              L_PAREN@46..47 "("
-              LITERAL@47..48
-                INT_NUMBER@47..48 "1"
-              COMMA@48..49 ","
-              WHITESPACE@49..50 " "
-              LITERAL@50..51
-                INT_NUMBER@50..51 "2"
-              COMMA@51..52 ","
-              R_PAREN@52..53 ")"
-          SEMICOLON@53..54 ";"
-        WHITESPACE@54..59 "\n    "
-        LET_STMT@59..84
-          LET_KW@59..62 "let"
-          WHITESPACE@62..63 " "
-          PLACEHOLDER_PAT@63..64
-            UNDERSCORE@63..64 "_"
-          WHITESPACE@64..65 " "
-          EQ@65..66 "="
-          WHITESPACE@66..67 " "
-          CALL_EXPR@67..83
-            PATH_EXPR@67..68
-              PATH@67..68
-                PATH_SEGMENT@67..68
-                  NAME_REF@67..68
-                    IDENT@67..68 "f"
-            ARG_LIST@68..83
-              L_PAREN@68..69 "("
-              CALL_EXPR@69..82
-                PATH_EXPR@69..80
-                  PATH@69..80
-                    PATH@69..74
-                      PATH_SEGMENT@69..74
-                        L_ANGLE@69..70 "<"
-                        PATH_TYPE@70..73
-                          PATH@70..73
-                            PATH_SEGMENT@70..73
-                              NAME_REF@70..73
-                                IDENT@70..73 "Foo"
-                        R_ANGLE@73..74 ">"
-                    COLON2@74..76 "::"
-                    PATH_SEGMENT@76..80
-                      NAME_REF@76..80
-                        IDENT@76..80 "func"
-                ARG_LIST@80..82
-                  L_PAREN@80..81 "("
-                  R_PAREN@81..82 ")"
-              R_PAREN@82..83 ")"
-          SEMICOLON@83..84 ";"
-        WHITESPACE@84..89 "\n    "
-        EXPR_STMT@89..115
-          CALL_EXPR@89..114
-            PATH_EXPR@89..90
-              PATH@89..90
-                PATH_SEGMENT@89..90
-                  NAME_REF@89..90
-                    IDENT@89..90 "f"
-            ARG_LIST@90..114
-              L_PAREN@90..91 "("
-              CALL_EXPR@91..113
-                PATH_EXPR@91..111
-                  PATH@91..111
-                    PATH@91..105
-                      PATH_SEGMENT@91..105
-                        L_ANGLE@91..92 "<"
-                        PATH_TYPE@92..95
-                          PATH@92..95
-                            PATH_SEGMENT@92..95
-                              NAME_REF@92..95
-                                IDENT@92..95 "Foo"
-                        WHITESPACE@95..96 " "
-                        AS_KW@96..98 "as"
-                        WHITESPACE@98..99 " "
-                        PATH_TYPE@99..104
-                          PATH@99..104
-                            PATH_SEGMENT@99..104
-                              NAME_REF@99..104
-                                IDENT@99..104 "Trait"
-                        R_ANGLE@104..105 ">"
-                    COLON2@105..107 "::"
-                    PATH_SEGMENT@107..111
-                      NAME_REF@107..111
-                        IDENT@107..111 "func"
-                ARG_LIST@111..113
-                  L_PAREN@111..112 "("
-                  R_PAREN@112..113 ")"
-              R_PAREN@113..114 ")"
-          SEMICOLON@114..115 ";"
-        WHITESPACE@115..116 "\n"
-        R_CURLY@116..117 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      LET_STMT@15..27
+        LET_KW@15..18 "let"
+        WHITESPACE@18..19 " "
+        PLACEHOLDER_PAT@19..20
+          UNDERSCORE@19..20 "_"
+        WHITESPACE@20..21 " "
+        EQ@21..22 "="
+        WHITESPACE@22..23 " "
+        CALL_EXPR@23..26
+          PATH_EXPR@23..24
+            PATH@23..24
+              PATH_SEGMENT@23..24
+                NAME_REF@23..24
+                  IDENT@23..24 "f"
+          ARG_LIST@24..26
+            L_PAREN@24..25 "("
+            R_PAREN@25..26 ")"
+        SEMICOLON@26..27 ";"
+      WHITESPACE@27..32 "\n    "
+      LET_STMT@32..54
+        LET_KW@32..35 "let"
+        WHITESPACE@35..36 " "
+        PLACEHOLDER_PAT@36..37
+          UNDERSCORE@36..37 "_"
+        WHITESPACE@37..38 " "
+        EQ@38..39 "="
+        WHITESPACE@39..40 " "
+        CALL_EXPR@40..53
+          CALL_EXPR@40..46
+            CALL_EXPR@40..43
+              PATH_EXPR@40..41
+                PATH@40..41
+                  PATH_SEGMENT@40..41
+                    NAME_REF@40..41
+                      IDENT@40..41 "f"
+              ARG_LIST@41..43
+                L_PAREN@41..42 "("
+                R_PAREN@42..43 ")"
+            ARG_LIST@43..46
+              L_PAREN@43..44 "("
+              LITERAL@44..45
+                INT_NUMBER@44..45 "1"
+              R_PAREN@45..46 ")"
+          ARG_LIST@46..53
+            L_PAREN@46..47 "("
+            LITERAL@47..48
+              INT_NUMBER@47..48 "1"
+            COMMA@48..49 ","
+            WHITESPACE@49..50 " "
+            LITERAL@50..51
+              INT_NUMBER@50..51 "2"
+            COMMA@51..52 ","
+            R_PAREN@52..53 ")"
+        SEMICOLON@53..54 ";"
+      WHITESPACE@54..59 "\n    "
+      LET_STMT@59..84
+        LET_KW@59..62 "let"
+        WHITESPACE@62..63 " "
+        PLACEHOLDER_PAT@63..64
+          UNDERSCORE@63..64 "_"
+        WHITESPACE@64..65 " "
+        EQ@65..66 "="
+        WHITESPACE@66..67 " "
+        CALL_EXPR@67..83
+          PATH_EXPR@67..68
+            PATH@67..68
+              PATH_SEGMENT@67..68
+                NAME_REF@67..68
+                  IDENT@67..68 "f"
+          ARG_LIST@68..83
+            L_PAREN@68..69 "("
+            CALL_EXPR@69..82
+              PATH_EXPR@69..80
+                PATH@69..80
+                  PATH@69..74
+                    PATH_SEGMENT@69..74
+                      L_ANGLE@69..70 "<"
+                      PATH_TYPE@70..73
+                        PATH@70..73
+                          PATH_SEGMENT@70..73
+                            NAME_REF@70..73
+                              IDENT@70..73 "Foo"
+                      R_ANGLE@73..74 ">"
+                  COLON2@74..76 "::"
+                  PATH_SEGMENT@76..80
+                    NAME_REF@76..80
+                      IDENT@76..80 "func"
+              ARG_LIST@80..82
+                L_PAREN@80..81 "("
+                R_PAREN@81..82 ")"
+            R_PAREN@82..83 ")"
+        SEMICOLON@83..84 ";"
+      WHITESPACE@84..89 "\n    "
+      EXPR_STMT@89..115
+        CALL_EXPR@89..114
+          PATH_EXPR@89..90
+            PATH@89..90
+              PATH_SEGMENT@89..90
+                NAME_REF@89..90
+                  IDENT@89..90 "f"
+          ARG_LIST@90..114
+            L_PAREN@90..91 "("
+            CALL_EXPR@91..113
+              PATH_EXPR@91..111
+                PATH@91..111
+                  PATH@91..105
+                    PATH_SEGMENT@91..105
+                      L_ANGLE@91..92 "<"
+                      PATH_TYPE@92..95
+                        PATH@92..95
+                          PATH_SEGMENT@92..95
+                            NAME_REF@92..95
+                              IDENT@92..95 "Foo"
+                      WHITESPACE@95..96 " "
+                      AS_KW@96..98 "as"
+                      WHITESPACE@98..99 " "
+                      PATH_TYPE@99..104
+                        PATH@99..104
+                          PATH_SEGMENT@99..104
+                            NAME_REF@99..104
+                              IDENT@99..104 "Trait"
+                      R_ANGLE@104..105 ">"
+                  COLON2@105..107 "::"
+                  PATH_SEGMENT@107..111
+                    NAME_REF@107..111
+                      IDENT@107..111 "func"
+              ARG_LIST@111..113
+                L_PAREN@111..112 "("
+                R_PAREN@112..113 ")"
+            R_PAREN@113..114 ")"
+        SEMICOLON@114..115 ";"
+      WHITESPACE@115..116 "\n"
+      R_CURLY@116..117 "}"
   WHITESPACE@117..118 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast

@@ -9,22 +9,20 @@ SOURCE_FILE@0..21
       R_PAREN@5..6 ")"
     WHITESPACE@6..7 " "
     BLOCK_EXPR@7..20
-      BLOCK@7..20
-        L_CURLY@7..8 "{"
-        WHITESPACE@8..9 " "
-        FN_DEF@9..18
-          FN_KW@9..11 "fn"
-          WHITESPACE@11..12 " "
-          NAME@12..13
-            IDENT@12..13 "b"
-          PARAM_LIST@13..15
-            L_PAREN@13..14 "("
-            R_PAREN@14..15 ")"
-          WHITESPACE@15..16 " "
-          BLOCK_EXPR@16..18
-            BLOCK@16..18
-              L_CURLY@16..17 "{"
-              R_CURLY@17..18 "}"
-        WHITESPACE@18..19 " "
-        R_CURLY@19..20 "}"
+      L_CURLY@7..8 "{"
+      WHITESPACE@8..9 " "
+      FN_DEF@9..18
+        FN_KW@9..11 "fn"
+        WHITESPACE@11..12 " "
+        NAME@12..13
+          IDENT@12..13 "b"
+        PARAM_LIST@13..15
+          L_PAREN@13..14 "("
+          R_PAREN@14..15 ")"
+        WHITESPACE@15..16 " "
+        BLOCK_EXPR@16..18
+          L_CURLY@16..17 "{"
+          R_CURLY@17..18 "}"
+      WHITESPACE@18..19 " "
+      R_CURLY@19..20 "}"
   WHITESPACE@20..21 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast

@@ -41,7 +41,6 @@ SOURCE_FILE@0..35
       L_PAREN@30..31 "("
       R_PAREN@31..32 ")"
     BLOCK_EXPR@32..34
-      BLOCK@32..34
-        L_CURLY@32..33 "{"
-        R_CURLY@33..34 "}"
+      L_CURLY@32..33 "{"
+      R_CURLY@33..34 "}"
   WHITESPACE@34..35 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast

@@ -35,9 +35,8 @@ SOURCE_FILE@0..58
               R_ANGLE@22..23 ">"
     WHITESPACE@23..24 " "
     BLOCK_EXPR@24..26
-      BLOCK@24..26
-        L_CURLY@24..25 "{"
-        R_CURLY@25..26 "}"
+      L_CURLY@24..25 "{"
+      R_CURLY@25..26 "}"
   WHITESPACE@26..27 "\n"
   FN_DEF@27..57
     FN_KW@27..29 "fn"
@@ -77,7 +76,6 @@ SOURCE_FILE@0..58
               R_ANGLE@53..54 ">"
     WHITESPACE@54..55 " "
     BLOCK_EXPR@55..57
-      BLOCK@55..57
-        L_CURLY@55..56 "{"
-        R_CURLY@56..57 "}"
+      L_CURLY@55..56 "{"
+      R_CURLY@56..57 "}"
   WHITESPACE@57..58 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast

@@ -9,88 +9,87 @@ SOURCE_FILE@0..91
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..90
-      BLOCK@9..90
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        LET_STMT@15..25
-          LET_KW@15..18 "let"
-          WHITESPACE@18..19 " "
-          PLACEHOLDER_PAT@19..20
-            UNDERSCORE@19..20 "_"
-          WHITESPACE@20..21 " "
-          EQ@21..22 "="
-          WHITESPACE@22..23 " "
-          PATH_EXPR@23..24
-            PATH@23..24
-              PATH_SEGMENT@23..24
-                NAME_REF@23..24
-                  IDENT@23..24 "a"
-          SEMICOLON@24..25 ";"
-        WHITESPACE@25..30 "\n    "
-        LET_STMT@30..43
-          LET_KW@30..33 "let"
-          WHITESPACE@33..34 " "
-          PLACEHOLDER_PAT@34..35
-            UNDERSCORE@34..35 "_"
-          WHITESPACE@35..36 " "
-          EQ@36..37 "="
-          WHITESPACE@37..38 " "
-          PATH_EXPR@38..42
-            PATH@38..42
-              PATH@38..39
-                PATH_SEGMENT@38..39
-                  NAME_REF@38..39
-                    IDENT@38..39 "a"
-              COLON2@39..41 "::"
-              PATH_SEGMENT@41..42
-                NAME_REF@41..42
-                  IDENT@41..42 "b"
-          SEMICOLON@42..43 ";"
-        WHITESPACE@43..48 "\n    "
-        LET_STMT@48..65
-          LET_KW@48..51 "let"
-          WHITESPACE@51..52 " "
-          PLACEHOLDER_PAT@52..53
-            UNDERSCORE@52..53 "_"
-          WHITESPACE@53..54 " "
-          EQ@54..55 "="
-          WHITESPACE@55..56 " "
-          PATH_EXPR@56..64
-            PATH@56..64
-              PATH_SEGMENT@56..64
-                COLON2@56..58 "::"
-                NAME_REF@58..59
-                  IDENT@58..59 "a"
-                TYPE_ARG_LIST@59..64
-                  COLON2@59..61 "::"
-                  L_ANGLE@61..62 "<"
-                  TYPE_ARG@62..63
-                    PATH_TYPE@62..63
-                      PATH@62..63
-                        PATH_SEGMENT@62..63
-                          NAME_REF@62..63
-                            IDENT@62..63 "b"
-                  R_ANGLE@63..64 ">"
-          SEMICOLON@64..65 ";"
-        WHITESPACE@65..70 "\n    "
-        LET_STMT@70..88
-          LET_KW@70..73 "let"
-          WHITESPACE@73..74 " "
-          PLACEHOLDER_PAT@74..75
-            UNDERSCORE@74..75 "_"
-          WHITESPACE@75..76 " "
-          EQ@76..77 "="
-          WHITESPACE@77..78 " "
-          MACRO_CALL@78..87
-            PATH@78..84
-              PATH_SEGMENT@78..84
-                NAME_REF@78..84
-                  IDENT@78..84 "format"
-            BANG@84..85 "!"
-            TOKEN_TREE@85..87
-              L_PAREN@85..86 "("
-              R_PAREN@86..87 ")"
-          SEMICOLON@87..88 ";"
-        WHITESPACE@88..89 "\n"
-        R_CURLY@89..90 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      LET_STMT@15..25
+        LET_KW@15..18 "let"
+        WHITESPACE@18..19 " "
+        PLACEHOLDER_PAT@19..20
+          UNDERSCORE@19..20 "_"
+        WHITESPACE@20..21 " "
+        EQ@21..22 "="
+        WHITESPACE@22..23 " "
+        PATH_EXPR@23..24
+          PATH@23..24
+            PATH_SEGMENT@23..24
+              NAME_REF@23..24
+                IDENT@23..24 "a"
+        SEMICOLON@24..25 ";"
+      WHITESPACE@25..30 "\n    "
+      LET_STMT@30..43
+        LET_KW@30..33 "let"
+        WHITESPACE@33..34 " "
+        PLACEHOLDER_PAT@34..35
+          UNDERSCORE@34..35 "_"
+        WHITESPACE@35..36 " "
+        EQ@36..37 "="
+        WHITESPACE@37..38 " "
+        PATH_EXPR@38..42
+          PATH@38..42
+            PATH@38..39
+              PATH_SEGMENT@38..39
+                NAME_REF@38..39
+                  IDENT@38..39 "a"
+            COLON2@39..41 "::"
+            PATH_SEGMENT@41..42
+              NAME_REF@41..42
+                IDENT@41..42 "b"
+        SEMICOLON@42..43 ";"
+      WHITESPACE@43..48 "\n    "
+      LET_STMT@48..65
+        LET_KW@48..51 "let"
+        WHITESPACE@51..52 " "
+        PLACEHOLDER_PAT@52..53
+          UNDERSCORE@52..53 "_"
+        WHITESPACE@53..54 " "
+        EQ@54..55 "="
+        WHITESPACE@55..56 " "
+        PATH_EXPR@56..64
+          PATH@56..64
+            PATH_SEGMENT@56..64
+              COLON2@56..58 "::"
+              NAME_REF@58..59
+                IDENT@58..59 "a"
+              TYPE_ARG_LIST@59..64
+                COLON2@59..61 "::"
+                L_ANGLE@61..62 "<"
+                TYPE_ARG@62..63
+                  PATH_TYPE@62..63
+                    PATH@62..63
+                      PATH_SEGMENT@62..63
+                        NAME_REF@62..63
+                          IDENT@62..63 "b"
+                R_ANGLE@63..64 ">"
+        SEMICOLON@64..65 ";"
+      WHITESPACE@65..70 "\n    "
+      LET_STMT@70..88
+        LET_KW@70..73 "let"
+        WHITESPACE@73..74 " "
+        PLACEHOLDER_PAT@74..75
+          UNDERSCORE@74..75 "_"
+        WHITESPACE@75..76 " "
+        EQ@76..77 "="
+        WHITESPACE@77..78 " "
+        MACRO_CALL@78..87
+          PATH@78..84
+            PATH_SEGMENT@78..84
+              NAME_REF@78..84
+                IDENT@78..84 "format"
+          BANG@84..85 "!"
+          TOKEN_TREE@85..87
+            L_PAREN@85..86 "("
+            R_PAREN@86..87 ")"
+        SEMICOLON@87..88 ";"
+      WHITESPACE@88..89 "\n"
+      R_CURLY@89..90 "}"
   WHITESPACE@90..91 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast

@@ -9,69 +9,68 @@ SOURCE_FILE@0..113
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..112
-      BLOCK@10..112
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        MATCH_EXPR@16..110
-          MATCH_KW@16..21 "match"
-          WHITESPACE@21..22 " "
-          TUPLE_EXPR@22..24
-            L_PAREN@22..23 "("
-            R_PAREN@23..24 ")"
-          WHITESPACE@24..25 " "
-          MATCH_ARM_LIST@25..110
-            L_CURLY@25..26 "{"
-            WHITESPACE@26..35 "\n        "
-            MATCH_ARM@35..43
-              LITERAL_PAT@35..37
-                MINUS@35..36 "-"
-                LITERAL@36..37
-                  INT_NUMBER@36..37 "1"
-              WHITESPACE@37..38 " "
-              FAT_ARROW@38..40 "=>"
-              WHITESPACE@40..41 " "
-              TUPLE_EXPR@41..43
-                L_PAREN@41..42 "("
-                R_PAREN@42..43 ")"
-            COMMA@43..44 ","
-            WHITESPACE@44..53 "\n        "
-            MATCH_ARM@53..61
-              LITERAL_PAT@53..55
-                LITERAL@53..55
-                  INT_NUMBER@53..55 "92"
-              WHITESPACE@55..56 " "
-              FAT_ARROW@56..58 "=>"
-              WHITESPACE@58..59 " "
-              TUPLE_EXPR@59..61
-                L_PAREN@59..60 "("
-                R_PAREN@60..61 ")"
-            COMMA@61..62 ","
-            WHITESPACE@62..71 "\n        "
-            MATCH_ARM@71..80
-              LITERAL_PAT@71..74
-                LITERAL@71..74
-                  CHAR@71..74 "\'c\'"
-              WHITESPACE@74..75 " "
-              FAT_ARROW@75..77 "=>"
-              WHITESPACE@77..78 " "
-              TUPLE_EXPR@78..80
-                L_PAREN@78..79 "("
-                R_PAREN@79..80 ")"
-            COMMA@80..81 ","
-            WHITESPACE@81..90 "\n        "
-            MATCH_ARM@90..103
-              LITERAL_PAT@90..97
-                LITERAL@90..97
-                  STRING@90..97 "\"hello\""
-              WHITESPACE@97..98 " "
-              FAT_ARROW@98..100 "=>"
-              WHITESPACE@100..101 " "
-              TUPLE_EXPR@101..103
-                L_PAREN@101..102 "("
-                R_PAREN@102..103 ")"
-            COMMA@103..104 ","
-            WHITESPACE@104..109 "\n    "
-            R_CURLY@109..110 "}"
-        WHITESPACE@110..111 "\n"
-        R_CURLY@111..112 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      MATCH_EXPR@16..110
+        MATCH_KW@16..21 "match"
+        WHITESPACE@21..22 " "
+        TUPLE_EXPR@22..24
+          L_PAREN@22..23 "("
+          R_PAREN@23..24 ")"
+        WHITESPACE@24..25 " "
+        MATCH_ARM_LIST@25..110
+          L_CURLY@25..26 "{"
+          WHITESPACE@26..35 "\n        "
+          MATCH_ARM@35..43
+            LITERAL_PAT@35..37
+              MINUS@35..36 "-"
+              LITERAL@36..37
+                INT_NUMBER@36..37 "1"
+            WHITESPACE@37..38 " "
+            FAT_ARROW@38..40 "=>"
+            WHITESPACE@40..41 " "
+            TUPLE_EXPR@41..43
+              L_PAREN@41..42 "("
+              R_PAREN@42..43 ")"
+          COMMA@43..44 ","
+          WHITESPACE@44..53 "\n        "
+          MATCH_ARM@53..61
+            LITERAL_PAT@53..55
+              LITERAL@53..55
+                INT_NUMBER@53..55 "92"
+            WHITESPACE@55..56 " "
+            FAT_ARROW@56..58 "=>"
+            WHITESPACE@58..59 " "
+            TUPLE_EXPR@59..61
+              L_PAREN@59..60 "("
+              R_PAREN@60..61 ")"
+          COMMA@61..62 ","
+          WHITESPACE@62..71 "\n        "
+          MATCH_ARM@71..80
+            LITERAL_PAT@71..74
+              LITERAL@71..74
+                CHAR@71..74 "\'c\'"
+            WHITESPACE@74..75 " "
+            FAT_ARROW@75..77 "=>"
+            WHITESPACE@77..78 " "
+            TUPLE_EXPR@78..80
+              L_PAREN@78..79 "("
+              R_PAREN@79..80 ")"
+          COMMA@80..81 ","
+          WHITESPACE@81..90 "\n        "
+          MATCH_ARM@90..103
+            LITERAL_PAT@90..97
+              LITERAL@90..97
+                STRING@90..97 "\"hello\""
+            WHITESPACE@97..98 " "
+            FAT_ARROW@98..100 "=>"
+            WHITESPACE@100..101 " "
+            TUPLE_EXPR@101..103
+              L_PAREN@101..102 "("
+              R_PAREN@102..103 ")"
+          COMMA@103..104 ","
+          WHITESPACE@104..109 "\n    "
+          R_CURLY@109..110 "}"
+      WHITESPACE@110..111 "\n"
+      R_CURLY@111..112 "}"
   WHITESPACE@112..113 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast

@@ -105,7 +105,6 @@ SOURCE_FILE@0..116
             LIFETIME@110..112 "\'a"
     WHITESPACE@112..113 "\n"
     BLOCK_EXPR@113..115
-      BLOCK@113..115
-        L_CURLY@113..114 "{"
-        R_CURLY@114..115 "}"
+      L_CURLY@113..114 "{"
+      R_CURLY@114..115 "}"
   WHITESPACE@115..116 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast

@@ -11,7 +11,6 @@ SOURCE_FILE@0..18
       R_PAREN@13..14 ")"
     WHITESPACE@14..15 " "
     BLOCK_EXPR@15..17
-      BLOCK@15..17
-        L_CURLY@15..16 "{"
-        R_CURLY@16..17 "}"
+      L_CURLY@15..16 "{"
+      R_CURLY@16..17 "}"
   WHITESPACE@17..18 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast

@@ -9,75 +9,74 @@ SOURCE_FILE@0..112
       R_PAREN@8..9 ")"
     WHITESPACE@9..10 " "
     BLOCK_EXPR@10..111
-      BLOCK@10..111
-        L_CURLY@10..11 "{"
-        WHITESPACE@11..16 "\n    "
-        MATCH_EXPR@16..109
-          MATCH_KW@16..21 "match"
-          WHITESPACE@21..22 " "
-          LITERAL@22..24
-            INT_NUMBER@22..24 "92"
-          WHITESPACE@24..25 " "
-          MATCH_ARM_LIST@25..109
-            L_CURLY@25..26 "{"
-            WHITESPACE@26..35 "\n        "
-            MATCH_ARM@35..50
-              RANGE_PAT@35..44
-                LITERAL_PAT@35..36
-                  LITERAL@35..36
-                    INT_NUMBER@35..36 "0"
-                WHITESPACE@36..37 " "
-                DOT3@37..40 "..."
-                WHITESPACE@40..41 " "
-                LITERAL_PAT@41..44
-                  LITERAL@41..44
-                    INT_NUMBER@41..44 "100"
-              WHITESPACE@44..45 " "
-              FAT_ARROW@45..47 "=>"
-              WHITESPACE@47..48 " "
-              TUPLE_EXPR@48..50
-                L_PAREN@48..49 "("
-                R_PAREN@49..50 ")"
-            COMMA@50..51 ","
-            WHITESPACE@51..60 "\n        "
-            MATCH_ARM@60..77
-              RANGE_PAT@60..71
-                LITERAL_PAT@60..63
-                  LITERAL@60..63
-                    INT_NUMBER@60..63 "101"
-                WHITESPACE@63..64 " "
-                DOT2EQ@64..67 "..="
-                WHITESPACE@67..68 " "
-                LITERAL_PAT@68..71
-                  LITERAL@68..71
-                    INT_NUMBER@68..71 "200"
-              WHITESPACE@71..72 " "
-              FAT_ARROW@72..74 "=>"
-              WHITESPACE@74..75 " "
-              TUPLE_EXPR@75..77
-                L_PAREN@75..76 "("
-                R_PAREN@76..77 ")"
-            COMMA@77..78 ","
-            WHITESPACE@78..87 "\n        "
-            MATCH_ARM@87..102
-              RANGE_PAT@87..97
-                LITERAL_PAT@87..90
-                  LITERAL@87..90
-                    INT_NUMBER@87..90 "200"
-                WHITESPACE@90..91 " "
-                DOT2@91..93 ".."
-                WHITESPACE@93..94 " "
-                LITERAL_PAT@94..97
-                  LITERAL@94..97
-                    INT_NUMBER@94..97 "301"
-              FAT_ARROW@97..99 "=>"
-              WHITESPACE@99..100 " "
-              TUPLE_EXPR@100..102
-                L_PAREN@100..101 "("
-                R_PAREN@101..102 ")"
-            COMMA@102..103 ","
-            WHITESPACE@103..108 "\n    "
-            R_CURLY@108..109 "}"
-        WHITESPACE@109..110 "\n"
-        R_CURLY@110..111 "}"
+      L_CURLY@10..11 "{"
+      WHITESPACE@11..16 "\n    "
+      MATCH_EXPR@16..109
+        MATCH_KW@16..21 "match"
+        WHITESPACE@21..22 " "
+        LITERAL@22..24
+          INT_NUMBER@22..24 "92"
+        WHITESPACE@24..25 " "
+        MATCH_ARM_LIST@25..109
+          L_CURLY@25..26 "{"
+          WHITESPACE@26..35 "\n        "
+          MATCH_ARM@35..50
+            RANGE_PAT@35..44
+              LITERAL_PAT@35..36
+                LITERAL@35..36
+                  INT_NUMBER@35..36 "0"
+              WHITESPACE@36..37 " "
+              DOT3@37..40 "..."
+              WHITESPACE@40..41 " "
+              LITERAL_PAT@41..44
+                LITERAL@41..44
+                  INT_NUMBER@41..44 "100"
+            WHITESPACE@44..45 " "
+            FAT_ARROW@45..47 "=>"
+            WHITESPACE@47..48 " "
+            TUPLE_EXPR@48..50
+              L_PAREN@48..49 "("
+              R_PAREN@49..50 ")"
+          COMMA@50..51 ","
+          WHITESPACE@51..60 "\n        "
+          MATCH_ARM@60..77
+            RANGE_PAT@60..71
+              LITERAL_PAT@60..63
+                LITERAL@60..63
+                  INT_NUMBER@60..63 "101"
+              WHITESPACE@63..64 " "
+              DOT2EQ@64..67 "..="
+              WHITESPACE@67..68 " "
+              LITERAL_PAT@68..71
+                LITERAL@68..71
+                  INT_NUMBER@68..71 "200"
+            WHITESPACE@71..72 " "
+            FAT_ARROW@72..74 "=>"
+            WHITESPACE@74..75 " "
+            TUPLE_EXPR@75..77
+              L_PAREN@75..76 "("
+              R_PAREN@76..77 ")"
+          COMMA@77..78 ","
+          WHITESPACE@78..87 "\n        "
+          MATCH_ARM@87..102
+            RANGE_PAT@87..97
+              LITERAL_PAT@87..90
+                LITERAL@87..90
+                  INT_NUMBER@87..90 "200"
+              WHITESPACE@90..91 " "
+              DOT2@91..93 ".."
+              WHITESPACE@93..94 " "
+              LITERAL_PAT@94..97
+                LITERAL@94..97
+                  INT_NUMBER@94..97 "301"
+            FAT_ARROW@97..99 "=>"
+            WHITESPACE@99..100 " "
+            TUPLE_EXPR@100..102
+              L_PAREN@100..101 "("
+              R_PAREN@101..102 ")"
+          COMMA@102..103 ","
+          WHITESPACE@103..108 "\n    "
+          R_CURLY@108..109 "}"
+      WHITESPACE@109..110 "\n"
+      R_CURLY@110..111 "}"
   WHITESPACE@111..112 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast

@@ -9,52 +9,50 @@ SOURCE_FILE@0..83
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..82
-      BLOCK@9..82
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        MATCH_EXPR@15..80
-          MATCH_KW@15..20 "match"
-          WHITESPACE@20..21 " "
-          TUPLE_EXPR@21..23
-            L_PAREN@21..22 "("
-            R_PAREN@22..23 ")"
-          WHITESPACE@23..24 " "
-          MATCH_ARM_LIST@24..80
-            L_CURLY@24..25 "{"
-            WHITESPACE@25..34 "\n        "
-            MATCH_ARM@34..41
-              PLACEHOLDER_PAT@34..35
-                UNDERSCORE@34..35 "_"
-              WHITESPACE@35..36 " "
-              FAT_ARROW@36..38 "=>"
-              WHITESPACE@38..39 " "
-              TUPLE_EXPR@39..41
-                L_PAREN@39..40 "("
-                R_PAREN@40..41 ")"
-            COMMA@41..42 ","
-            WHITESPACE@42..51 "\n        "
-            MATCH_ARM@51..58
-              PLACEHOLDER_PAT@51..52
-                UNDERSCORE@51..52 "_"
-              WHITESPACE@52..53 " "
-              FAT_ARROW@53..55 "=>"
-              WHITESPACE@55..56 " "
-              BLOCK_EXPR@56..58
-                BLOCK@56..58
-                  L_CURLY@56..57 "{"
-                  R_CURLY@57..58 "}"
-            WHITESPACE@58..67 "\n        "
-            MATCH_ARM@67..74
-              PLACEHOLDER_PAT@67..68
-                UNDERSCORE@67..68 "_"
-              WHITESPACE@68..69 " "
-              FAT_ARROW@69..71 "=>"
-              WHITESPACE@71..72 " "
-              TUPLE_EXPR@72..74
-                L_PAREN@72..73 "("
-                R_PAREN@73..74 ")"
-            WHITESPACE@74..79 "\n    "
-            R_CURLY@79..80 "}"
-        WHITESPACE@80..81 "\n"
-        R_CURLY@81..82 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      MATCH_EXPR@15..80
+        MATCH_KW@15..20 "match"
+        WHITESPACE@20..21 " "
+        TUPLE_EXPR@21..23
+          L_PAREN@21..22 "("
+          R_PAREN@22..23 ")"
+        WHITESPACE@23..24 " "
+        MATCH_ARM_LIST@24..80
+          L_CURLY@24..25 "{"
+          WHITESPACE@25..34 "\n        "
+          MATCH_ARM@34..41
+            PLACEHOLDER_PAT@34..35
+              UNDERSCORE@34..35 "_"
+            WHITESPACE@35..36 " "
+            FAT_ARROW@36..38 "=>"
+            WHITESPACE@38..39 " "
+            TUPLE_EXPR@39..41
+              L_PAREN@39..40 "("
+              R_PAREN@40..41 ")"
+          COMMA@41..42 ","
+          WHITESPACE@42..51 "\n        "
+          MATCH_ARM@51..58
+            PLACEHOLDER_PAT@51..52
+              UNDERSCORE@51..52 "_"
+            WHITESPACE@52..53 " "
+            FAT_ARROW@53..55 "=>"
+            WHITESPACE@55..56 " "
+            BLOCK_EXPR@56..58
+              L_CURLY@56..57 "{"
+              R_CURLY@57..58 "}"
+          WHITESPACE@58..67 "\n        "
+          MATCH_ARM@67..74
+            PLACEHOLDER_PAT@67..68
+              UNDERSCORE@67..68 "_"
+            WHITESPACE@68..69 " "
+            FAT_ARROW@69..71 "=>"
+            WHITESPACE@71..72 " "
+            TUPLE_EXPR@72..74
+              L_PAREN@72..73 "("
+              R_PAREN@73..74 ")"
+          WHITESPACE@74..79 "\n    "
+          R_CURLY@79..80 "}"
+      WHITESPACE@80..81 "\n"
+      R_CURLY@81..82 "}"
   WHITESPACE@82..83 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast

@@ -9,117 +9,116 @@ SOURCE_FILE@0..112
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..111
-      BLOCK@9..111
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..20
-          RECORD_LIT@15..19
-            PATH@15..16
-              PATH_SEGMENT@15..16
-                NAME_REF@15..16
-                  IDENT@15..16 "S"
-            WHITESPACE@16..17 " "
-            RECORD_FIELD_LIST@17..19
-              L_CURLY@17..18 "{"
-              R_CURLY@18..19 "}"
-          SEMICOLON@19..20 ";"
-        WHITESPACE@20..25 "\n    "
-        EXPR_STMT@25..41
-          RECORD_LIT@25..40
-            PATH@25..26
-              PATH_SEGMENT@25..26
-                NAME_REF@25..26
-                  IDENT@25..26 "S"
-            WHITESPACE@26..27 " "
-            RECORD_FIELD_LIST@27..40
-              L_CURLY@27..28 "{"
-              WHITESPACE@28..29 " "
-              RECORD_FIELD@29..30
-                PATH_EXPR@29..30
-                  PATH@29..30
-                    PATH_SEGMENT@29..30
-                      NAME_REF@29..30
-                        IDENT@29..30 "x"
-              COMMA@30..31 ","
-              WHITESPACE@31..32 " "
-              RECORD_FIELD@32..37
-                NAME_REF@32..33
-                  IDENT@32..33 "y"
-                COLON@33..34 ":"
-                WHITESPACE@34..35 " "
-                LITERAL@35..37
-                  INT_NUMBER@35..37 "32"
-              COMMA@37..38 ","
-              WHITESPACE@38..39 " "
-              R_CURLY@39..40 "}"
-          SEMICOLON@40..41 ";"
-        WHITESPACE@41..46 "\n    "
-        EXPR_STMT@46..83
-          RECORD_LIT@46..82
-            PATH@46..47
-              PATH_SEGMENT@46..47
-                NAME_REF@46..47
-                  IDENT@46..47 "S"
-            WHITESPACE@47..48 " "
-            RECORD_FIELD_LIST@48..82
-              L_CURLY@48..49 "{"
-              WHITESPACE@49..50 " "
-              RECORD_FIELD@50..51
-                PATH_EXPR@50..51
-                  PATH@50..51
-                    PATH_SEGMENT@50..51
-                      NAME_REF@50..51
-                        IDENT@50..51 "x"
-              COMMA@51..52 ","
-              WHITESPACE@52..53 " "
-              RECORD_FIELD@53..58
-                NAME_REF@53..54
-                  IDENT@53..54 "y"
-                COLON@54..55 ":"
-                WHITESPACE@55..56 " "
-                LITERAL@56..58
-                  INT_NUMBER@56..58 "32"
-              COMMA@58..59 ","
-              WHITESPACE@59..60 " "
-              DOT2@60..62 ".."
-              CALL_EXPR@62..80
-                PATH_EXPR@62..78
-                  PATH@62..78
-                    PATH@62..69
-                      PATH_SEGMENT@62..69
-                        NAME_REF@62..69
-                          IDENT@62..69 "Default"
-                    COLON2@69..71 "::"
-                    PATH_SEGMENT@71..78
-                      NAME_REF@71..78
-                        IDENT@71..78 "default"
-                ARG_LIST@78..80
-                  L_PAREN@78..79 "("
-                  R_PAREN@79..80 ")"
-              WHITESPACE@80..81 " "
-              R_CURLY@81..82 "}"
-          SEMICOLON@82..83 ";"
-        WHITESPACE@83..88 "\n    "
-        EXPR_STMT@88..109
-          RECORD_LIT@88..108
-            PATH@88..99
-              PATH_SEGMENT@88..99
-                NAME_REF@88..99
-                  IDENT@88..99 "TupleStruct"
-            WHITESPACE@99..100 " "
-            RECORD_FIELD_LIST@100..108
-              L_CURLY@100..101 "{"
-              WHITESPACE@101..102 " "
-              RECORD_FIELD@102..106
-                NAME_REF@102..103
-                  INT_NUMBER@102..103 "0"
-                COLON@103..104 ":"
-                WHITESPACE@104..105 " "
-                LITERAL@105..106
-                  INT_NUMBER@105..106 "1"
-              WHITESPACE@106..107 " "
-              R_CURLY@107..108 "}"
-          SEMICOLON@108..109 ";"
-        WHITESPACE@109..110 "\n"
-        R_CURLY@110..111 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..20
+        RECORD_LIT@15..19
+          PATH@15..16
+            PATH_SEGMENT@15..16
+              NAME_REF@15..16
+                IDENT@15..16 "S"
+          WHITESPACE@16..17 " "
+          RECORD_FIELD_LIST@17..19
+            L_CURLY@17..18 "{"
+            R_CURLY@18..19 "}"
+        SEMICOLON@19..20 ";"
+      WHITESPACE@20..25 "\n    "
+      EXPR_STMT@25..41
+        RECORD_LIT@25..40
+          PATH@25..26
+            PATH_SEGMENT@25..26
+              NAME_REF@25..26
+                IDENT@25..26 "S"
+          WHITESPACE@26..27 " "
+          RECORD_FIELD_LIST@27..40
+            L_CURLY@27..28 "{"
+            WHITESPACE@28..29 " "
+            RECORD_FIELD@29..30
+              PATH_EXPR@29..30
+                PATH@29..30
+                  PATH_SEGMENT@29..30
+                    NAME_REF@29..30
+                      IDENT@29..30 "x"
+            COMMA@30..31 ","
+            WHITESPACE@31..32 " "
+            RECORD_FIELD@32..37
+              NAME_REF@32..33
+                IDENT@32..33 "y"
+              COLON@33..34 ":"
+              WHITESPACE@34..35 " "
+              LITERAL@35..37
+                INT_NUMBER@35..37 "32"
+            COMMA@37..38 ","
+            WHITESPACE@38..39 " "
+            R_CURLY@39..40 "}"
+        SEMICOLON@40..41 ";"
+      WHITESPACE@41..46 "\n    "
+      EXPR_STMT@46..83
+        RECORD_LIT@46..82
+          PATH@46..47
+            PATH_SEGMENT@46..47
+              NAME_REF@46..47
+                IDENT@46..47 "S"
+          WHITESPACE@47..48 " "
+          RECORD_FIELD_LIST@48..82
+            L_CURLY@48..49 "{"
+            WHITESPACE@49..50 " "
+            RECORD_FIELD@50..51
+              PATH_EXPR@50..51
+                PATH@50..51
+                  PATH_SEGMENT@50..51
+                    NAME_REF@50..51
+                      IDENT@50..51 "x"
+            COMMA@51..52 ","
+            WHITESPACE@52..53 " "
+            RECORD_FIELD@53..58
+              NAME_REF@53..54
+                IDENT@53..54 "y"
+              COLON@54..55 ":"
+              WHITESPACE@55..56 " "
+              LITERAL@56..58
+                INT_NUMBER@56..58 "32"
+            COMMA@58..59 ","
+            WHITESPACE@59..60 " "
+            DOT2@60..62 ".."
+            CALL_EXPR@62..80
+              PATH_EXPR@62..78
+                PATH@62..78
+                  PATH@62..69
+                    PATH_SEGMENT@62..69
+                      NAME_REF@62..69
+                        IDENT@62..69 "Default"
+                  COLON2@69..71 "::"
+                  PATH_SEGMENT@71..78
+                    NAME_REF@71..78
+                      IDENT@71..78 "default"
+              ARG_LIST@78..80
+                L_PAREN@78..79 "("
+                R_PAREN@79..80 ")"
+            WHITESPACE@80..81 " "
+            R_CURLY@81..82 "}"
+        SEMICOLON@82..83 ";"
+      WHITESPACE@83..88 "\n    "
+      EXPR_STMT@88..109
+        RECORD_LIT@88..108
+          PATH@88..99
+            PATH_SEGMENT@88..99
+              NAME_REF@88..99
+                IDENT@88..99 "TupleStruct"
+          WHITESPACE@99..100 " "
+          RECORD_FIELD_LIST@100..108
+            L_CURLY@100..101 "{"
+            WHITESPACE@101..102 " "
+            RECORD_FIELD@102..106
+              NAME_REF@102..103
+                INT_NUMBER@102..103 "0"
+              COLON@103..104 ":"
+              WHITESPACE@104..105 " "
+              LITERAL@105..106
+                INT_NUMBER@105..106 "1"
+            WHITESPACE@106..107 " "
+            R_CURLY@107..108 "}"
+        SEMICOLON@108..109 ";"
+      WHITESPACE@109..110 "\n"
+      R_CURLY@110..111 "}"
   WHITESPACE@111..112 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast

@@ -9,9 +9,8 @@ SOURCE_FILE@0..70
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..11
-      BLOCK@9..11
-        L_CURLY@9..10 "{"
-        R_CURLY@10..11 "}"
+      L_CURLY@9..10 "{"
+      R_CURLY@10..11 "}"
   WHITESPACE@11..12 "\n"
   MACRO_CALL@12..31
     PATH@12..23

crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast

@@ -9,124 +9,113 @@ SOURCE_FILE@0..137
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..136
-      BLOCK@9..136
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..26
-          IF_EXPR@15..25
-            IF_KW@15..17 "if"
-            WHITESPACE@17..18 " "
-            CONDITION@18..22
-              LITERAL@18..22
-                TRUE_KW@18..22 "true"
-            WHITESPACE@22..23 " "
-            BLOCK_EXPR@23..25
-              BLOCK@23..25
-                L_CURLY@23..24 "{"
-                R_CURLY@24..25 "}"
-          SEMICOLON@25..26 ";"
-        WHITESPACE@26..31 "\n    "
-        EXPR_STMT@31..50
-          IF_EXPR@31..49
-            IF_KW@31..33 "if"
-            WHITESPACE@33..34 " "
-            CONDITION@34..38
-              LITERAL@34..38
-                TRUE_KW@34..38 "true"
-            WHITESPACE@38..39 " "
-            BLOCK_EXPR@39..41
-              BLOCK@39..41
-                L_CURLY@39..40 "{"
-                R_CURLY@40..41 "}"
-            WHITESPACE@41..42 " "
-            ELSE_KW@42..46 "else"
-            WHITESPACE@46..47 " "
-            BLOCK_EXPR@47..49
-              BLOCK@47..49
-                L_CURLY@47..48 "{"
-                R_CURLY@48..49 "}"
-          SEMICOLON@49..50 ";"
-        WHITESPACE@50..55 "\n    "
-        EXPR_STMT@55..91
-          IF_EXPR@55..90
-            IF_KW@55..57 "if"
-            WHITESPACE@57..58 " "
-            CONDITION@58..62
-              LITERAL@58..62
-                TRUE_KW@58..62 "true"
-            WHITESPACE@62..63 " "
-            BLOCK_EXPR@63..65
-              BLOCK@63..65
-                L_CURLY@63..64 "{"
-                R_CURLY@64..65 "}"
-            WHITESPACE@65..66 " "
-            ELSE_KW@66..70 "else"
-            WHITESPACE@70..71 " "
-            IF_EXPR@71..90
-              IF_KW@71..73 "if"
-              WHITESPACE@73..74 " "
-              CONDITION@74..79
-                LITERAL@74..79
-                  FALSE_KW@74..79 "false"
-              WHITESPACE@79..80 " "
-              BLOCK_EXPR@80..82
-                BLOCK@80..82
-                  L_CURLY@80..81 "{"
-                  R_CURLY@81..82 "}"
-              WHITESPACE@82..83 " "
-              ELSE_KW@83..87 "else"
-              WHITESPACE@87..88 " "
-              BLOCK_EXPR@88..90
-                BLOCK@88..90
-                  L_CURLY@88..89 "{"
-                  R_CURLY@89..90 "}"
-          SEMICOLON@90..91 ";"
-        WHITESPACE@91..96 "\n    "
-        EXPR_STMT@96..104
-          IF_EXPR@96..103
-            IF_KW@96..98 "if"
-            WHITESPACE@98..99 " "
-            CONDITION@99..100
-              PATH_EXPR@99..100
-                PATH@99..100
-                  PATH_SEGMENT@99..100
-                    NAME_REF@99..100
-                      IDENT@99..100 "S"
-            WHITESPACE@100..101 " "
-            BLOCK_EXPR@101..103
-              BLOCK@101..103
-                L_CURLY@101..102 "{"
-                R_CURLY@102..103 "}"
-          SEMICOLON@103..104 ";"
-        WHITESPACE@104..109 "\n    "
-        EXPR_STMT@109..134
-          IF_EXPR@109..133
-            IF_KW@109..111 "if"
-            WHITESPACE@111..112 " "
-            CONDITION@112..120
-              BLOCK_EXPR@112..120
-                BLOCK@112..120
-                  L_CURLY@112..113 "{"
-                  WHITESPACE@113..114 " "
-                  LITERAL@114..118
-                    TRUE_KW@114..118 "true"
-                  WHITESPACE@118..119 " "
-                  R_CURLY@119..120 "}"
-            WHITESPACE@120..121 " "
-            BLOCK_EXPR@121..124
-              BLOCK@121..124
-                L_CURLY@121..122 "{"
-                WHITESPACE@122..123 " "
-                R_CURLY@123..124 "}"
-            WHITESPACE@124..125 " "
-            ELSE_KW@125..129 "else"
-            WHITESPACE@129..130 " "
-            BLOCK_EXPR@130..133
-              BLOCK@130..133
-                L_CURLY@130..131 "{"
-                WHITESPACE@131..132 " "
-                R_CURLY@132..133 "}"
-          SEMICOLON@133..134 ";"
-        WHITESPACE@134..135 "\n"
-        R_CURLY@135..136 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..26
+        IF_EXPR@15..25
+          IF_KW@15..17 "if"
+          WHITESPACE@17..18 " "
+          CONDITION@18..22
+            LITERAL@18..22
+              TRUE_KW@18..22 "true"
+          WHITESPACE@22..23 " "
+          BLOCK_EXPR@23..25
+            L_CURLY@23..24 "{"
+            R_CURLY@24..25 "}"
+        SEMICOLON@25..26 ";"
+      WHITESPACE@26..31 "\n    "
+      EXPR_STMT@31..50
+        IF_EXPR@31..49
+          IF_KW@31..33 "if"
+          WHITESPACE@33..34 " "
+          CONDITION@34..38
+            LITERAL@34..38
+              TRUE_KW@34..38 "true"
+          WHITESPACE@38..39 " "
+          BLOCK_EXPR@39..41
+            L_CURLY@39..40 "{"
+            R_CURLY@40..41 "}"
+          WHITESPACE@41..42 " "
+          ELSE_KW@42..46 "else"
+          WHITESPACE@46..47 " "
+          BLOCK_EXPR@47..49
+            L_CURLY@47..48 "{"
+            R_CURLY@48..49 "}"
+        SEMICOLON@49..50 ";"
+      WHITESPACE@50..55 "\n    "
+      EXPR_STMT@55..91
+        IF_EXPR@55..90
+          IF_KW@55..57 "if"
+          WHITESPACE@57..58 " "
+          CONDITION@58..62
+            LITERAL@58..62
+              TRUE_KW@58..62 "true"
+          WHITESPACE@62..63 " "
+          BLOCK_EXPR@63..65
+            L_CURLY@63..64 "{"
+            R_CURLY@64..65 "}"
+          WHITESPACE@65..66 " "
+          ELSE_KW@66..70 "else"
+          WHITESPACE@70..71 " "
+          IF_EXPR@71..90
+            IF_KW@71..73 "if"
+            WHITESPACE@73..74 " "
+            CONDITION@74..79
+              LITERAL@74..79
+                FALSE_KW@74..79 "false"
+            WHITESPACE@79..80 " "
+            BLOCK_EXPR@80..82
+              L_CURLY@80..81 "{"
+              R_CURLY@81..82 "}"
+            WHITESPACE@82..83 " "
+            ELSE_KW@83..87 "else"
+            WHITESPACE@87..88 " "
+            BLOCK_EXPR@88..90
+              L_CURLY@88..89 "{"
+              R_CURLY@89..90 "}"
+        SEMICOLON@90..91 ";"
+      WHITESPACE@91..96 "\n    "
+      EXPR_STMT@96..104
+        IF_EXPR@96..103
+          IF_KW@96..98 "if"
+          WHITESPACE@98..99 " "
+          CONDITION@99..100
+            PATH_EXPR@99..100
+              PATH@99..100
+                PATH_SEGMENT@99..100
+                  NAME_REF@99..100
+                    IDENT@99..100 "S"
+          WHITESPACE@100..101 " "
+          BLOCK_EXPR@101..103
+            L_CURLY@101..102 "{"
+            R_CURLY@102..103 "}"
+        SEMICOLON@103..104 ";"
+      WHITESPACE@104..109 "\n    "
+      EXPR_STMT@109..134
+        IF_EXPR@109..133
+          IF_KW@109..111 "if"
+          WHITESPACE@111..112 " "
+          CONDITION@112..120
+            BLOCK_EXPR@112..120
+              L_CURLY@112..113 "{"
+              WHITESPACE@113..114 " "
+              LITERAL@114..118
+                TRUE_KW@114..118 "true"
+              WHITESPACE@118..119 " "
+              R_CURLY@119..120 "}"
+          WHITESPACE@120..121 " "
+          BLOCK_EXPR@121..124
+            L_CURLY@121..122 "{"
+            WHITESPACE@122..123 " "
+            R_CURLY@123..124 "}"
+          WHITESPACE@124..125 " "
+          ELSE_KW@125..129 "else"
+          WHITESPACE@129..130 " "
+          BLOCK_EXPR@130..133
+            L_CURLY@130..131 "{"
+            WHITESPACE@131..132 " "
+            R_CURLY@132..133 "}"
+        SEMICOLON@133..134 ";"
+      WHITESPACE@134..135 "\n"
+      R_CURLY@135..136 "}"
   WHITESPACE@136..137 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast

@@ -9,144 +9,143 @@ SOURCE_FILE@0..167
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..166
-      BLOCK@9..166
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..164
-          MATCH_EXPR@15..163
-            MATCH_KW@15..20 "match"
-            WHITESPACE@20..21 " "
-            TUPLE_EXPR@21..23
-              L_PAREN@21..22 "("
-              R_PAREN@22..23 ")"
-            WHITESPACE@23..24 " "
-            MATCH_ARM_LIST@24..163
-              L_CURLY@24..25 "{"
-              WHITESPACE@25..34 "\n        "
-              MATCH_ARM@34..41
-                PLACEHOLDER_PAT@34..35
-                  UNDERSCORE@34..35 "_"
-                WHITESPACE@35..36 " "
-                FAT_ARROW@36..38 "=>"
-                WHITESPACE@38..39 " "
-                TUPLE_EXPR@39..41
-                  L_PAREN@39..40 "("
-                  R_PAREN@40..41 ")"
-              COMMA@41..42 ","
-              WHITESPACE@42..51 "\n        "
-              MATCH_ARM@51..83
-                PLACEHOLDER_PAT@51..52
-                  UNDERSCORE@51..52 "_"
-                WHITESPACE@52..53 " "
-                MATCH_GUARD@53..77
-                  IF_KW@53..55 "if"
-                  WHITESPACE@55..56 " "
-                  BIN_EXPR@56..77
-                    PATH_EXPR@56..60
-                      PATH@56..60
-                        PATH_SEGMENT@56..60
-                          NAME_REF@56..60
-                            IDENT@56..60 "Test"
-                    WHITESPACE@60..61 " "
-                    R_ANGLE@61..62 ">"
-                    WHITESPACE@62..63 " "
-                    RECORD_LIT@63..77
-                      PATH@63..67
-                        PATH_SEGMENT@63..67
-                          NAME_REF@63..67
-                            IDENT@63..67 "Test"
-                      RECORD_FIELD_LIST@67..77
-                        L_CURLY@67..68 "{"
-                        RECORD_FIELD@68..76
-                          NAME_REF@68..73
-                            IDENT@68..73 "field"
-                          COLON@73..74 ":"
-                          WHITESPACE@74..75 " "
-                          LITERAL@75..76
-                            INT_NUMBER@75..76 "0"
-                        R_CURLY@76..77 "}"
-                WHITESPACE@77..78 " "
-                FAT_ARROW@78..80 "=>"
-                WHITESPACE@80..81 " "
-                TUPLE_EXPR@81..83
-                  L_PAREN@81..82 "("
-                  R_PAREN@82..83 ")"
-              COMMA@83..84 ","
-              WHITESPACE@84..93 "\n        "
-              MATCH_ARM@93..109
-                OR_PAT@93..98
-                  BIND_PAT@93..94
-                    NAME@93..94
-                      IDENT@93..94 "X"
-                  WHITESPACE@94..95 " "
-                  PIPE@95..96 "|"
-                  WHITESPACE@96..97 " "
-                  BIND_PAT@97..98
-                    NAME@97..98
-                      IDENT@97..98 "Y"
-                WHITESPACE@98..99 " "
-                MATCH_GUARD@99..103
-                  IF_KW@99..101 "if"
-                  WHITESPACE@101..102 " "
-                  PATH_EXPR@102..103
-                    PATH@102..103
-                      PATH_SEGMENT@102..103
-                        NAME_REF@102..103
-                          IDENT@102..103 "Z"
-                WHITESPACE@103..104 " "
-                FAT_ARROW@104..106 "=>"
-                WHITESPACE@106..107 " "
-                TUPLE_EXPR@107..109
-                  L_PAREN@107..108 "("
-                  R_PAREN@108..109 ")"
-              COMMA@109..110 ","
-              WHITESPACE@110..119 "\n        "
-              MATCH_ARM@119..137
-                PIPE@119..120 "|"
-                WHITESPACE@120..121 " "
-                OR_PAT@121..126
-                  BIND_PAT@121..122
-                    NAME@121..122
-                      IDENT@121..122 "X"
-                  WHITESPACE@122..123 " "
-                  PIPE@123..124 "|"
-                  WHITESPACE@124..125 " "
-                  BIND_PAT@125..126
-                    NAME@125..126
-                      IDENT@125..126 "Y"
-                WHITESPACE@126..127 " "
-                MATCH_GUARD@127..131
-                  IF_KW@127..129 "if"
-                  WHITESPACE@129..130 " "
-                  PATH_EXPR@130..131
-                    PATH@130..131
-                      PATH_SEGMENT@130..131
-                        NAME_REF@130..131
-                          IDENT@130..131 "Z"
-                WHITESPACE@131..132 " "
-                FAT_ARROW@132..134 "=>"
-                WHITESPACE@134..135 " "
-                TUPLE_EXPR@135..137
-                  L_PAREN@135..136 "("
-                  R_PAREN@136..137 ")"
-              COMMA@137..138 ","
-              WHITESPACE@138..147 "\n        "
-              MATCH_ARM@147..156
-                PIPE@147..148 "|"
-                WHITESPACE@148..149 " "
-                BIND_PAT@149..150
-                  NAME@149..150
-                    IDENT@149..150 "X"
-                WHITESPACE@150..151 " "
-                FAT_ARROW@151..153 "=>"
-                WHITESPACE@153..154 " "
-                TUPLE_EXPR@154..156
-                  L_PAREN@154..155 "("
-                  R_PAREN@155..156 ")"
-              COMMA@156..157 ","
-              WHITESPACE@157..162 "\n    "
-              R_CURLY@162..163 "}"
-          SEMICOLON@163..164 ";"
-        WHITESPACE@164..165 "\n"
-        R_CURLY@165..166 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..164
+        MATCH_EXPR@15..163
+          MATCH_KW@15..20 "match"
+          WHITESPACE@20..21 " "
+          TUPLE_EXPR@21..23
+            L_PAREN@21..22 "("
+            R_PAREN@22..23 ")"
+          WHITESPACE@23..24 " "
+          MATCH_ARM_LIST@24..163
+            L_CURLY@24..25 "{"
+            WHITESPACE@25..34 "\n        "
+            MATCH_ARM@34..41
+              PLACEHOLDER_PAT@34..35
+                UNDERSCORE@34..35 "_"
+              WHITESPACE@35..36 " "
+              FAT_ARROW@36..38 "=>"
+              WHITESPACE@38..39 " "
+              TUPLE_EXPR@39..41
+                L_PAREN@39..40 "("
+                R_PAREN@40..41 ")"
+            COMMA@41..42 ","
+            WHITESPACE@42..51 "\n        "
+            MATCH_ARM@51..83
+              PLACEHOLDER_PAT@51..52
+                UNDERSCORE@51..52 "_"
+              WHITESPACE@52..53 " "
+              MATCH_GUARD@53..77
+                IF_KW@53..55 "if"
+                WHITESPACE@55..56 " "
+                BIN_EXPR@56..77
+                  PATH_EXPR@56..60
+                    PATH@56..60
+                      PATH_SEGMENT@56..60
+                        NAME_REF@56..60
+                          IDENT@56..60 "Test"
+                  WHITESPACE@60..61 " "
+                  R_ANGLE@61..62 ">"
+                  WHITESPACE@62..63 " "
+                  RECORD_LIT@63..77
+                    PATH@63..67
+                      PATH_SEGMENT@63..67
+                        NAME_REF@63..67
+                          IDENT@63..67 "Test"
+                    RECORD_FIELD_LIST@67..77
+                      L_CURLY@67..68 "{"
+                      RECORD_FIELD@68..76
+                        NAME_REF@68..73
+                          IDENT@68..73 "field"
+                        COLON@73..74 ":"
+                        WHITESPACE@74..75 " "
+                        LITERAL@75..76
+                          INT_NUMBER@75..76 "0"
+                      R_CURLY@76..77 "}"
+              WHITESPACE@77..78 " "
+              FAT_ARROW@78..80 "=>"
+              WHITESPACE@80..81 " "
+              TUPLE_EXPR@81..83
+                L_PAREN@81..82 "("
+                R_PAREN@82..83 ")"
+            COMMA@83..84 ","
+            WHITESPACE@84..93 "\n        "
+            MATCH_ARM@93..109
+              OR_PAT@93..98
+                BIND_PAT@93..94
+                  NAME@93..94
+                    IDENT@93..94 "X"
+                WHITESPACE@94..95 " "
+                PIPE@95..96 "|"
+                WHITESPACE@96..97 " "
+                BIND_PAT@97..98
+                  NAME@97..98
+                    IDENT@97..98 "Y"
+              WHITESPACE@98..99 " "
+              MATCH_GUARD@99..103
+                IF_KW@99..101 "if"
+                WHITESPACE@101..102 " "
+                PATH_EXPR@102..103
+                  PATH@102..103
+                    PATH_SEGMENT@102..103
+                      NAME_REF@102..103
+                        IDENT@102..103 "Z"
+              WHITESPACE@103..104 " "
+              FAT_ARROW@104..106 "=>"
+              WHITESPACE@106..107 " "
+              TUPLE_EXPR@107..109
+                L_PAREN@107..108 "("
+                R_PAREN@108..109 ")"
+            COMMA@109..110 ","
+            WHITESPACE@110..119 "\n        "
+            MATCH_ARM@119..137
+              PIPE@119..120 "|"
+              WHITESPACE@120..121 " "
+              OR_PAT@121..126
+                BIND_PAT@121..122
+                  NAME@121..122
+                    IDENT@121..122 "X"
+                WHITESPACE@122..123 " "
+                PIPE@123..124 "|"
+                WHITESPACE@124..125 " "
+                BIND_PAT@125..126
+                  NAME@125..126
+                    IDENT@125..126 "Y"
+              WHITESPACE@126..127 " "
+              MATCH_GUARD@127..131
+                IF_KW@127..129 "if"
+                WHITESPACE@129..130 " "
+                PATH_EXPR@130..131
+                  PATH@130..131
+                    PATH_SEGMENT@130..131
+                      NAME_REF@130..131
+                        IDENT@130..131 "Z"
+              WHITESPACE@131..132 " "
+              FAT_ARROW@132..134 "=>"
+              WHITESPACE@134..135 " "
+              TUPLE_EXPR@135..137
+                L_PAREN@135..136 "("
+                R_PAREN@136..137 ")"
+            COMMA@137..138 ","
+            WHITESPACE@138..147 "\n        "
+            MATCH_ARM@147..156
+              PIPE@147..148 "|"
+              WHITESPACE@148..149 " "
+              BIND_PAT@149..150
+                NAME@149..150
+                  IDENT@149..150 "X"
+              WHITESPACE@150..151 " "
+              FAT_ARROW@151..153 "=>"
+              WHITESPACE@153..154 " "
+              TUPLE_EXPR@154..156
+                L_PAREN@154..155 "("
+                R_PAREN@155..156 ")"
+            COMMA@156..157 ","
+            WHITESPACE@157..162 "\n    "
+            R_CURLY@162..163 "}"
+        SEMICOLON@163..164 ";"
+      WHITESPACE@164..165 "\n"
+      R_CURLY@165..166 "}"
   WHITESPACE@166..167 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast

@@ -9,45 +9,42 @@ SOURCE_FILE@0..46
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..45
-      BLOCK@9..45
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        LET_STMT@15..31
-          LET_KW@15..18 "let"
-          WHITESPACE@18..19 " "
-          PLACEHOLDER_PAT@19..20
-            UNDERSCORE@19..20 "_"
-          WHITESPACE@20..21 " "
-          EQ@21..22 "="
-          WHITESPACE@22..23 " "
-          BIN_EXPR@23..30
-            BLOCK_EXPR@23..26
-              BLOCK@23..26
-                L_CURLY@23..24 "{"
-                LITERAL@24..25
-                  INT_NUMBER@24..25 "1"
-                R_CURLY@25..26 "}"
-            WHITESPACE@26..27 " "
-            AMP@27..28 "&"
-            WHITESPACE@28..29 " "
-            LITERAL@29..30
-              INT_NUMBER@29..30 "2"
-          SEMICOLON@30..31 ";"
-        WHITESPACE@31..36 "\n    "
-        EXPR_STMT@36..39
-          BLOCK_EXPR@36..39
-            BLOCK@36..39
-              L_CURLY@36..37 "{"
-              LITERAL@37..38
-                INT_NUMBER@37..38 "1"
-              R_CURLY@38..39 "}"
-        WHITESPACE@39..40 " "
-        EXPR_STMT@40..43
-          REF_EXPR@40..42
-            AMP@40..41 "&"
-            LITERAL@41..42
-              INT_NUMBER@41..42 "2"
-          SEMICOLON@42..43 ";"
-        WHITESPACE@43..44 "\n"
-        R_CURLY@44..45 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      LET_STMT@15..31
+        LET_KW@15..18 "let"
+        WHITESPACE@18..19 " "
+        PLACEHOLDER_PAT@19..20
+          UNDERSCORE@19..20 "_"
+        WHITESPACE@20..21 " "
+        EQ@21..22 "="
+        WHITESPACE@22..23 " "
+        BIN_EXPR@23..30
+          BLOCK_EXPR@23..26
+            L_CURLY@23..24 "{"
+            LITERAL@24..25
+              INT_NUMBER@24..25 "1"
+            R_CURLY@25..26 "}"
+          WHITESPACE@26..27 " "
+          AMP@27..28 "&"
+          WHITESPACE@28..29 " "
+          LITERAL@29..30
+            INT_NUMBER@29..30 "2"
+        SEMICOLON@30..31 ";"
+      WHITESPACE@31..36 "\n    "
+      EXPR_STMT@36..39
+        BLOCK_EXPR@36..39
+          L_CURLY@36..37 "{"
+          LITERAL@37..38
+            INT_NUMBER@37..38 "1"
+          R_CURLY@38..39 "}"
+      WHITESPACE@39..40 " "
+      EXPR_STMT@40..43
+        REF_EXPR@40..42
+          AMP@40..41 "&"
+          LITERAL@41..42
+            INT_NUMBER@41..42 "2"
+        SEMICOLON@42..43 ";"
+      WHITESPACE@43..44 "\n"
+      R_CURLY@44..45 "}"
   WHITESPACE@45..46 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast

@@ -9,88 +9,85 @@ SOURCE_FILE@0..97
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..96
-      BLOCK@9..96
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..28
-          MATCH_EXPR@15..27
-            MATCH_KW@15..20 "match"
-            WHITESPACE@20..21 " "
-            TUPLE_EXPR@21..23
-              L_PAREN@21..22 "("
-              R_PAREN@22..23 ")"
-            WHITESPACE@23..24 " "
-            MATCH_ARM_LIST@24..27
-              L_CURLY@24..25 "{"
-              WHITESPACE@25..26 " "
-              R_CURLY@26..27 "}"
-          SEMICOLON@27..28 ";"
-        WHITESPACE@28..33 "\n    "
-        EXPR_STMT@33..44
-          MATCH_EXPR@33..43
-            MATCH_KW@33..38 "match"
-            WHITESPACE@38..39 " "
-            PATH_EXPR@39..40
-              PATH@39..40
-                PATH_SEGMENT@39..40
-                  NAME_REF@39..40
-                    IDENT@39..40 "S"
-            WHITESPACE@40..41 " "
-            MATCH_ARM_LIST@41..43
-              L_CURLY@41..42 "{"
-              R_CURLY@42..43 "}"
-          SEMICOLON@43..44 ";"
-        WHITESPACE@44..49 "\n    "
-        EXPR_STMT@49..71
-          MATCH_EXPR@49..70
-            MATCH_KW@49..54 "match"
-            WHITESPACE@54..55 " "
-            BLOCK_EXPR@55..58
-              BLOCK@55..58
-                L_CURLY@55..56 "{"
-                WHITESPACE@56..57 " "
-                R_CURLY@57..58 "}"
-            WHITESPACE@58..59 " "
-            MATCH_ARM_LIST@59..70
-              L_CURLY@59..60 "{"
-              WHITESPACE@60..61 " "
-              MATCH_ARM@61..68
-                PLACEHOLDER_PAT@61..62
-                  UNDERSCORE@61..62 "_"
-                WHITESPACE@62..63 " "
-                FAT_ARROW@63..65 "=>"
-                WHITESPACE@65..66 " "
-                TUPLE_EXPR@66..68
-                  L_PAREN@66..67 "("
-                  R_PAREN@67..68 ")"
-              WHITESPACE@68..69 " "
-              R_CURLY@69..70 "}"
-          SEMICOLON@70..71 ";"
-        WHITESPACE@71..76 "\n    "
-        EXPR_STMT@76..94
-          MATCH_EXPR@76..93
-            MATCH_KW@76..81 "match"
-            WHITESPACE@81..82 " "
-            BLOCK_EXPR@82..90
-              BLOCK@82..90
-                L_CURLY@82..83 "{"
-                WHITESPACE@83..84 " "
-                RECORD_LIT@84..88
-                  PATH@84..85
-                    PATH_SEGMENT@84..85
-                      NAME_REF@84..85
-                        IDENT@84..85 "S"
-                  WHITESPACE@85..86 " "
-                  RECORD_FIELD_LIST@86..88
-                    L_CURLY@86..87 "{"
-                    R_CURLY@87..88 "}"
-                WHITESPACE@88..89 " "
-                R_CURLY@89..90 "}"
-            WHITESPACE@90..91 " "
-            MATCH_ARM_LIST@91..93
-              L_CURLY@91..92 "{"
-              R_CURLY@92..93 "}"
-          SEMICOLON@93..94 ";"
-        WHITESPACE@94..95 "\n"
-        R_CURLY@95..96 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..28
+        MATCH_EXPR@15..27
+          MATCH_KW@15..20 "match"
+          WHITESPACE@20..21 " "
+          TUPLE_EXPR@21..23
+            L_PAREN@21..22 "("
+            R_PAREN@22..23 ")"
+          WHITESPACE@23..24 " "
+          MATCH_ARM_LIST@24..27
+            L_CURLY@24..25 "{"
+            WHITESPACE@25..26 " "
+            R_CURLY@26..27 "}"
+        SEMICOLON@27..28 ";"
+      WHITESPACE@28..33 "\n    "
+      EXPR_STMT@33..44
+        MATCH_EXPR@33..43
+          MATCH_KW@33..38 "match"
+          WHITESPACE@38..39 " "
+          PATH_EXPR@39..40
+            PATH@39..40
+              PATH_SEGMENT@39..40
+                NAME_REF@39..40
+                  IDENT@39..40 "S"
+          WHITESPACE@40..41 " "
+          MATCH_ARM_LIST@41..43
+            L_CURLY@41..42 "{"
+            R_CURLY@42..43 "}"
+        SEMICOLON@43..44 ";"
+      WHITESPACE@44..49 "\n    "
+      EXPR_STMT@49..71
+        MATCH_EXPR@49..70
+          MATCH_KW@49..54 "match"
+          WHITESPACE@54..55 " "
+          BLOCK_EXPR@55..58
+            L_CURLY@55..56 "{"
+            WHITESPACE@56..57 " "
+            R_CURLY@57..58 "}"
+          WHITESPACE@58..59 " "
+          MATCH_ARM_LIST@59..70
+            L_CURLY@59..60 "{"
+            WHITESPACE@60..61 " "
+            MATCH_ARM@61..68
+              PLACEHOLDER_PAT@61..62
+                UNDERSCORE@61..62 "_"
+              WHITESPACE@62..63 " "
+              FAT_ARROW@63..65 "=>"
+              WHITESPACE@65..66 " "
+              TUPLE_EXPR@66..68
+                L_PAREN@66..67 "("
+                R_PAREN@67..68 ")"
+            WHITESPACE@68..69 " "
+            R_CURLY@69..70 "}"
+        SEMICOLON@70..71 ";"
+      WHITESPACE@71..76 "\n    "
+      EXPR_STMT@76..94
+        MATCH_EXPR@76..93
+          MATCH_KW@76..81 "match"
+          WHITESPACE@81..82 " "
+          BLOCK_EXPR@82..90
+            L_CURLY@82..83 "{"
+            WHITESPACE@83..84 " "
+            RECORD_LIT@84..88
+              PATH@84..85
+                PATH_SEGMENT@84..85
+                  NAME_REF@84..85
+                    IDENT@84..85 "S"
+              WHITESPACE@85..86 " "
+              RECORD_FIELD_LIST@86..88
+                L_CURLY@86..87 "{"
+                R_CURLY@87..88 "}"
+            WHITESPACE@88..89 " "
+            R_CURLY@89..90 "}"
+          WHITESPACE@90..91 " "
+          MATCH_ARM_LIST@91..93
+            L_CURLY@91..92 "{"
+            R_CURLY@92..93 "}"
+        SEMICOLON@93..94 ";"
+      WHITESPACE@94..95 "\n"
+      R_CURLY@95..96 "}"
   WHITESPACE@96..97 "\n"

crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast

@@ -9,21 +9,20 @@ SOURCE_FILE@0..40
       R_PAREN@7..8 ")"
     WHITESPACE@8..9 " "
     BLOCK_EXPR@9..39
-      BLOCK@9..39
-        L_CURLY@9..10 "{"
-        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@15..22
-          RETURN_EXPR@15..21
-            RETURN_KW@15..21 "return"
-          SEMICOLON@21..22 ";"
-        WHITESPACE@22..27 "\n    "
-        EXPR_STMT@27..37
-          RETURN_EXPR@27..36
-            RETURN_KW@27..33 "return"
-            WHITESPACE@33..34 " "
-            LITERAL@34..36
-              INT_NUMBER@34..36 "92"
-          SEMICOLON@36..37 ";"
-        WHITESPACE@37..38 "\n"
-        R_CURLY@38..39 "}"
+      L_CURLY@9..10 "{"
+      WHITESPACE@10..15 "\n    "
+      EXPR_STMT@15..22
+        RETURN_EXPR@15..21
+          RETURN_KW@15..21 "return"
+        SEMICOLON@21..22 ";"
+      WHITESPACE@22..27 "\n    "
+      EXPR_STMT@27..37
+        RETURN_EXPR@27..36
+          RETURN_KW@27..33 "return"
+          WHITESPACE@33..34 " "
+          LITERAL@34..36
+            INT_NUMBER@34..36 "92"
+        SEMICOLON@36..37 ";"
+      WHITESPACE@37..38 "\n"
+      R_CURLY@38..39 "}"
   WHITESPACE@39..40 "\n"