313 files changed, 13661 insertions, 11706 deletions

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 2c1192f07..3f52f31f8 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -39,7 +39,6 @@ jobs:
       with:
         toolchain: stable
         profile: minimal
-        target: x86_64-unknown-linux-musl
         override: true
 
     - name: Install Nodejs
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 3f74d7566..6a2fff906 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -41,7 +41,7 @@
       "outFiles": [
         "${workspaceFolder}/editors/code/out/**/*.js"
       ],
-      "preLaunchTask": "Build Extension",
+      "preLaunchTask": "Build Server and Extension",
       "skipFiles": [
         "<node_internals>/**/*.js"
       ],
@@ -62,7 +62,7 @@
       "outFiles": [
         "${workspaceFolder}/editors/code/out/**/*.js"
       ],
-      "preLaunchTask": "Build Extension",
+      "preLaunchTask": "Build Server (Release) and Extension",
       "skipFiles": [
         "<node_internals>/**/*.js"
       ],
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 4037e7cce..0969ce89a 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,7 +4,7 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Build Extension",
+      "label": "Build Extension in Background",
       "group": "build",
       "type": "npm",
       "script": "watch",
@@ -16,11 +16,40 @@
       "isBackground": true,
     },
     {
+      "label": "Build Extension",
+      "group": "build",
+      "type": "npm",
+      "script": "build",
+      "path": "editors/code/",
+      "problemMatcher": {
+        "base": "$tsc",
+        "fileLocation": ["relative", "${workspaceFolder}/editors/code/"]
+      },
+    },
+    {
       "label": "Build Server",
       "group": "build",
       "type": "shell",
       "command": "cargo build --package rust-analyzer",
       "problemMatcher": "$rustc"
     },
+    {
+      "label": "Build Server (Release)",
+      "group": "build",
+      "type": "shell",
+      "command": "cargo build --release --package rust-analyzer",
+      "problemMatcher": "$rustc"
+    },
+
+    {
+      "label": "Build Server and Extension",
+      "dependsOn": ["Build Server", "Build Extension"],
+      "problemMatcher": "$rustc"
+    },
+    {
+      "label": "Build Server (Release) and Extension",
+      "dependsOn": ["Build Server (Release)", "Build Extension"],
+      "problemMatcher": "$rustc"
+    }
   ]
 }
diff --git a/Cargo.lock b/Cargo.lock
index 367ff3f82..5d50a766f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -58,9 +58,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace-sys"
-version = "0.1.36"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78848718ee1255a2485d1309ad9cdecfc2e7d0362dd11c6829364c6b35ae1bc7"
+checksum = "18fbebbe1c9d1f383a9cc7e8ccdb471b91c8d024ee9c2ca5b5346121fe8b4399"
 dependencies = [
  "cc",
  "libc",
@@ -68,9 +68,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
+checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3"
 
 [[package]]
 name = "bitflags"
@@ -170,7 +170,7 @@ dependencies = [
  "chalk-ir",
  "chalk-macros",
  "chalk-rust-ir",
- "ena",
+ "ena 0.13.1",
  "itertools",
  "petgraph",
  "rustc-hash",
@@ -199,14 +199,15 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.10.0"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6728a28023f207181b193262711102bfbaf47cc9d13bc71d0736607ef8efe88c"
+checksum = "2586208b33573b7f76ccfbe5adb076394c88deaf81b84d7213969805b0a952a7"
 dependencies = [
  "clicolors-control",
  "encode_unicode",
  "lazy_static",
  "libc",
+ "terminal_size",
  "termios",
  "winapi 0.3.8",
 ]
@@ -316,6 +317,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "ena"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3"
+dependencies = [
+ "log",
+]
+
+[[package]]
 name = "encode_unicode"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -381,9 +391,9 @@ dependencies = [
 
 [[package]]
 name = "fst"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eaf9ea41cc964d742f7fc7861db75d2d6e83a3ce0d897d5c6f8b621f015ddc8"
+checksum = "81f9cac32c1741cdf6b66be7dcf0d9c7f25ccf12f8aa84c16cfa31f9f14513b3"
 
 [[package]]
 name = "fuchsia-zircon"
@@ -447,9 +457,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15"
+checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4"
 dependencies = [
  "libc",
 ]
@@ -645,9 +655,9 @@ dependencies = [
 
 [[package]]
 name = "lsp-types"
-version = "0.73.0"
+version = "0.74.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d0cf64ea141b43d9e055f6b9df13f0bce32b103d84237509ce0a571ab9b159"
+checksum = "57c0e6a2b8837d27b29deb3f3e6dc1c6d2f57947677f9be1024e482ec5b59525"
 dependencies = [
  "base64",
  "bitflags",
@@ -696,9 +706,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.6.21"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
+checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
 dependencies = [
  "cfg-if",
  "fuchsia-zircon",
@@ -739,9 +749,9 @@ dependencies = [
 
 [[package]]
 name = "net2"
-version = "0.2.33"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
+checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
 dependencies = [
  "cfg-if",
  "libc",
@@ -814,9 +824,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4fb1930692d1b6a9cfabdde3d06ea0a7d186518e2f4d67660d8970e2fa647a"
+checksum = "a3c897744f63f34f7ae3a024d9162bb5001f4ad661dd24bea0dc9f075d2de1c6"
 dependencies = [
  "paste-impl",
  "proc-macro-hack",
@@ -824,9 +834,9 @@ dependencies = [
 
 [[package]]
 name = "paste-impl"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62486e111e571b1e93b710b61e8f493c0013be39629b714cb166bdb06aa5a8a"
+checksum = "66fd6f92e3594f2dd7b3fc23e42d82e292f7bcda6d8e5dcd167072327234ab89"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2",
@@ -885,9 +895,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
+checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7"
 dependencies = [
  "proc-macro2",
 ]
@@ -1023,7 +1033,7 @@ dependencies = [
  "chalk-ir",
  "chalk-rust-ir",
  "chalk-solve",
- "ena",
+ "ena 0.14.0",
  "insta",
  "itertools",
  "log",
@@ -1193,9 +1203,9 @@ dependencies = [
 
 [[package]]
 name = "ra_vfs"
-version = "0.5.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58a265769d5e5655345a9fcbd870a1a7c3658558c0d8efaed79e0669358f46b8"
+checksum = "fcaa5615f420134aea7667253db101d03a5c5f300eac607872dc2a36407b2ac9"
 dependencies = [
  "crossbeam-channel",
  "jod-thread",
@@ -1374,9 +1384,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_lexer"
-version = "652.0.0"
+version = "656.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a6a43c4d0889218c5e2ae68ffea239f303fc05ab1078c73f74e63feb87f7889"
+checksum = "9cbba98ec46e96a4663197dfa8c0378752de2006e314e5400c0ca74929d6692f"
 dependencies = [
  "unicode-xid",
 ]
@@ -1486,18 +1496,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.104"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.104"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1506,9 +1516,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.51"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da07b57ee2623368351e9a0488bb0b261322a15a6e0ae53e243cbdc0f4208da9"
+checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd"
 dependencies = [
  "itoa",
  "ryu",
@@ -1607,6 +1617,16 @@ dependencies = [
 ]
 
 [[package]]
+name = "terminal_size"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8038f95fc7a6f351163f4b964af631bd26c9e828f7db085f2a84aca56f70d13b"
+dependencies = [
+ "libc",
+ "winapi 0.3.8",
+]
+
+[[package]]
 name = "termios"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/crates/ra_assists/src/ast_transform.rs b/crates/ra_assists/src/ast_transform.rs
index 52b4c82db..9ac65ab39 100644
--- a/crates/ra_assists/src/ast_transform.rs
+++ b/crates/ra_assists/src/ast_transform.rs
@@ -85,6 +85,7 @@ impl<'a> SubstituteTypeParams<'a> {
             ast::TypeRef::PathType(path_type) => path_type.path()?,
             _ => return None,
         };
+        // FIXME: use `hir::Path::from_src` instead.
         let path = hir::Path::from_ast(path)?;
         let resolution = self.source_scope.resolve_hir_path(&path)?;
         match resolution {
@@ -128,6 +129,7 @@ impl<'a> QualifyPaths<'a> {
             // don't try to qualify `Fn(Foo) -> Bar` paths, they are in prelude anyway
             return None;
         }
+        // FIXME: use `hir::Path::from_src` instead.
         let hir_path = hir::Path::from_ast(p.clone());
         let resolution = self.source_scope.resolve_hir_path(&hir_path?)?;
         match resolution {
diff --git a/crates/ra_assists/src/doc_tests/generated.rs b/crates/ra_assists/src/doc_tests/generated.rs
index e4fa9ee36..6696cc832 100644
--- a/crates/ra_assists/src/doc_tests/generated.rs
+++ b/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!()
+    }
 
 }
 "#####,
@@ -726,3 +728,22 @@ use std::{collections::HashMap};
 "#####,
     )
 }
+
+#[test]
+fn doctest_unwrap_block() {
+    check(
+        "unwrap_block",
+        r#####"
+fn foo() {
+    if true {<|>
+        println!("foo");
+    }
+}
+"#####,
+        r#####"
+fn foo() {
+    println!("foo");
+}
+"#####,
+    )
+}
diff --git a/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs b/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs
index 03806724a..49deb6701 100644
--- a/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs
+++ b/crates/ra_assists/src/handlers/add_from_impl_for_enum.rs
@@ -1,11 +1,12 @@
+use ra_ide_db::RootDatabase;
 use ra_syntax::{
     ast::{self, AstNode, NameOwner},
     TextSize,
 };
 use stdx::format_to;
 
-use crate::{Assist, AssistCtx, AssistId};
-use ra_ide_db::RootDatabase;
+use crate::{utils::FamousDefs, Assist, AssistCtx, AssistId};
+use test_utils::tested_by;
 
 // Assist add_from_impl_for_enum
 //
@@ -41,7 +42,8 @@ pub(crate) fn add_from_impl_for_enum(ctx: AssistCtx) -> Option<Assist> {
         _ => return None,
     };
 
-    if already_has_from_impl(ctx.sema, &variant) {
+    if existing_from_impl(ctx.sema, &variant).is_some() {
+        tested_by!(test_add_from_impl_already_exists);
         return None;
     }
 
@@ -70,41 +72,33 @@ impl From<{0}> for {1} {{
     )
 }
 
-fn already_has_from_impl(
+fn existing_from_impl(
     sema: &'_ hir::Semantics<'_, RootDatabase>,
     variant: &ast::EnumVariant,
-) -> bool {
-    let scope = sema.scope(&variant.syntax());
+) -> Option<()> {
+    let variant = sema.to_def(variant)?;
+    let enum_ = variant.parent_enum(sema.db);
+    let krate = enum_.module(sema.db).krate();
 
-    let from_path = ast::make::path_from_text("From");
-    let from_hir_path = match hir::Path::from_ast(from_path) {
-        Some(p) => p,
-        None => return false,
-    };
-    let from_trait = match scope.resolve_hir_path(&from_hir_path) {
-        Some(hir::PathResolution::Def(hir::ModuleDef::Trait(t))) => t,
-        _ => return false,
-    };
+    let from_trait = FamousDefs(sema, krate).core_convert_From()?;
 
-    let e: hir::Enum = match sema.to_def(&variant.parent_enum()) {
-        Some(e) => e,
-        None => return false,
-    };
-    let e_ty = e.ty(sema.db);
+    let enum_type = enum_.ty(sema.db);
 
-    let hir_enum_var: hir::EnumVariant = match sema.to_def(variant) {
-        Some(ev) => ev,
-        None => return false,
-    };
-    let var_ty = hir_enum_var.fields(sema.db)[0].signature_ty(sema.db);
+    let wrapped_type = variant.fields(sema.db).get(0)?.signature_ty(sema.db);
 
-    e_ty.impls_trait(sema.db, from_trait, &[var_ty])
+    if enum_type.impls_trait(sema.db, from_trait, &[wrapped_type]) {
+        Some(())
+    } else {
+        None
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+
     use crate::helpers::{check_assist, check_assist_not_applicable};
+    use test_utils::covers;
 
     #[test]
     fn test_add_from_impl_for_enum() {
@@ -136,36 +130,40 @@ mod tests {
         );
     }
 
+    fn check_not_applicable(ra_fixture: &str) {
+        let fixture =
+            format!("//- main.rs crate:main deps:core\n{}\n{}", ra_fixture, FamousDefs::FIXTURE);
+        check_assist_not_applicable(add_from_impl_for_enum, &fixture)
+    }
+
     #[test]
     fn test_add_from_impl_no_element() {
-        check_assist_not_applicable(add_from_impl_for_enum, "enum A { <|>One }");
+        check_not_applicable("enum A { <|>One }");
     }
 
     #[test]
     fn test_add_from_impl_more_than_one_element_in_tuple() {
-        check_assist_not_applicable(add_from_impl_for_enum, "enum A { <|>One(u32, String) }");
+        check_not_applicable("enum A { <|>One(u32, String) }");
     }
 
     #[test]
     fn test_add_from_impl_struct_variant() {
-        check_assist_not_applicable(add_from_impl_for_enum, "enum A { <|>One { x: u32 } }");
+        check_not_applicable("enum A { <|>One { x: u32 } }");
     }
 
     #[test]
     fn test_add_from_impl_already_exists() {
-        check_assist_not_applicable(
-            add_from_impl_for_enum,
-            r#"enum A { <|>One(u32), }
+        covers!(test_add_from_impl_already_exists);
+        check_not_applicable(
+            r#"
+enum A { <|>One(u32), }
 
 impl From<u32> for A {
     fn from(v: u32) -> Self {
         A::One(v)
     }
 }
-
-pub trait From<T> {
-    fn from(T) -> Self;
-}"#,
+"#,
         );
     }
 
diff --git a/crates/ra_assists/src/handlers/add_missing_impl_members.rs b/crates/ra_assists/src/handlers/add_missing_impl_members.rs
index 2d6d44980..e466c9a86 100644
--- a/crates/ra_assists/src/handlers/add_missing_impl_members.rs
+++ b/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 }
-}",
+}"#,
         )
     }
 }
diff --git a/crates/ra_assists/src/handlers/early_return.rs b/crates/ra_assists/src/handlers/early_return.rs
index ea6c56f8c..eede2fe91 100644
--- a/crates/ra_assists/src/handlers/early_return.rs
+++ b/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());
diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs
index f5702f6e0..60ec536a7 100644
--- a/crates/ra_assists/src/handlers/inline_local_variable.rs
+++ b/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(_))
diff --git a/crates/ra_assists/src/handlers/introduce_variable.rs b/crates/ra_assists/src/handlers/introduce_variable.rs
index eda9ac296..39c656305 100644
--- a/crates/ra_assists/src/handlers/introduce_variable.rs
+++ b/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));
diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/ra_assists/src/handlers/move_guard.rs
index d5ccdd91c..b084dd9ee 100644
--- a/crates/ra_assists/src/handlers/move_guard.rs
+++ b/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())
                 }
diff --git a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs b/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
index 0a0a88f3d..9841f6980 100644
--- a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
+++ b/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
@@ -1,11 +1,10 @@
 use ra_fmt::unwrap_trivial_block;
 use ra_syntax::{
-    ast::{self, make},
+    ast::{self, edit::IndentLevel, make},
     AstNode,
 };
 
-use crate::{Assist, AssistCtx, AssistId};
-use ast::edit::IndentLevel;
+use crate::{utils::TryEnum, Assist, AssistCtx, AssistId};
 
 // Assist: replace_if_let_with_match
 //
@@ -44,15 +43,21 @@ pub(crate) fn replace_if_let_with_match(ctx: AssistCtx) -> Option<Assist> {
         ast::ElseBranch::IfExpr(_) => return None,
     };
 
-    ctx.add_assist(AssistId("replace_if_let_with_match"), "Replace with match", |edit| {
+    let sema = ctx.sema;
+    ctx.add_assist(AssistId("replace_if_let_with_match"), "Replace with match", move |edit| {
         let match_expr = {
             let then_arm = {
                 let then_expr = unwrap_trivial_block(then_block);
-                make::match_arm(vec![pat], then_expr)
+                make::match_arm(vec![pat.clone()], then_expr)
             };
             let else_arm = {
+                let pattern = sema
+                    .type_of_pat(&pat)
+                    .and_then(|ty| TryEnum::from_ty(sema, &ty))
+                    .map(|it| it.sad_pattern())
+                    .unwrap_or_else(|| make::placeholder_pat().into());
                 let else_expr = unwrap_trivial_block(else_block);
-                make::match_arm(vec![make::placeholder_pat().into()], else_expr)
+                make::match_arm(vec![pattern], else_expr)
             };
             make::expr_match(expr, make::match_arm_list(vec![then_arm, else_arm]))
         };
@@ -68,6 +73,7 @@ pub(crate) fn replace_if_let_with_match(ctx: AssistCtx) -> Option<Assist> {
 #[cfg(test)]
 mod tests {
     use super::*;
+
     use crate::helpers::{check_assist, check_assist_target};
 
     #[test]
@@ -145,4 +151,64 @@ impl VariantData {
         }",
         );
     }
+
+    #[test]
+    fn special_case_option() {
+        check_assist(
+            replace_if_let_with_match,
+            r#"
+enum Option<T> { Some(T), None }
+use Option::*;
+
+fn foo(x: Option<i32>) {
+    <|>if let Some(x) = x {
+        println!("{}", x)
+    } else {
+        println!("none")
+    }
+}
+           "#,
+            r#"
+enum Option<T> { Some(T), None }
+use Option::*;
+
+fn foo(x: Option<i32>) {
+    <|>match x {
+        Some(x) => println!("{}", x),
+        None => println!("none"),
+    }
+}
+           "#,
+        );
+    }
+
+    #[test]
+    fn special_case_result() {
+        check_assist(
+            replace_if_let_with_match,
+            r#"
+enum Result<T, E> { Ok(T), Err(E) }
+use Result::*;
+
+fn foo(x: Result<i32, ()>) {
+    <|>if let Ok(x) = x {
+        println!("{}", x)
+    } else {
+        println!("none")
+    }
+}
+           "#,
+            r#"
+enum Result<T, E> { Ok(T), Err(E) }
+use Result::*;
+
+fn foo(x: Result<i32, ()>) {
+    <|>match x {
+        Ok(x) => println!("{}", x),
+        Err(_) => println!("none"),
+    }
+}
+           "#,
+        );
+    }
 }
diff --git a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
index bdbaae389..0cf23b754 100644
--- a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
@@ -1,6 +1,5 @@
 use std::iter::once;
 
-use hir::Adt;
 use ra_syntax::{
     ast::{
         self,
@@ -12,6 +11,7 @@ use ra_syntax::{
 
 use crate::{
     assist_ctx::{Assist, AssistCtx},
+    utils::TryEnum,
     AssistId,
 };
 
@@ -45,20 +45,10 @@ pub(crate) fn replace_let_with_if_let(ctx: AssistCtx) -> Option<Assist> {
     let init = let_stmt.initializer()?;
     let original_pat = let_stmt.pat()?;
     let ty = ctx.sema.type_of_expr(&init)?;
-    let enum_ = match ty.as_adt() {
-        Some(Adt::Enum(it)) => it,
-        _ => return None,
-    };
-    let happy_case =
-        [("Result", "Ok"), ("Option", "Some")].iter().find_map(|(known_type, happy_case)| {
-            if &enum_.name(ctx.db).to_string() == known_type {
-                return Some(happy_case);
-            }
-            None
-        });
+    let happy_variant = TryEnum::from_ty(ctx.sema, &ty).map(|it| it.happy_case());
 
     ctx.add_assist(AssistId("replace_let_with_if_let"), "Replace with if-let", |edit| {
-        let with_placeholder: ast::Pat = match happy_case {
+        let with_placeholder: ast::Pat = match happy_variant {
             None => make::placeholder_pat().into(),
             Some(var_name) => make::tuple_struct_pat(
                 make::path_unqualified(make::path_segment(make::name_ref(var_name))),
diff --git a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
index 2f02df303..918e8dd8d 100644
--- a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
@@ -27,7 +27,7 @@ pub(crate) fn replace_qualified_name_with_use(ctx: AssistCtx) -> Option<Assist>
         return None;
     }
 
-    let hir_path = hir::Path::from_ast(path.clone())?;
+    let hir_path = ctx.sema.lower_path(&path)?;
     let segments = collect_hir_path_segments(&hir_path)?;
     if segments.len() < 2 {
         return None;
diff --git a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs b/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
index 62cb7a763..62d4ea522 100644
--- a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
+++ b/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
@@ -1,12 +1,11 @@
 use std::iter;
 
 use ra_syntax::{
-    ast::{self, make},
+    ast::{self, edit::IndentLevel, make},
     AstNode,
 };
 
-use crate::{Assist, AssistCtx, AssistId};
-use ast::edit::IndentLevel;
+use crate::{utils::TryEnum, Assist, AssistCtx, AssistId};
 
 // Assist: replace_unwrap_with_match
 //
@@ -38,42 +37,27 @@ pub(crate) fn replace_unwrap_with_match(ctx: AssistCtx) -> Option<Assist> {
     }
     let caller = method_call.expr()?;
     let ty = ctx.sema.type_of_expr(&caller)?;
+    let happy_variant = TryEnum::from_ty(ctx.sema, &ty)?.happy_case();
 
-    let type_name = ty.as_adt()?.name(ctx.sema.db).to_string();
+    ctx.add_assist(AssistId("replace_unwrap_with_match"), "Replace unwrap with match", |edit| {
+        let ok_path = make::path_unqualified(make::path_segment(make::name_ref(happy_variant)));
+        let it = make::bind_pat(make::name("a")).into();
+        let ok_tuple = make::tuple_struct_pat(ok_path, iter::once(it)).into();
 
-    for (unwrap_type, variant_name) in [("Result", "Ok"), ("Option", "Some")].iter() {
-        if &type_name == unwrap_type {
-            return ctx.add_assist(
-                AssistId("replace_unwrap_with_match"),
-                "Replace unwrap with match",
-                |edit| {
-                    let ok_path =
-                        make::path_unqualified(make::path_segment(make::name_ref(variant_name)));
-                    let it = make::bind_pat(make::name("a")).into();
-                    let ok_tuple = make::tuple_struct_pat(ok_path, iter::once(it)).into();
+        let bind_path = make::path_unqualified(make::path_segment(make::name_ref("a")));
+        let ok_arm = make::match_arm(iter::once(ok_tuple), make::expr_path(bind_path));
 
-                    let bind_path = make::path_unqualified(make::path_segment(make::name_ref("a")));
-                    let ok_arm = make::match_arm(iter::once(ok_tuple), make::expr_path(bind_path));
+        let unreachable_call = make::unreachable_macro_call().into();
+        let err_arm = make::match_arm(iter::once(make::placeholder_pat().into()), unreachable_call);
 
-                    let unreachable_call = make::unreachable_macro_call().into();
-                    let err_arm = make::match_arm(
-                        iter::once(make::placeholder_pat().into()),
-                        unreachable_call,
-                    );
+        let match_arm_list = make::match_arm_list(vec![ok_arm, err_arm]);
+        let match_expr = make::expr_match(caller.clone(), match_arm_list);
+        let match_expr = IndentLevel::from_node(method_call.syntax()).increase_indent(match_expr);
 
-                    let match_arm_list = make::match_arm_list(vec![ok_arm, err_arm]);
-                    let match_expr = make::expr_match(caller.clone(), match_arm_list);
-                    let match_expr =
-                        IndentLevel::from_node(method_call.syntax()).increase_indent(match_expr);
-
-                    edit.target(method_call.syntax().text_range());
-                    edit.set_cursor(caller.syntax().text_range().start());
-                    edit.replace_ast::<ast::Expr>(method_call.into(), match_expr);
-                },
-            );
-        }
-    }
-    None
+        edit.target(method_call.syntax().text_range());
+        edit.set_cursor(caller.syntax().text_range().start());
+        edit.replace_ast::<ast::Expr>(method_call.into(), match_expr);
+    })
 }
 
 #[cfg(test)]
diff --git a/crates/ra_assists/src/handlers/unwrap_block.rs b/crates/ra_assists/src/handlers/unwrap_block.rs
new file mode 100644
index 000000000..58649c47e
--- /dev/null
+++ b/crates/ra_assists/src/handlers/unwrap_block.rs
@@ -0,0 +1,348 @@
+use crate::{Assist, AssistCtx, AssistId};
+
+use ast::{BlockExpr, Expr, ForExpr, IfExpr, LoopBodyOwner, LoopExpr, WhileExpr};
+use ra_fmt::unwrap_trivial_block;
+use ra_syntax::{ast, AstNode, TextRange, T};
+
+// Assist: unwrap_block
+//
+// This assist removes if...else, for, while and loop control statements to just keep the body.
+//
+// ```
+// fn foo() {
+//     if true {<|>
+//         println!("foo");
+//     }
+// }
+// ```
+// ->
+// ```
+// fn foo() {
+//     println!("foo");
+// }
+// ```
+pub(crate) fn unwrap_block(ctx: AssistCtx) -> Option<Assist> {
+    let l_curly_token = ctx.find_token_at_offset(T!['{'])?;
+
+    let res = if let Some(if_expr) = l_curly_token.ancestors().find_map(IfExpr::cast) {
+        // if expression
+        let expr_to_unwrap = if_expr.blocks().find_map(|expr| extract_expr(ctx.frange.range, expr));
+        let expr_to_unwrap = expr_to_unwrap?;
+        // Find if we are in a else if block
+        let ancestor = if_expr.syntax().ancestors().skip(1).find_map(ast::IfExpr::cast);
+
+        if let Some(ancestor) = ancestor {
+            Some((ast::Expr::IfExpr(ancestor), expr_to_unwrap))
+        } else {
+            Some((ast::Expr::IfExpr(if_expr), expr_to_unwrap))
+        }
+    } else if let Some(for_expr) = l_curly_token.ancestors().find_map(ForExpr::cast) {
+        // for expression
+        let block_expr = for_expr.loop_body()?;
+        extract_expr(ctx.frange.range, block_expr)
+            .map(|expr_to_unwrap| (ast::Expr::ForExpr(for_expr), expr_to_unwrap))
+    } else if let Some(while_expr) = l_curly_token.ancestors().find_map(WhileExpr::cast) {
+        // while expression
+        let block_expr = while_expr.loop_body()?;
+        extract_expr(ctx.frange.range, block_expr)
+            .map(|expr_to_unwrap| (ast::Expr::WhileExpr(while_expr), expr_to_unwrap))
+    } else if let Some(loop_expr) = l_curly_token.ancestors().find_map(LoopExpr::cast) {
+        // loop expression
+        let block_expr = loop_expr.loop_body()?;
+        extract_expr(ctx.frange.range, block_expr)
+            .map(|expr_to_unwrap| (ast::Expr::LoopExpr(loop_expr), expr_to_unwrap))
+    } else {
+        None
+    };
+
+    let (expr, expr_to_unwrap) = res?;
+    ctx.add_assist(AssistId("unwrap_block"), "Unwrap block", |edit| {
+        edit.set_cursor(expr.syntax().text_range().start());
+        edit.target(expr_to_unwrap.syntax().text_range());
+
+        let pat_start: &[_] = &[' ', '{', '\n'];
+        let expr_to_unwrap = expr_to_unwrap.to_string();
+        let expr_string = expr_to_unwrap.trim_start_matches(pat_start);
+        let mut expr_string_lines: Vec<&str> = expr_string.lines().collect();
+        expr_string_lines.pop(); // Delete last line
+
+        let expr_string = expr_string_lines
+            .into_iter()
+            .map(|line| line.replacen("    ", "", 1)) // Delete indentation
+            .collect::<Vec<String>>()
+            .join("\n");
+
+        edit.replace(expr.syntax().text_range(), expr_string);
+    })
+}
+
+fn extract_expr(cursor_range: TextRange, block: BlockExpr) -> Option<Expr> {
+    let cursor_in_range = block.l_curly_token()?.text_range().contains_range(cursor_range);
+
+    if cursor_in_range {
+        Some(unwrap_trivial_block(block))
+    } else {
+        None
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::helpers::{check_assist, check_assist_not_applicable};
+
+    use super::*;
+
+    #[test]
+    fn simple_if() {
+        check_assist(
+            unwrap_block,
+            r#"
+            fn main() {
+                bar();
+                if true {<|>
+                    foo();
+
+                    //comment
+                    bar();
+                } else {
+                    println!("bar");
+                }
+            }
+            "#,
+            r#"
+            fn main() {
+                bar();
+                <|>foo();
+
+                //comment
+                bar();
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn simple_if_else() {
+        check_assist(
+            unwrap_block,
+            r#"
+            fn main() {
+                bar();
+                if true {
+                    foo();
+
+                    //comment
+                    bar();
+                } else {<|>
+                    println!("bar");
+                }
+            }
+            "#,
+            r#"
+            fn main() {
+                bar();
+                <|>println!("bar");
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn simple_if_else_if() {
+        check_assist(
+            unwrap_block,
+            r#"
+            fn main() {
+                //bar();
+                if true {
+                    println!("true");
+
+                    //comment
+                    //bar();
+                } else if false {<|>
+                    println!("bar");
+                } else {
+                    println!("foo");
+                }
+            }
+            "#,
+            r#"
+            fn main() {
+                //bar();
+                <|>println!("bar");
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn simple_if_bad_cursor_position() {
+        check_assist_not_applicable(
+            unwrap_block,
+            r#"
+            fn main() {
+                bar();<|>
+                if true {
+                    foo();
+
+                    //comment
+                    bar();
+                } else {
+                    println!("bar");
+                }
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn simple_for() {
+        check_assist(
+            unwrap_block,
+            r#"
+            fn main() {
+                for i in 0..5 {<|>
+                    if true {
+                        foo();
+
+                        //comment
+                        bar();
+                    } else {
+                        println!("bar");
+                    }
+                }
+            }
+            "#,
+            r#"
+            fn main() {
+                <|>if true {
+                    foo();
+
+                    //comment
+                    bar();
+                } else {
+                    println!("bar");
+                }
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn simple_if_in_for() {
+        check_assist(
+            unwrap_block,
+            r#"
+            fn main() {
+                for i in 0..5 {
+                    if true {<|>
+                        foo();
+
+                        //comment
+                        bar();
+                    } else {
+                        println!("bar");
+                    }
+                }
+            }
+            "#,
+            r#"
+            fn main() {
+                for i in 0..5 {
+                    <|>foo();
+
+                    //comment
+                    bar();
+                }
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn simple_loop() {
+        check_assist(
+            unwrap_block,
+            r#"
+            fn main() {
+                loop {<|>
+                    if true {
+                        foo();
+
+                        //comment
+                        bar();
+                    } else {
+                        println!("bar");
+                    }
+                }
+            }
+            "#,
+            r#"
+            fn main() {
+                <|>if true {
+                    foo();
+
+                    //comment
+                    bar();
+                } else {
+                    println!("bar");
+                }
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn simple_while() {
+        check_assist(
+            unwrap_block,
+            r#"
+            fn main() {
+                while true {<|>
+                    if true {
+                        foo();
+
+                        //comment
+                        bar();
+                    } else {
+                        println!("bar");
+                    }
+                }
+            }
+            "#,
+            r#"
+            fn main() {
+                <|>if true {
+                    foo();
+
+                    //comment
+                    bar();
+                } else {
+                    println!("bar");
+                }
+            }
+            "#,
+        );
+    }
+
+    #[test]
+    fn simple_if_in_while_bad_cursor_position() {
+        check_assist_not_applicable(
+            unwrap_block,
+            r#"
+            fn main() {
+                while true {
+                    if true {
+                        foo();<|>
+
+                        //comment
+                        bar();
+                    } else {
+                        println!("bar");
+                    }
+                }
+            }
+            "#,
+        );
+    }
+}
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index 64bd87afb..c5df86600 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -143,6 +143,7 @@ mod handlers {
     mod split_import;
     mod add_from_impl_for_enum;
     mod reorder_fields;
+    mod unwrap_block;
 
     pub(crate) fn all() -> &'static [AssistHandler] {
         &[
@@ -181,6 +182,7 @@ mod handlers {
             replace_unwrap_with_match::replace_unwrap_with_match,
             split_import::split_import,
             add_from_impl_for_enum::add_from_impl_for_enum,
+            unwrap_block::unwrap_block,
             // These are manually sorted for better priorities
             add_missing_impl_members::add_missing_impl_members,
             add_missing_impl_members::add_missing_default_members,
diff --git a/crates/ra_assists/src/marks.rs b/crates/ra_assists/src/marks.rs
index 6c2a2b8b6..8d910205f 100644
--- a/crates/ra_assists/src/marks.rs
+++ b/crates/ra_assists/src/marks.rs
@@ -8,4 +8,5 @@ test_utils::marks![
     test_not_inline_mut_variable
     test_not_applicable_if_variable_unused
     change_visibility_field_false_positive
+    test_add_from_impl_already_exists
 ];
diff --git a/crates/ra_assists/src/utils.rs b/crates/ra_assists/src/utils.rs
index 3d6c59bda..efd988697 100644
--- a/crates/ra_assists/src/utils.rs
+++ b/crates/ra_assists/src/utils.rs
@@ -1,7 +1,9 @@
 //! Assorted functions shared by several assists.
 pub(crate) mod insert_use;
 
-use hir::Semantics;
+use std::iter;
+
+use hir::{Adt, Crate, Semantics, Trait, Type};
 use ra_ide_db::RootDatabase;
 use ra_syntax::{
     ast::{self, make, NameOwner},
@@ -99,3 +101,109 @@ fn invert_special_case(expr: &ast::Expr) -> Option<ast::Expr> {
         _ => None,
     }
 }
+
+#[derive(Clone, Copy)]
+pub(crate) enum TryEnum {
+    Result,
+    Option,
+}
+
+impl TryEnum {
+    const ALL: [TryEnum; 2] = [TryEnum::Option, TryEnum::Result];
+
+    pub(crate) fn from_ty(sema: &Semantics<RootDatabase>, ty: &Type) -> Option<TryEnum> {
+        let enum_ = match ty.as_adt() {
+            Some(Adt::Enum(it)) => it,
+            _ => return None,
+        };
+        TryEnum::ALL.iter().find_map(|&var| {
+            if &enum_.name(sema.db).to_string() == var.type_name() {
+                return Some(var);
+            }
+            None
+        })
+    }
+
+    pub(crate) fn happy_case(self) -> &'static str {
+        match self {
+            TryEnum::Result => "Ok",
+            TryEnum::Option => "Some",
+        }
+    }
+
+    pub(crate) fn sad_pattern(self) -> ast::Pat {
+        match self {
+            TryEnum::Result => make::tuple_struct_pat(
+                make::path_unqualified(make::path_segment(make::name_ref("Err"))),
+                iter::once(make::placeholder_pat().into()),
+            )
+            .into(),
+            TryEnum::Option => make::bind_pat(make::name("None")).into(),
+        }
+    }
+
+    fn type_name(self) -> &'static str {
+        match self {
+            TryEnum::Result => "Result",
+            TryEnum::Option => "Option",
+        }
+    }
+}
+
+/// Helps with finding well-know things inside the standard library. This is
+/// somewhat similar to the known paths infra inside hir, but it different; We
+/// want to make sure that IDE specific paths don't become interesting inside
+/// the compiler itself as well.
+pub(crate) struct FamousDefs<'a, 'b>(pub(crate) &'a Semantics<'b, RootDatabase>, pub(crate) Crate);
+
+#[allow(non_snake_case)]
+impl FamousDefs<'_, '_> {
+    #[cfg(test)]
+    pub(crate) const FIXTURE: &'static str = r#"
+//- /libcore.rs crate:core
+pub mod convert{
+    pub trait From<T> {
+        fn from(T) -> Self;
+    }
+}
+
+pub mod prelude { pub use crate::convert::From }
+#[prelude_import]
+pub use prelude::*;
+"#;
+
+    pub(crate) fn core_convert_From(&self) -> Option<Trait> {
+        self.find_trait("core:convert:From")
+    }
+
+    fn find_trait(&self, path: &str) -> Option<Trait> {
+        let db = self.0.db;
+        let mut path = path.split(':');
+        let trait_ = path.next_back()?;
+        let std_crate = path.next()?;
+        let std_crate = self
+            .1
+            .dependencies(db)
+            .into_iter()
+            .find(|dep| &dep.name.to_string() == std_crate)?
+            .krate;
+
+        let mut module = std_crate.root_module(db)?;
+        for segment in path {
+            module = module.children(db).find_map(|child| {
+                let name = child.name(db)?;
+                if &name.to_string() == segment {
+                    Some(child)
+                } else {
+                    None
+                }
+            })?;
+        }
+        let def =
+            module.scope(db, None).into_iter().find(|(name, _def)| &name.to_string() == trait_)?.1;
+        match def {
+            hir::ScopeDef::ModuleDef(hir::ModuleDef::Trait(it)) => Some(it),
+            _ => None,
+        }
+    }
+}
diff --git a/crates/ra_flycheck/Cargo.toml b/crates/ra_flycheck/Cargo.toml
index 76e5cada4..324c33d9d 100644
--- a/crates/ra_flycheck/Cargo.toml
+++ b/crates/ra_flycheck/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["rust-analyzer developers"]
 
 [dependencies]
 crossbeam-channel = "0.4.0"
-lsp-types = { version = "0.73.0", features = ["proposed"] }
+lsp-types = { version = "0.74.0", features = ["proposed"] }
 log = "0.4.8"
 cargo_metadata = "0.9.1"
 serde_json = "1.0.48"
diff --git a/crates/ra_fmt/src/lib.rs b/crates/ra_fmt/src/lib.rs
index 0b4ba1bbe..f910ded9d 100644
--- a/crates/ra_fmt/src/lib.rs
+++ b/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() {
@@ -57,18 +56,17 @@ pub fn extract_trivial_expression(block: &ast::BlockExpr) -> Option<ast::Expr> {
             return None;
         }
         return Some(expr);
-    } else {
-        // Unwrap `{ continue; }`
-        let (stmt,) = block.statements().next_tuple()?;
-        if let ast::Stmt::ExprStmt(expr_stmt) = stmt {
-            if has_anything_else(expr_stmt.syntax()) {
-                return None;
-            }
-            let expr = expr_stmt.expr()?;
-            match expr.syntax().kind() {
-                CONTINUE_EXPR | BREAK_EXPR | RETURN_EXPR => return Some(expr),
-                _ => (),
-            }
+    }
+    // Unwrap `{ continue; }`
+    let (stmt,) = block.statements().next_tuple()?;
+    if let ast::Stmt::ExprStmt(expr_stmt) = stmt {
+        if has_anything_else(expr_stmt.syntax()) {
+            return None;
+        }
+        let expr = expr_stmt.expr()?;
+        match expr.syntax().kind() {
+            CONTINUE_EXPR | BREAK_EXPR | RETURN_EXPR => return Some(expr),
+            _ => (),
         }
     }
     None
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index fb788736d..af59aa1b6 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -953,6 +953,16 @@ impl TypeParam {
     pub fn module(self, db: &dyn HirDatabase) -> Module {
         self.id.parent.module(db.upcast()).into()
     }
+
+    pub fn ty(self, db: &dyn HirDatabase) -> Type {
+        let resolver = self.id.parent.resolver(db.upcast());
+        let environment = TraitEnvironment::lower(db, &resolver);
+        let ty = Ty::Placeholder(self.id);
+        Type {
+            krate: self.id.parent.module(db.upcast()).krate,
+            ty: InEnvironment { value: ty, environment },
+        }
+    }
 }
 
 // FIXME: rename from `ImplDef` to `Impl`
@@ -1157,18 +1167,21 @@ impl Type {
 
     pub fn fields(&self, db: &dyn HirDatabase) -> Vec<(Field, Type)> {
         if let Ty::Apply(a_ty) = &self.ty.value {
-            if let TypeCtor::Adt(AdtId::StructId(s)) = a_ty.ctor {
-                let var_def = s.into();
-                return db
-                    .field_types(var_def)
-                    .iter()
-                    .map(|(local_id, ty)| {
-                        let def = Field { parent: var_def.into(), id: local_id };
-                        let ty = ty.clone().subst(&a_ty.parameters);
-                        (def, self.derived(ty))
-                    })
-                    .collect();
-            }
+            let variant_id = match a_ty.ctor {
+                TypeCtor::Adt(AdtId::StructId(s)) => s.into(),
+                TypeCtor::Adt(AdtId::UnionId(u)) => u.into(),
+                _ => return Vec::new(),
+            };
+
+            return db
+                .field_types(variant_id)
+                .iter()
+                .map(|(local_id, ty)| {
+                    let def = Field { parent: variant_id.into(), id: local_id };
+                    let ty = ty.clone().subst(&a_ty.parameters);
+                    (def, self.derived(ty))
+                })
+                .collect();
         };
         Vec::new()
     }
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 312ef3814..c5df4ac24 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -70,6 +70,7 @@ pub use hir_def::{
     type_ref::Mutability,
 };
 pub use hir_expand::{
-    name::Name, HirFileId, InFile, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, Origin,
+    hygiene::Hygiene, name::Name, HirFileId, InFile, MacroCallId, MacroCallLoc, MacroDefId,
+    MacroFile, Origin,
 };
 pub use hir_ty::{display::HirDisplay, CallableDef};
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index 86bfb416c..515e5eb17 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -8,7 +8,8 @@ use hir_def::{
     resolver::{self, HasResolver, Resolver},
     AsMacroCall, TraitId,
 };
-use hir_expand::ExpansionInfo;
+use hir_expand::{hygiene::Hygiene, ExpansionInfo};
+use hir_ty::associated_type_shorthand_candidates;
 use itertools::Itertools;
 use ra_db::{FileId, FileRange};
 use ra_prof::profile;
@@ -24,8 +25,9 @@ use crate::{
     semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx},
     source_analyzer::{resolve_hir_path, SourceAnalyzer},
     AssocItem, Field, Function, HirFileId, ImplDef, InFile, Local, MacroDef, Module, ModuleDef,
-    Name, Origin, Path, ScopeDef, Trait, Type, TypeParam,
+    Name, Origin, Path, ScopeDef, Trait, Type, TypeAlias, TypeParam,
 };
+use resolver::TypeNs;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum PathResolution {
@@ -40,6 +42,44 @@ pub enum PathResolution {
     AssocItem(AssocItem),
 }
 
+impl PathResolution {
+    fn in_type_ns(&self) -> Option<TypeNs> {
+        match self {
+            PathResolution::Def(ModuleDef::Adt(adt)) => Some(TypeNs::AdtId((*adt).into())),
+            PathResolution::Def(ModuleDef::BuiltinType(builtin)) => {
+                Some(TypeNs::BuiltinType(*builtin))
+            }
+            PathResolution::Def(ModuleDef::Const(_))
+            | PathResolution::Def(ModuleDef::EnumVariant(_))
+            | PathResolution::Def(ModuleDef::Function(_))
+            | PathResolution::Def(ModuleDef::Module(_))
+            | PathResolution::Def(ModuleDef::Static(_))
+            | PathResolution::Def(ModuleDef::Trait(_)) => None,
+            PathResolution::Def(ModuleDef::TypeAlias(alias)) => {
+                Some(TypeNs::TypeAliasId((*alias).into()))
+            }
+            PathResolution::Local(_) | PathResolution::Macro(_) => None,
+            PathResolution::TypeParam(param) => Some(TypeNs::GenericParam((*param).into())),
+            PathResolution::SelfType(impl_def) => Some(TypeNs::SelfType((*impl_def).into())),
+            PathResolution::AssocItem(AssocItem::Const(_))
+            | PathResolution::AssocItem(AssocItem::Function(_)) => None,
+            PathResolution::AssocItem(AssocItem::TypeAlias(alias)) => {
+                Some(TypeNs::TypeAliasId((*alias).into()))
+            }
+        }
+    }
+
+    /// Returns an iterator over associated types that may be specified after this path (using
+    /// `Ty::Assoc` syntax).
+    pub fn assoc_type_shorthand_candidates<R>(
+        &self,
+        db: &dyn HirDatabase,
+        mut cb: impl FnMut(TypeAlias) -> Option<R>,
+    ) -> Option<R> {
+        associated_type_shorthand_candidates(db, self.in_type_ns()?, |_, _, id| cb(id.into()))
+    }
+}
+
 /// Primary API to get semantic information, like types, from syntax trees.
 pub struct Semantics<'db, DB> {
     pub db: &'db DB,
@@ -206,6 +246,11 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
         self.analyze(path.syntax()).resolve_path(self.db, path)
     }
 
+    pub fn lower_path(&self, path: &ast::Path) -> Option<Path> {
+        let src = self.find_file(path.syntax().clone());
+        Path::from_src(path.clone(), &Hygiene::new(self.db.upcast(), src.file_id.into()))
+    }
+
     pub fn resolve_bind_pat_to_const(&self, pat: &ast::BindPat) -> Option<ModuleDef> {
         self.analyze(pat.syntax()).resolve_bind_pat_to_const(self.db, pat)
     }
diff --git a/crates/ra_hir/src/semantics/source_to_def.rs b/crates/ra_hir/src/semantics/source_to_def.rs
index 6f3b5b2da..8af64fdc1 100644
--- a/crates/ra_hir/src/semantics/source_to_def.rs
+++ b/crates/ra_hir/src/semantics/source_to_def.rs
@@ -151,7 +151,7 @@ impl SourceToDefCtx<'_, '_> {
         let krate = self.file_to_def(file_id)?.krate;
         let file_ast_id = self.db.ast_id_map(src.file_id).ast_id(&src.value);
         let ast_id = Some(AstId::new(src.file_id, file_ast_id));
-        Some(MacroDefId { krate: Some(krate), ast_id, kind })
+        Some(MacroDefId { krate: Some(krate), ast_id, kind, local_inner: false })
     }
 
     pub(super) fn find_container(&mut self, src: InFile<&SyntaxNode>) -> Option<ChildContainer> {
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index 74d64c97d..c63d1b847 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -224,7 +224,8 @@ impl SourceAnalyzer {
             }
         }
         // This must be a normal source file rather than macro file.
-        let hir_path = crate::Path::from_ast(path.clone())?;
+        let hir_path =
+            crate::Path::from_src(path.clone(), &Hygiene::new(db.upcast(), self.file_id))?;
         resolve_hir_path(db, &self.resolver, &hir_path)
     }
 
diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs
index 753becc3d..8eef51828 100644
--- a/crates/ra_hir_def/src/adt.rs
+++ b/crates/ra_hir_def/src/adt.rs
@@ -12,9 +12,15 @@ use ra_prof::profile;
 use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner, VisibilityOwner};
 
 use crate::{
-    body::CfgExpander, db::DefDatabase, src::HasChildSource, src::HasSource, trace::Trace,
-    type_ref::TypeRef, visibility::RawVisibility, EnumId, HasModule, LocalEnumVariantId,
-    LocalFieldId, Lookup, ModuleId, StructId, UnionId, VariantId,
+    body::{CfgExpander, LowerCtx},
+    db::DefDatabase,
+    src::HasChildSource,
+    src::HasSource,
+    trace::Trace,
+    type_ref::TypeRef,
+    visibility::RawVisibility,
+    EnumId, HasModule, LocalEnumVariantId, LocalFieldId, Lookup, ModuleId, StructId, UnionId,
+    VariantId,
 };
 
 /// Note that we use `StructData` for unions as well!
@@ -198,6 +204,8 @@ fn lower_struct(
     trace: &mut Trace<FieldData, Either<ast::TupleFieldDef, ast::RecordFieldDef>>,
     ast: &InFile<ast::StructKind>,
 ) -> StructKind {
+    let ctx = LowerCtx::new(db, ast.file_id);
+
     match &ast.value {
         ast::StructKind::Tuple(fl) => {
             for (i, fd) in fl.fields().enumerate() {
@@ -210,7 +218,7 @@ fn lower_struct(
                     || Either::Left(fd.clone()),
                     || FieldData {
                         name: Name::new_tuple_field(i),
-                        type_ref: TypeRef::from_ast_opt(fd.type_ref()),
+                        type_ref: TypeRef::from_ast_opt(&ctx, fd.type_ref()),
                         visibility: RawVisibility::from_ast(db, ast.with_value(fd.visibility())),
                     },
                 );
@@ -228,7 +236,7 @@ fn lower_struct(
                     || Either::Right(fd.clone()),
                     || FieldData {
                         name: fd.name().map(|n| n.as_name()).unwrap_or_else(Name::missing),
-                        type_ref: TypeRef::from_ast_opt(fd.ascribed_type()),
+                        type_ref: TypeRef::from_ast_opt(&ctx, fd.ascribed_type()),
                         visibility: RawVisibility::from_ast(db, ast.with_value(fd.visibility())),
                     },
                 );
diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs
index 5a86af8ba..576cd0c65 100644
--- a/crates/ra_hir_def/src/attr.rs
+++ b/crates/ra_hir_def/src/attr.rs
@@ -140,6 +140,7 @@ impl Attr {
     }
 }
 
+#[derive(Debug, Clone, Copy)]
 pub struct AttrQuery<'a> {
     attrs: &'a Attrs,
     key: &'static str,
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs
index 890cefcaf..4edaad960 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/ra_hir_def/src/body.rs
@@ -15,6 +15,8 @@ use ra_prof::profile;
 use ra_syntax::{ast, AstNode, AstPtr};
 use rustc_hash::FxHashMap;
 
+pub(crate) use lower::LowerCtx;
+
 use crate::{
     attr::Attrs,
     db::DefDatabase,
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs
index 571603854..687216dc3 100644
--- a/crates/ra_hir_def/src/body/lower.rs
+++ b/crates/ra_hir_def/src/body/lower.rs
@@ -3,8 +3,9 @@
 
 use either::Either;
 use hir_expand::{
+    hygiene::Hygiene,
     name::{name, AsName, Name},
-    MacroDefId, MacroDefKind,
+    HirFileId, MacroDefId, MacroDefKind,
 };
 use ra_arena::Arena;
 use ra_syntax::{
@@ -26,7 +27,7 @@ use crate::{
         LogicOp, MatchArm, Ordering, Pat, PatId, RecordFieldPat, RecordLitField, Statement,
     },
     item_scope::BuiltinShadowMode,
-    path::GenericArgs,
+    path::{GenericArgs, Path},
     type_ref::{Mutability, TypeRef},
     AdtId, ConstLoc, ContainerId, DefWithBodyId, EnumLoc, FunctionLoc, Intern, ModuleDefId,
     StaticLoc, StructLoc, TraitLoc, TypeAliasLoc, UnionLoc,
@@ -35,6 +36,23 @@ use crate::{
 use super::{ExprSource, PatSource};
 use ast::AstChildren;
 
+pub(crate) struct LowerCtx {
+    hygiene: Hygiene,
+}
+
+impl LowerCtx {
+    pub fn new(db: &dyn DefDatabase, file_id: HirFileId) -> Self {
+        LowerCtx { hygiene: Hygiene::new(db.upcast(), file_id) }
+    }
+    pub fn with_hygiene(hygiene: &Hygiene) -> Self {
+        LowerCtx { hygiene: hygiene.clone() }
+    }
+
+    pub fn lower_path(&self, ast: ast::Path) -> Option<Path> {
+        Path::from_src(ast, &self.hygiene)
+    }
+}
+
 pub(super) fn lower(
     db: &dyn DefDatabase,
     def: DefWithBodyId,
@@ -42,10 +60,13 @@ pub(super) fn lower(
     params: Option<ast::ParamList>,
     body: Option<ast::Expr>,
 ) -> (Body, BodySourceMap) {
+    let ctx = LowerCtx::new(db, expander.current_file_id.clone());
+
     ExprCollector {
         db,
         def,
         expander,
+        ctx,
         source_map: BodySourceMap::default(),
         body: Body {
             exprs: Arena::default(),
@@ -62,7 +83,7 @@ struct ExprCollector<'a> {
     db: &'a dyn DefDatabase,
     def: DefWithBodyId,
     expander: Expander,
-
+    ctx: LowerCtx,
     body: Body,
     source_map: BodySourceMap,
 }
@@ -182,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());
@@ -241,7 +268,8 @@ impl ExprCollector<'_> {
                     Vec::new()
                 };
                 let method_name = e.name_ref().map(|nr| nr.as_name()).unwrap_or_else(Name::missing);
-                let generic_args = e.type_arg_list().and_then(GenericArgs::from_ast);
+                let generic_args =
+                    e.type_arg_list().and_then(|it| GenericArgs::from_ast(&self.ctx, it));
                 self.alloc_expr(
                     Expr::MethodCall { receiver, method_name, args, generic_args },
                     syntax_ptr,
@@ -347,7 +375,7 @@ impl ExprCollector<'_> {
             }
             ast::Expr::CastExpr(e) => {
                 let expr = self.collect_expr_opt(e.expr());
-                let type_ref = TypeRef::from_ast_opt(e.type_ref());
+                let type_ref = TypeRef::from_ast_opt(&self.ctx, e.type_ref());
                 self.alloc_expr(Expr::Cast { expr, type_ref }, syntax_ptr)
             }
             ast::Expr::RefExpr(e) => {
@@ -369,12 +397,16 @@ impl ExprCollector<'_> {
                 if let Some(pl) = e.param_list() {
                     for param in pl.params() {
                         let pat = self.collect_pat_opt(param.pat());
-                        let type_ref = param.ascribed_type().map(TypeRef::from_ast);
+                        let type_ref =
+                            param.ascribed_type().map(|it| TypeRef::from_ast(&self.ctx, it));
                         args.push(pat);
                         arg_types.push(type_ref);
                     }
                 }
-                let ret_type = e.ret_type().and_then(|r| r.type_ref()).map(TypeRef::from_ast);
+                let ret_type = e
+                    .ret_type()
+                    .and_then(|r| r.type_ref())
+                    .map(|it| TypeRef::from_ast(&self.ctx, it));
                 let body = self.collect_expr_opt(e.body());
                 self.alloc_expr(Expr::Lambda { args, arg_types, ret_type, body }, syntax_ptr)
             }
@@ -434,6 +466,7 @@ impl ExprCollector<'_> {
                         krate: Some(self.expander.module.krate),
                         ast_id: Some(self.expander.ast_id(&e)),
                         kind: MacroDefKind::Declarative,
+                        local_inner: false,
                     };
                     self.body.item_scope.define_legacy_macro(name, mac);
 
@@ -468,19 +501,15 @@ 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()
             .map(|s| match s {
                 ast::Stmt::LetStmt(stmt) => {
                     let pat = self.collect_pat_opt(stmt.pat());
-                    let type_ref = stmt.ascribed_type().map(TypeRef::from_ast);
+                    let type_ref = stmt.ascribed_type().map(|it| TypeRef::from_ast(&self.ctx, it));
                     let initializer = stmt.initializer().map(|e| self.collect_expr(e));
                     Statement::Let { pat, type_ref, initializer }
                 }
@@ -491,7 +520,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 {
diff --git a/crates/ra_hir_def/src/data.rs b/crates/ra_hir_def/src/data.rs
index ccb682f9a..7a2067e49 100644
--- a/crates/ra_hir_def/src/data.rs
+++ b/crates/ra_hir_def/src/data.rs
@@ -15,6 +15,7 @@ use ra_syntax::ast::{
 
 use crate::{
     attr::Attrs,
+    body::LowerCtx,
     db::DefDatabase,
     path::{path, AssociatedTypeBinding, GenericArgs, Path},
     src::HasSource,
@@ -40,13 +41,14 @@ impl FunctionData {
     pub(crate) fn fn_data_query(db: &impl DefDatabase, func: FunctionId) -> Arc<FunctionData> {
         let loc = func.lookup(db);
         let src = loc.source(db);
+        let ctx = LowerCtx::new(db, src.file_id);
         let name = src.value.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
         let mut params = Vec::new();
         let mut has_self_param = false;
         if let Some(param_list) = src.value.param_list() {
             if let Some(self_param) = param_list.self_param() {
                 let self_type = if let Some(type_ref) = self_param.ascribed_type() {
-                    TypeRef::from_ast(type_ref)
+                    TypeRef::from_ast(&ctx, type_ref)
                 } else {
                     let self_type = TypeRef::Path(name![Self].into());
                     match self_param.kind() {
@@ -63,14 +65,14 @@ impl FunctionData {
                 has_self_param = true;
             }
             for param in param_list.params() {
-                let type_ref = TypeRef::from_ast_opt(param.ascribed_type());
+                let type_ref = TypeRef::from_ast_opt(&ctx, param.ascribed_type());
                 params.push(type_ref);
             }
         }
         let attrs = Attrs::new(&src.value, &Hygiene::new(db.upcast(), src.file_id));
 
         let ret_type = if let Some(type_ref) = src.value.ret_type().and_then(|rt| rt.type_ref()) {
-            TypeRef::from_ast(type_ref)
+            TypeRef::from_ast(&ctx, type_ref)
         } else {
             TypeRef::unit()
         };
@@ -122,7 +124,8 @@ impl TypeAliasData {
         let loc = typ.lookup(db);
         let node = loc.source(db);
         let name = node.value.name().map_or_else(Name::missing, |n| n.as_name());
-        let type_ref = node.value.type_ref().map(TypeRef::from_ast);
+        let lower_ctx = LowerCtx::new(db, node.file_id);
+        let type_ref = node.value.type_ref().map(|it| TypeRef::from_ast(&lower_ctx, it));
         let vis_default = RawVisibility::default_for_container(loc.container);
         let visibility = RawVisibility::from_ast_with_default(
             db,
@@ -130,7 +133,7 @@ impl TypeAliasData {
             node.as_ref().map(|n| n.visibility()),
         );
         let bounds = if let Some(bound_list) = node.value.type_bound_list() {
-            bound_list.bounds().map(TypeBound::from_ast).collect()
+            bound_list.bounds().map(|it| TypeBound::from_ast(&lower_ctx, it)).collect()
         } else {
             Vec::new()
         };
@@ -223,9 +226,10 @@ impl ImplData {
         let _p = profile("impl_data_query");
         let impl_loc = id.lookup(db);
         let src = impl_loc.source(db);
+        let lower_ctx = LowerCtx::new(db, src.file_id);
 
-        let target_trait = src.value.target_trait().map(TypeRef::from_ast);
-        let target_type = TypeRef::from_ast_opt(src.value.target_type());
+        let target_trait = src.value.target_trait().map(|it| TypeRef::from_ast(&lower_ctx, it));
+        let target_type = TypeRef::from_ast_opt(&lower_ctx, src.value.target_type());
         let is_negative = src.value.excl_token().is_some();
         let module_id = impl_loc.container.module(db);
 
@@ -279,8 +283,9 @@ impl ConstData {
         vis_default: RawVisibility,
         node: InFile<N>,
     ) -> ConstData {
+        let ctx = LowerCtx::new(db, node.file_id);
         let name = node.value.name().map(|n| n.as_name());
-        let type_ref = TypeRef::from_ast_opt(node.value.ascribed_type());
+        let type_ref = TypeRef::from_ast_opt(&ctx, node.value.ascribed_type());
         let visibility =
             RawVisibility::from_ast_with_default(db, vis_default, node.map(|n| n.visibility()));
         ConstData { name, type_ref, visibility }
diff --git a/crates/ra_hir_def/src/generics.rs b/crates/ra_hir_def/src/generics.rs
index d850244c4..09a5241f7 100644
--- a/crates/ra_hir_def/src/generics.rs
+++ b/crates/ra_hir_def/src/generics.rs
@@ -15,6 +15,7 @@ use ra_prof::profile;
 use ra_syntax::ast::{self, NameOwner, TypeBoundsOwner, TypeParamsOwner};
 
 use crate::{
+    body::LowerCtx,
     child_by_source::ChildBySource,
     db::DefDatabase,
     dyn_map::DynMap,
@@ -80,11 +81,13 @@ impl GenericParams {
     fn new(db: &dyn DefDatabase, def: GenericDefId) -> (GenericParams, InFile<SourceMap>) {
         let mut generics = GenericParams { types: Arena::default(), where_predicates: Vec::new() };
         let mut sm = ArenaMap::default();
+
         // FIXME: add `: Sized` bound for everything except for `Self` in traits
         let file_id = match def {
             GenericDefId::FunctionId(it) => {
                 let src = it.lookup(db).source(db);
-                generics.fill(&mut sm, &src.value);
+                let lower_ctx = LowerCtx::new(db, src.file_id);
+                generics.fill(&lower_ctx, &mut sm, &src.value);
                 // lower `impl Trait` in arguments
                 let data = db.function_data(it);
                 for param in &data.params {
@@ -94,21 +97,25 @@ impl GenericParams {
             }
             GenericDefId::AdtId(AdtId::StructId(it)) => {
                 let src = it.lookup(db).source(db);
-                generics.fill(&mut sm, &src.value);
+                let lower_ctx = LowerCtx::new(db, src.file_id);
+                generics.fill(&lower_ctx, &mut sm, &src.value);
                 src.file_id
             }
             GenericDefId::AdtId(AdtId::UnionId(it)) => {
                 let src = it.lookup(db).source(db);
-                generics.fill(&mut sm, &src.value);
+                let lower_ctx = LowerCtx::new(db, src.file_id);
+                generics.fill(&lower_ctx, &mut sm, &src.value);
                 src.file_id
             }
             GenericDefId::AdtId(AdtId::EnumId(it)) => {
                 let src = it.lookup(db).source(db);
-                generics.fill(&mut sm, &src.value);
+                let lower_ctx = LowerCtx::new(db, src.file_id);
+                generics.fill(&lower_ctx, &mut sm, &src.value);
                 src.file_id
             }
             GenericDefId::TraitId(it) => {
                 let src = it.lookup(db).source(db);
+                let lower_ctx = LowerCtx::new(db, src.file_id);
 
                 // traits get the Self type as an implicit first type parameter
                 let self_param_id = generics.types.alloc(TypeParamData {
@@ -120,14 +127,16 @@ impl GenericParams {
                 // add super traits as bounds on Self
                 // i.e., trait Foo: Bar is equivalent to trait Foo where Self: Bar
                 let self_param = TypeRef::Path(name![Self].into());
-                generics.fill_bounds(&src.value, self_param);
+                generics.fill_bounds(&lower_ctx, &src.value, self_param);
 
-                generics.fill(&mut sm, &src.value);
+                generics.fill(&lower_ctx, &mut sm, &src.value);
                 src.file_id
             }
             GenericDefId::TypeAliasId(it) => {
                 let src = it.lookup(db).source(db);
-                generics.fill(&mut sm, &src.value);
+                let lower_ctx = LowerCtx::new(db, src.file_id);
+
+                generics.fill(&lower_ctx, &mut sm, &src.value);
                 src.file_id
             }
             // Note that we don't add `Self` here: in `impl`s, `Self` is not a
@@ -135,7 +144,9 @@ impl GenericParams {
             // type, so this is handled by the resolver.
             GenericDefId::ImplId(it) => {
                 let src = it.lookup(db).source(db);
-                generics.fill(&mut sm, &src.value);
+                let lower_ctx = LowerCtx::new(db, src.file_id);
+
+                generics.fill(&lower_ctx, &mut sm, &src.value);
                 src.file_id
             }
             // We won't be using this ID anyway
@@ -145,28 +156,38 @@ impl GenericParams {
         (generics, InFile::new(file_id, sm))
     }
 
-    fn fill(&mut self, sm: &mut SourceMap, node: &dyn TypeParamsOwner) {
+    fn fill(&mut self, lower_ctx: &LowerCtx, sm: &mut SourceMap, node: &dyn TypeParamsOwner) {
         if let Some(params) = node.type_param_list() {
-            self.fill_params(sm, params)
+            self.fill_params(lower_ctx, sm, params)
         }
         if let Some(where_clause) = node.where_clause() {
-            self.fill_where_predicates(where_clause);
+            self.fill_where_predicates(lower_ctx, where_clause);
         }
     }
 
-    fn fill_bounds(&mut self, node: &dyn ast::TypeBoundsOwner, type_ref: TypeRef) {
+    fn fill_bounds(
+        &mut self,
+        lower_ctx: &LowerCtx,
+        node: &dyn ast::TypeBoundsOwner,
+        type_ref: TypeRef,
+    ) {
         for bound in
             node.type_bound_list().iter().flat_map(|type_bound_list| type_bound_list.bounds())
         {
-            self.add_where_predicate_from_bound(bound, type_ref.clone());
+            self.add_where_predicate_from_bound(lower_ctx, bound, type_ref.clone());
         }
     }
 
-    fn fill_params(&mut self, sm: &mut SourceMap, params: ast::TypeParamList) {
+    fn fill_params(
+        &mut self,
+        lower_ctx: &LowerCtx,
+        sm: &mut SourceMap,
+        params: ast::TypeParamList,
+    ) {
         for type_param in params.type_params() {
             let name = type_param.name().map_or_else(Name::missing, |it| it.as_name());
             // FIXME: Use `Path::from_src`
-            let default = type_param.default_type().map(TypeRef::from_ast);
+            let default = type_param.default_type().map(|it| TypeRef::from_ast(lower_ctx, it));
             let param = TypeParamData {
                 name: Some(name.clone()),
                 default,
@@ -176,29 +197,34 @@ impl GenericParams {
             sm.insert(param_id, Either::Right(type_param.clone()));
 
             let type_ref = TypeRef::Path(name.into());
-            self.fill_bounds(&type_param, type_ref);
+            self.fill_bounds(&lower_ctx, &type_param, type_ref);
         }
     }
 
-    fn fill_where_predicates(&mut self, where_clause: ast::WhereClause) {
+    fn fill_where_predicates(&mut self, lower_ctx: &LowerCtx, where_clause: ast::WhereClause) {
         for pred in where_clause.predicates() {
             let type_ref = match pred.type_ref() {
                 Some(type_ref) => type_ref,
                 None => continue,
             };
-            let type_ref = TypeRef::from_ast(type_ref);
+            let type_ref = TypeRef::from_ast(lower_ctx, type_ref);
             for bound in pred.type_bound_list().iter().flat_map(|l| l.bounds()) {
-                self.add_where_predicate_from_bound(bound, type_ref.clone());
+                self.add_where_predicate_from_bound(lower_ctx, bound, type_ref.clone());
             }
         }
     }
 
-    fn add_where_predicate_from_bound(&mut self, bound: ast::TypeBound, type_ref: TypeRef) {
+    fn add_where_predicate_from_bound(
+        &mut self,
+        lower_ctx: &LowerCtx,
+        bound: ast::TypeBound,
+        type_ref: TypeRef,
+    ) {
         if bound.question_token().is_some() {
             // FIXME: remove this bound
             return;
         }
-        let bound = TypeBound::from_ast(bound);
+        let bound = TypeBound::from_ast(lower_ctx, bound);
         self.where_predicates
             .push(WherePredicate { target: WherePredicateTarget::TypeRef(type_ref), bound });
     }
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index 98c74fe25..bf3968bd6 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -204,6 +204,7 @@ impl DefCollector<'_> {
                 ast_id: None,
                 krate: Some(krate),
                 kind: MacroDefKind::CustomDerive(expander),
+                local_inner: false,
             };
 
             self.define_proc_macro(name.clone(), macro_id);
@@ -941,6 +942,7 @@ impl ModCollector<'_, '_> {
                     ast_id: Some(ast_id.ast_id),
                     krate: Some(self.def_collector.def_map.krate),
                     kind: MacroDefKind::Declarative,
+                    local_inner: mac.local_inner,
                 };
                 self.def_collector.define_macro(self.module_id, name.clone(), macro_id, mac.export);
             }
diff --git a/crates/ra_hir_def/src/nameres/raw.rs b/crates/ra_hir_def/src/nameres/raw.rs
index 39b011ad7..a71503c76 100644
--- a/crates/ra_hir_def/src/nameres/raw.rs
+++ b/crates/ra_hir_def/src/nameres/raw.rs
@@ -188,6 +188,7 @@ pub(super) struct MacroData {
     pub(super) path: ModPath,
     pub(super) name: Option<Name>,
     pub(super) export: bool,
+    pub(super) local_inner: bool,
     pub(super) builtin: bool,
 }
 
@@ -401,14 +402,32 @@ impl RawItemsCollector {
 
         let name = m.name().map(|it| it.as_name());
         let ast_id = self.source_ast_id_map.ast_id(&m);
-        // FIXME: cfg_attr
-        let export = m.attrs().filter_map(|x| x.simple_name()).any(|name| name == "macro_export");
 
         // FIXME: cfg_attr
-        let builtin =
-            m.attrs().filter_map(|x| x.simple_name()).any(|name| name == "rustc_builtin_macro");
+        let export_attr = attrs.by_key("macro_export");
+
+        let export = export_attr.exists();
+        let local_inner = if export {
+            export_attr.tt_values().map(|it| &it.token_trees).flatten().any(|it| match it {
+                tt::TokenTree::Leaf(tt::Leaf::Ident(ident)) => {
+                    ident.text.contains("local_inner_macros")
+                }
+                _ => false,
+            })
+        } else {
+            false
+        };
+
+        let builtin = attrs.by_key("rustc_builtin_macro").exists();
 
-        let m = self.raw_items.macros.alloc(MacroData { ast_id, path, name, export, builtin });
+        let m = self.raw_items.macros.alloc(MacroData {
+            ast_id,
+            path,
+            name,
+            export,
+            local_inner,
+            builtin,
+        });
         self.push_item(current_module, attrs, RawItemKind::Macro(m));
     }
 
diff --git a/crates/ra_hir_def/src/nameres/tests/macros.rs b/crates/ra_hir_def/src/nameres/tests/macros.rs
index b0befdfbd..9bc0e6287 100644
--- a/crates/ra_hir_def/src/nameres/tests/macros.rs
+++ b/crates/ra_hir_def/src/nameres/tests/macros.rs
@@ -136,6 +136,43 @@ fn macro_rules_export_with_local_inner_macros_are_visible() {
 }
 
 #[test]
+fn local_inner_macros_makes_local_macros_usable() {
+    let map = def_map(
+        "
+        //- /main.rs crate:main deps:foo
+        foo::structs!(Foo, Bar);
+        mod bar;
+        //- /bar.rs
+        use crate::*;
+        //- /lib.rs crate:foo
+        #[macro_export(local_inner_macros)]
+        macro_rules! structs {
+            ($($i:ident),*) => {
+                inner!($($i),*);
+            }
+        }
+        #[macro_export]
+        macro_rules! inner {
+            ($($i:ident),*) => {
+                $(struct $i { field: u32 } )*
+            }
+        }
+        ",
+    );
+    assert_snapshot!(map, @r###"
+   ⋮crate
+   ⋮Bar: t v
+   ⋮Foo: t v
+   ⋮bar: t
+   ⋮
+   ⋮crate::bar
+   ⋮Bar: t v
+   ⋮Foo: t v
+   ⋮bar: t
+    "###);
+}
+
+#[test]
 fn unexpanded_macro_should_expand_by_fixedpoint_loop() {
     let map = def_map(
         "
diff --git a/crates/ra_hir_def/src/path.rs b/crates/ra_hir_def/src/path.rs
index 162b3c8c7..e84efe2ab 100644
--- a/crates/ra_hir_def/src/path.rs
+++ b/crates/ra_hir_def/src/path.rs
@@ -7,6 +7,7 @@ use std::{
     sync::Arc,
 };
 
+use crate::body::LowerCtx;
 use hir_expand::{
     hygiene::Hygiene,
     name::{AsName, Name},
@@ -244,8 +245,8 @@ impl<'a> PathSegments<'a> {
 }
 
 impl GenericArgs {
-    pub(crate) fn from_ast(node: ast::TypeArgList) -> Option<GenericArgs> {
-        lower::lower_generic_args(node)
+    pub(crate) fn from_ast(lower_ctx: &LowerCtx, node: ast::TypeArgList) -> Option<GenericArgs> {
+        lower::lower_generic_args(lower_ctx, node)
     }
 
     pub(crate) fn empty() -> GenericArgs {
diff --git a/crates/ra_hir_def/src/path/lower.rs b/crates/ra_hir_def/src/path/lower.rs
index 9ec2e0dcd..6a0c019fd 100644
--- a/crates/ra_hir_def/src/path/lower.rs
+++ b/crates/ra_hir_def/src/path/lower.rs
@@ -13,6 +13,7 @@ use ra_syntax::ast::{self, AstNode, TypeAscriptionOwner, TypeBoundsOwner};
 
 use super::AssociatedTypeBinding;
 use crate::{
+    body::LowerCtx,
     path::{GenericArg, GenericArgs, ModPath, Path, PathKind},
     type_ref::{TypeBound, TypeRef},
 };
@@ -26,6 +27,7 @@ pub(super) fn lower_path(mut path: ast::Path, hygiene: &Hygiene) -> Option<Path>
     let mut type_anchor = None;
     let mut segments = Vec::new();
     let mut generic_args = Vec::new();
+    let ctx = LowerCtx::with_hygiene(hygiene);
     loop {
         let segment = path.segment()?;
 
@@ -40,9 +42,10 @@ pub(super) fn lower_path(mut path: ast::Path, hygiene: &Hygiene) -> Option<Path>
                     Either::Left(name) => {
                         let args = segment
                             .type_arg_list()
-                            .and_then(lower_generic_args)
+                            .and_then(|it| lower_generic_args(&ctx, it))
                             .or_else(|| {
                                 lower_generic_args_from_fn_path(
+                                    &ctx,
                                     segment.param_list(),
                                     segment.ret_type(),
                                 )
@@ -60,7 +63,7 @@ pub(super) fn lower_path(mut path: ast::Path, hygiene: &Hygiene) -> Option<Path>
             ast::PathSegmentKind::Type { type_ref, trait_ref } => {
                 assert!(path.qualifier().is_none()); // this can only occur at the first segment
 
-                let self_type = TypeRef::from_ast(type_ref?);
+                let self_type = TypeRef::from_ast(&ctx, type_ref?);
 
                 match trait_ref {
                     // <T>::foo
@@ -113,6 +116,21 @@ pub(super) fn lower_path(mut path: ast::Path, hygiene: &Hygiene) -> Option<Path>
     }
     segments.reverse();
     generic_args.reverse();
+
+    // handle local_inner_macros :
+    // Basically, even in rustc it is quite hacky:
+    // https://github.com/rust-lang/rust/blob/614f273e9388ddd7804d5cbc80b8865068a3744e/src/librustc_resolve/macros.rs#L456
+    // We follow what it did anyway :)
+    if segments.len() == 1 && kind == PathKind::Plain {
+        if let Some(macro_call) = path.syntax().parent().and_then(ast::MacroCall::cast) {
+            if macro_call.is_bang() {
+                if let Some(crate_id) = hygiene.local_inner_macros() {
+                    kind = PathKind::DollarCrate(crate_id);
+                }
+            }
+        }
+    }
+
     let mod_path = ModPath { kind, segments };
     return Some(Path { type_anchor, mod_path, generic_args });
 
@@ -128,10 +146,13 @@ pub(super) fn lower_path(mut path: ast::Path, hygiene: &Hygiene) -> Option<Path>
     }
 }
 
-pub(super) fn lower_generic_args(node: ast::TypeArgList) -> Option<GenericArgs> {
+pub(super) fn lower_generic_args(
+    lower_ctx: &LowerCtx,
+    node: ast::TypeArgList,
+) -> Option<GenericArgs> {
     let mut args = Vec::new();
     for type_arg in node.type_args() {
-        let type_ref = TypeRef::from_ast_opt(type_arg.type_ref());
+        let type_ref = TypeRef::from_ast_opt(lower_ctx, type_arg.type_ref());
         args.push(GenericArg::Type(type_ref));
     }
     // lifetimes ignored for now
@@ -140,9 +161,9 @@ pub(super) fn lower_generic_args(node: ast::TypeArgList) -> Option<GenericArgs>
         let assoc_type_arg: ast::AssocTypeArg = assoc_type_arg;
         if let Some(name_ref) = assoc_type_arg.name_ref() {
             let name = name_ref.as_name();
-            let type_ref = assoc_type_arg.type_ref().map(TypeRef::from_ast);
+            let type_ref = assoc_type_arg.type_ref().map(|it| TypeRef::from_ast(lower_ctx, it));
             let bounds = if let Some(l) = assoc_type_arg.type_bound_list() {
-                l.bounds().map(TypeBound::from_ast).collect()
+                l.bounds().map(|it| TypeBound::from_ast(lower_ctx, it)).collect()
             } else {
                 Vec::new()
             };
@@ -159,6 +180,7 @@ pub(super) fn lower_generic_args(node: ast::TypeArgList) -> Option<GenericArgs>
 /// Collect `GenericArgs` from the parts of a fn-like path, i.e. `Fn(X, Y)
 /// -> Z` (which desugars to `Fn<(X, Y), Output=Z>`).
 fn lower_generic_args_from_fn_path(
+    ctx: &LowerCtx,
     params: Option<ast::ParamList>,
     ret_type: Option<ast::RetType>,
 ) -> Option<GenericArgs> {
@@ -167,14 +189,14 @@ fn lower_generic_args_from_fn_path(
     if let Some(params) = params {
         let mut param_types = Vec::new();
         for param in params.params() {
-            let type_ref = TypeRef::from_ast_opt(param.ascribed_type());
+            let type_ref = TypeRef::from_ast_opt(&ctx, param.ascribed_type());
             param_types.push(type_ref);
         }
         let arg = GenericArg::Type(TypeRef::Tuple(param_types));
         args.push(arg);
     }
     if let Some(ret_type) = ret_type {
-        let type_ref = TypeRef::from_ast_opt(ret_type.type_ref());
+        let type_ref = TypeRef::from_ast_opt(&ctx, ret_type.type_ref());
         bindings.push(AssociatedTypeBinding {
             name: name![Output],
             type_ref: Some(type_ref),
diff --git a/crates/ra_hir_def/src/type_ref.rs b/crates/ra_hir_def/src/type_ref.rs
index f308c6bdf..5bdad9efd 100644
--- a/crates/ra_hir_def/src/type_ref.rs
+++ b/crates/ra_hir_def/src/type_ref.rs
@@ -3,7 +3,7 @@
 
 use ra_syntax::ast::{self, TypeAscriptionOwner, TypeBoundsOwner};
 
-use crate::path::Path;
+use crate::{body::LowerCtx, path::Path};
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
 pub enum Mutability {
@@ -64,30 +64,34 @@ pub enum TypeBound {
 
 impl TypeRef {
     /// Converts an `ast::TypeRef` to a `hir::TypeRef`.
-    pub(crate) fn from_ast(node: ast::TypeRef) -> Self {
+    pub(crate) fn from_ast(ctx: &LowerCtx, node: ast::TypeRef) -> Self {
         match node {
-            ast::TypeRef::ParenType(inner) => TypeRef::from_ast_opt(inner.type_ref()),
+            ast::TypeRef::ParenType(inner) => TypeRef::from_ast_opt(&ctx, inner.type_ref()),
             ast::TypeRef::TupleType(inner) => {
-                TypeRef::Tuple(inner.fields().map(TypeRef::from_ast).collect())
+                TypeRef::Tuple(inner.fields().map(|it| TypeRef::from_ast(ctx, it)).collect())
             }
             ast::TypeRef::NeverType(..) => TypeRef::Never,
             ast::TypeRef::PathType(inner) => {
                 // FIXME: Use `Path::from_src`
-                inner.path().and_then(Path::from_ast).map(TypeRef::Path).unwrap_or(TypeRef::Error)
+                inner
+                    .path()
+                    .and_then(|it| ctx.lower_path(it))
+                    .map(TypeRef::Path)
+                    .unwrap_or(TypeRef::Error)
             }
             ast::TypeRef::PointerType(inner) => {
-                let inner_ty = TypeRef::from_ast_opt(inner.type_ref());
+                let inner_ty = TypeRef::from_ast_opt(&ctx, inner.type_ref());
                 let mutability = Mutability::from_mutable(inner.mut_token().is_some());
                 TypeRef::RawPtr(Box::new(inner_ty), mutability)
             }
             ast::TypeRef::ArrayType(inner) => {
-                TypeRef::Array(Box::new(TypeRef::from_ast_opt(inner.type_ref())))
+                TypeRef::Array(Box::new(TypeRef::from_ast_opt(&ctx, inner.type_ref())))
             }
             ast::TypeRef::SliceType(inner) => {
-                TypeRef::Slice(Box::new(TypeRef::from_ast_opt(inner.type_ref())))
+                TypeRef::Slice(Box::new(TypeRef::from_ast_opt(&ctx, inner.type_ref())))
             }
             ast::TypeRef::ReferenceType(inner) => {
-                let inner_ty = TypeRef::from_ast_opt(inner.type_ref());
+                let inner_ty = TypeRef::from_ast_opt(&ctx, inner.type_ref());
                 let mutability = Mutability::from_mutable(inner.mut_token().is_some());
                 TypeRef::Reference(Box::new(inner_ty), mutability)
             }
@@ -96,10 +100,13 @@ impl TypeRef {
                 let ret_ty = inner
                     .ret_type()
                     .and_then(|rt| rt.type_ref())
-                    .map(TypeRef::from_ast)
+                    .map(|it| TypeRef::from_ast(ctx, it))
                     .unwrap_or_else(|| TypeRef::Tuple(Vec::new()));
                 let mut params = if let Some(pl) = inner.param_list() {
-                    pl.params().map(|p| p.ascribed_type()).map(TypeRef::from_ast_opt).collect()
+                    pl.params()
+                        .map(|p| p.ascribed_type())
+                        .map(|it| TypeRef::from_ast_opt(&ctx, it))
+                        .collect()
                 } else {
                     Vec::new()
                 };
@@ -107,19 +114,19 @@ impl TypeRef {
                 TypeRef::Fn(params)
             }
             // for types are close enough for our purposes to the inner type for now...
-            ast::TypeRef::ForType(inner) => TypeRef::from_ast_opt(inner.type_ref()),
+            ast::TypeRef::ForType(inner) => TypeRef::from_ast_opt(&ctx, inner.type_ref()),
             ast::TypeRef::ImplTraitType(inner) => {
-                TypeRef::ImplTrait(type_bounds_from_ast(inner.type_bound_list()))
+                TypeRef::ImplTrait(type_bounds_from_ast(ctx, inner.type_bound_list()))
             }
             ast::TypeRef::DynTraitType(inner) => {
-                TypeRef::DynTrait(type_bounds_from_ast(inner.type_bound_list()))
+                TypeRef::DynTrait(type_bounds_from_ast(ctx, inner.type_bound_list()))
             }
         }
     }
 
-    pub(crate) fn from_ast_opt(node: Option<ast::TypeRef>) -> Self {
+    pub(crate) fn from_ast_opt(ctx: &LowerCtx, node: Option<ast::TypeRef>) -> Self {
         if let Some(node) = node {
-            TypeRef::from_ast(node)
+            TypeRef::from_ast(ctx, node)
         } else {
             TypeRef::Error
         }
@@ -180,24 +187,27 @@ impl TypeRef {
     }
 }
 
-pub(crate) fn type_bounds_from_ast(type_bounds_opt: Option<ast::TypeBoundList>) -> Vec<TypeBound> {
+pub(crate) fn type_bounds_from_ast(
+    lower_ctx: &LowerCtx,
+    type_bounds_opt: Option<ast::TypeBoundList>,
+) -> Vec<TypeBound> {
     if let Some(type_bounds) = type_bounds_opt {
-        type_bounds.bounds().map(TypeBound::from_ast).collect()
+        type_bounds.bounds().map(|it| TypeBound::from_ast(lower_ctx, it)).collect()
     } else {
         vec![]
     }
 }
 
 impl TypeBound {
-    pub(crate) fn from_ast(node: ast::TypeBound) -> Self {
+    pub(crate) fn from_ast(ctx: &LowerCtx, node: ast::TypeBound) -> Self {
         match node.kind() {
             ast::TypeBoundKind::PathType(path_type) => {
                 let path = match path_type.path() {
                     Some(p) => p,
                     None => return TypeBound::Error,
                 };
-                // FIXME: Use `Path::from_src`
-                let path = match Path::from_ast(path) {
+
+                let path = match ctx.lower_path(path) {
                     Some(p) => p,
                     None => return TypeBound::Error,
                 };
diff --git a/crates/ra_hir_expand/src/builtin_derive.rs b/crates/ra_hir_expand/src/builtin_derive.rs
index e60f879a3..1dc9cac66 100644
--- a/crates/ra_hir_expand/src/builtin_derive.rs
+++ b/crates/ra_hir_expand/src/builtin_derive.rs
@@ -38,7 +38,7 @@ macro_rules! register_builtin {
                  _ => return None,
             };
 
-            Some(MacroDefId { krate: None, ast_id: None, kind: MacroDefKind::BuiltInDerive(kind) })
+            Some(MacroDefId { krate: None, ast_id: None, kind: MacroDefKind::BuiltInDerive(kind), local_inner: false })
         }
     };
 }
diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs
index e0fef613d..d8b3d342c 100644
--- a/crates/ra_hir_expand/src/builtin_macro.rs
+++ b/crates/ra_hir_expand/src/builtin_macro.rs
@@ -73,11 +73,13 @@ pub fn find_builtin_macro(
             krate: Some(krate),
             ast_id: Some(ast_id),
             kind: MacroDefKind::BuiltIn(kind),
+            local_inner: false,
         }),
         Either::Right(kind) => Some(MacroDefId {
             krate: Some(krate),
             ast_id: Some(ast_id),
             kind: MacroDefKind::BuiltInEager(kind),
+            local_inner: false,
         }),
     }
 }
@@ -406,6 +408,7 @@ mod tests {
                     krate: Some(CrateId(0)),
                     ast_id: Some(AstId::new(file_id.into(), ast_id_map.ast_id(&macro_calls[0]))),
                     kind: MacroDefKind::BuiltIn(expander),
+                    local_inner: false,
                 };
 
                 let loc = MacroCallLoc {
@@ -425,6 +428,7 @@ mod tests {
                     krate: Some(CrateId(0)),
                     ast_id: Some(AstId::new(file_id.into(), ast_id_map.ast_id(&macro_calls[0]))),
                     kind: MacroDefKind::BuiltInEager(expander),
+                    local_inner: false,
                 };
 
                 let args = macro_calls[1].token_tree().unwrap();
diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs
index 047452306..4c12d0a15 100644
--- a/crates/ra_hir_expand/src/db.rs
+++ b/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,
diff --git a/crates/ra_hir_expand/src/hygiene.rs b/crates/ra_hir_expand/src/hygiene.rs
index 0b41d0e95..6b482a60c 100644
--- a/crates/ra_hir_expand/src/hygiene.rs
+++ b/crates/ra_hir_expand/src/hygiene.rs
@@ -12,35 +12,38 @@ use crate::{
     HirFileId, HirFileIdRepr, MacroCallId, MacroDefKind,
 };
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct Hygiene {
     // This is what `$crate` expands to
     def_crate: Option<CrateId>,
+
+    // Indiciate this is a local inner macro
+    local_inner: bool,
 }
 
 impl Hygiene {
     pub fn new(db: &dyn AstDatabase, file_id: HirFileId) -> Hygiene {
-        let def_crate = match file_id.0 {
-            HirFileIdRepr::FileId(_) => None,
+        let (def_crate, local_inner) = match file_id.0 {
+            HirFileIdRepr::FileId(_) => (None, false),
             HirFileIdRepr::MacroFile(macro_file) => match macro_file.macro_call_id {
                 MacroCallId::LazyMacro(id) => {
                     let loc = db.lookup_intern_macro(id);
                     match loc.def.kind {
-                        MacroDefKind::Declarative => loc.def.krate,
-                        MacroDefKind::BuiltIn(_) => None,
-                        MacroDefKind::BuiltInDerive(_) => None,
-                        MacroDefKind::BuiltInEager(_) => None,
-                        MacroDefKind::CustomDerive(_) => None,
+                        MacroDefKind::Declarative => (loc.def.krate, loc.def.local_inner),
+                        MacroDefKind::BuiltIn(_) => (None, false),
+                        MacroDefKind::BuiltInDerive(_) => (None, false),
+                        MacroDefKind::BuiltInEager(_) => (None, false),
+                        MacroDefKind::CustomDerive(_) => (None, false),
                     }
                 }
-                MacroCallId::EagerMacro(_id) => None,
+                MacroCallId::EagerMacro(_id) => (None, false),
             },
         };
-        Hygiene { def_crate }
+        Hygiene { def_crate, local_inner }
     }
 
     pub fn new_unhygienic() -> Hygiene {
-        Hygiene { def_crate: None }
+        Hygiene { def_crate: None, local_inner: false }
     }
 
     // FIXME: this should just return name
@@ -52,4 +55,12 @@ impl Hygiene {
         }
         Either::Left(name_ref.as_name())
     }
+
+    pub fn local_inner_macros(&self) -> Option<CrateId> {
+        if self.local_inner {
+            self.def_crate
+        } else {
+            None
+        }
+    }
 }
diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs
index 754a0f005..f440c073b 100644
--- a/crates/ra_hir_expand/src/lib.rs
+++ b/crates/ra_hir_expand/src/lib.rs
@@ -204,6 +204,8 @@ pub struct MacroDefId {
     pub krate: Option<CrateId>,
     pub ast_id: Option<AstId<ast::MacroCall>>,
     pub kind: MacroDefKind,
+
+    pub local_inner: bool,
 }
 
 impl MacroDefId {
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index 04d3cd6a2..65db6d1b0 100644
--- a/crates/ra_hir_ty/Cargo.toml
+++ b/crates/ra_hir_ty/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
 itertools = "0.9.0"
 arrayvec = "0.5.1"
 smallvec = "1.2.0"
-ena = "0.13.1"
+ena = "0.14.0"
 log = "0.4.8"
 rustc-hash = "1.1.0"
 
diff --git a/crates/ra_hir_ty/src/lib.rs b/crates/ra_hir_ty/src/lib.rs
index a8ef32ec5..a6f56c661 100644
--- a/crates/ra_hir_ty/src/lib.rs
+++ b/crates/ra_hir_ty/src/lib.rs
@@ -66,7 +66,8 @@ pub use autoderef::autoderef;
 pub use infer::{InferTy, InferenceResult};
 pub use lower::CallableDef;
 pub use lower::{
-    callable_item_sig, ImplTraitLoweringMode, TyDefId, TyLoweringContext, ValueTyDefId,
+    associated_type_shorthand_candidates, callable_item_sig, ImplTraitLoweringMode, TyDefId,
+    TyLoweringContext, ValueTyDefId,
 };
 pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment};
 
diff --git a/crates/ra_hir_ty/src/lower.rs b/crates/ra_hir_ty/src/lower.rs
index a6f893037..9ad6dbe07 100644
--- a/crates/ra_hir_ty/src/lower.rs
+++ b/crates/ra_hir_ty/src/lower.rs
@@ -17,9 +17,9 @@ use hir_def::{
     path::{GenericArg, Path, PathSegment, PathSegments},
     resolver::{HasResolver, Resolver, TypeNs},
     type_ref::{TypeBound, TypeRef},
-    AdtId, AssocContainerId, ConstId, EnumId, EnumVariantId, FunctionId, GenericDefId, HasModule,
-    ImplId, LocalFieldId, Lookup, StaticId, StructId, TraitId, TypeAliasId, TypeParamId, UnionId,
-    VariantId,
+    AdtId, AssocContainerId, AssocItemId, ConstId, EnumId, EnumVariantId, FunctionId, GenericDefId,
+    HasModule, ImplId, LocalFieldId, Lookup, StaticId, StructId, TraitId, TypeAliasId, TypeParamId,
+    UnionId, VariantId,
 };
 use ra_arena::map::ArenaMap;
 use ra_db::CrateId;
@@ -34,6 +34,7 @@ use crate::{
     Binders, BoundVar, DebruijnIndex, FnSig, GenericPredicate, PolyFnSig, ProjectionPredicate,
     ProjectionTy, Substs, TraitEnvironment, TraitRef, Ty, TypeCtor, TypeWalk,
 };
+use hir_expand::name::Name;
 
 #[derive(Debug)]
 pub struct TyLoweringContext<'a> {
@@ -383,61 +384,38 @@ impl Ty {
         res: Option<TypeNs>,
         segment: PathSegment<'_>,
     ) -> Ty {
-        let traits_from_env: Vec<_> = match res {
-            Some(TypeNs::SelfType(impl_id)) => match ctx.db.impl_trait(impl_id) {
-                None => return Ty::Unknown,
-                Some(trait_ref) => vec![trait_ref.value],
-            },
-            Some(TypeNs::GenericParam(param_id)) => {
-                let predicates = ctx.db.generic_predicates_for_param(param_id);
-                let mut traits_: Vec<_> = predicates
-                    .iter()
-                    .filter_map(|pred| match &pred.value {
-                        GenericPredicate::Implemented(tr) => Some(tr.clone()),
-                        _ => None,
-                    })
-                    .collect();
-                // Handle `Self::Type` referring to own associated type in trait definitions
-                if let GenericDefId::TraitId(trait_id) = param_id.parent {
-                    let generics = generics(ctx.db.upcast(), trait_id.into());
-                    if generics.params.types[param_id.local_id].provenance
-                        == TypeParamProvenance::TraitSelf
-                    {
-                        let trait_ref = TraitRef {
-                            trait_: trait_id,
-                            substs: Substs::bound_vars(&generics, DebruijnIndex::INNERMOST),
+        if let Some(res) = res {
+            let ty =
+                associated_type_shorthand_candidates(ctx.db, res, move |name, t, associated_ty| {
+                    if name == segment.name {
+                        let substs = match ctx.type_param_mode {
+                            TypeParamLoweringMode::Placeholder => {
+                                // if we're lowering to placeholders, we have to put
+                                // them in now
+                                let s = Substs::type_params(
+                                    ctx.db,
+                                    ctx.resolver.generic_def().expect(
+                                        "there should be generics if there's a generic param",
+                                    ),
+                                );
+                                t.substs.clone().subst_bound_vars(&s)
+                            }
+                            TypeParamLoweringMode::Variable => t.substs.clone(),
                         };
-                        traits_.push(trait_ref);
+                        // FIXME handle type parameters on the segment
+                        return Some(Ty::Projection(ProjectionTy {
+                            associated_ty,
+                            parameters: substs,
+                        }));
                     }
-                }
-                traits_
-            }
-            _ => return Ty::Unknown,
-        };
-        let traits = traits_from_env.into_iter().flat_map(|t| all_super_trait_refs(ctx.db, t));
-        for t in traits {
-            if let Some(associated_ty) =
-                ctx.db.trait_data(t.trait_).associated_type_by_name(&segment.name)
-            {
-                let substs = match ctx.type_param_mode {
-                    TypeParamLoweringMode::Placeholder => {
-                        // if we're lowering to placeholders, we have to put
-                        // them in now
-                        let s = Substs::type_params(
-                            ctx.db,
-                            ctx.resolver
-                                .generic_def()
-                                .expect("there should be generics if there's a generic param"),
-                        );
-                        t.substs.subst_bound_vars(&s)
-                    }
-                    TypeParamLoweringMode::Variable => t.substs,
-                };
-                // FIXME handle (forbid) type parameters on the segment
-                return Ty::Projection(ProjectionTy { associated_ty, parameters: substs });
-            }
+
+                    None
+                });
+
+            ty.unwrap_or(Ty::Unknown)
+        } else {
+            Ty::Unknown
         }
-        Ty::Unknown
     }
 
     fn from_hir_path_inner(
@@ -694,6 +672,61 @@ pub fn callable_item_sig(db: &dyn HirDatabase, def: CallableDef) -> PolyFnSig {
     }
 }
 
+pub fn associated_type_shorthand_candidates<R>(
+    db: &dyn HirDatabase,
+    res: TypeNs,
+    mut cb: impl FnMut(&Name, &TraitRef, TypeAliasId) -> Option<R>,
+) -> Option<R> {
+    let traits_from_env: Vec<_> = match res {
+        TypeNs::SelfType(impl_id) => match db.impl_trait(impl_id) {
+            None => vec![],
+            Some(trait_ref) => vec![trait_ref.value],
+        },
+        TypeNs::GenericParam(param_id) => {
+            let predicates = db.generic_predicates_for_param(param_id);
+            let mut traits_: Vec<_> = predicates
+                .iter()
+                .filter_map(|pred| match &pred.value {
+                    GenericPredicate::Implemented(tr) => Some(tr.clone()),
+                    _ => None,
+                })
+                .collect();
+            // Handle `Self::Type` referring to own associated type in trait definitions
+            if let GenericDefId::TraitId(trait_id) = param_id.parent {
+                let generics = generics(db.upcast(), trait_id.into());
+                if generics.params.types[param_id.local_id].provenance
+                    == TypeParamProvenance::TraitSelf
+                {
+                    let trait_ref = TraitRef {
+                        trait_: trait_id,
+                        substs: Substs::bound_vars(&generics, DebruijnIndex::INNERMOST),
+                    };
+                    traits_.push(trait_ref);
+                }
+            }
+            traits_
+        }
+        _ => vec![],
+    };
+
+    for t in traits_from_env.into_iter().flat_map(move |t| all_super_trait_refs(db, t)) {
+        let data = db.trait_data(t.trait_);
+
+        for (name, assoc_id) in &data.items {
+            match assoc_id {
+                AssocItemId::TypeAliasId(alias) => {
+                    if let Some(result) = cb(name, &t, *alias) {
+                        return Some(result);
+                    }
+                }
+                AssocItemId::FunctionId(_) | AssocItemId::ConstId(_) => {}
+            }
+        }
+    }
+
+    None
+}
+
 /// Build the type of all specific fields of a struct or enum variant.
 pub(crate) fn field_types_query(
     db: &dyn HirDatabase,
diff --git a/crates/ra_hir_ty/src/tests/macros.rs b/crates/ra_hir_ty/src/tests/macros.rs
index 5ddecbdc6..29e38a06c 100644
--- a/crates/ra_hir_ty/src/tests/macros.rs
+++ b/crates/ra_hir_ty/src/tests/macros.rs
@@ -339,6 +339,46 @@ pub fn baz() -> usize { 31usize }
 }
 
 #[test]
+fn infer_macro_with_dollar_crate_is_correct_in_trait_associate_type() {
+    let (db, pos) = TestDB::with_position(
+        r#"
+//- /main.rs crate:main deps:foo
+use foo::Trait;
+
+fn test() {
+    let msg = foo::Message(foo::MessageRef);
+    let r = msg.deref();
+    r<|>;
+}
+
+//- /lib.rs crate:foo
+pub struct MessageRef;
+pub struct Message(MessageRef);
+
+pub trait Trait {
+    type Target;
+    fn deref(&self) -> &Self::Target;
+}
+
+#[macro_export]
+macro_rules! expand {
+    () => {
+        impl Trait for Message {
+            type Target = $crate::MessageRef;
+            fn deref(&self) ->  &Self::Target {
+                &self.0
+            }
+        }
+    }
+}
+
+expand!();
+"#,
+    );
+    assert_eq!("&MessageRef", type_at_pos(&db, pos));
+}
+
+#[test]
 fn infer_type_value_non_legacy_macro_use_as() {
     assert_snapshot!(
         infer(r#"
@@ -388,6 +428,32 @@ fn main() {
 }
 
 #[test]
+fn infer_local_inner_macros() {
+    let (db, pos) = TestDB::with_position(
+        r#"
+//- /main.rs crate:main deps:foo
+fn test() {
+    let x = foo::foo!(1);
+    x<|>;
+}
+
+//- /lib.rs crate:foo
+#[macro_export(local_inner_macros)]
+macro_rules! foo {
+    (1) => { bar!() };
+}
+
+#[macro_export]
+macro_rules! bar {
+    () => { 42 }
+}
+
+"#,
+    );
+    assert_eq!("i32", type_at_pos(&db, pos));
+}
+
+#[test]
 fn infer_builtin_macros_line() {
     assert_snapshot!(
         infer(r#"
diff --git a/crates/ra_hir_ty/src/tests/simple.rs b/crates/ra_hir_ty/src/tests/simple.rs
index 56abc65b8..3d3088965 100644
--- a/crates/ra_hir_ty/src/tests/simple.rs
+++ b/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
+    "###
+    )
+}
diff --git a/crates/ra_ide/src/completion/complete_dot.rs b/crates/ra_ide/src/completion/complete_dot.rs
index 814354ffa..05f825c6f 100644
--- a/crates/ra_ide/src/completion/complete_dot.rs
+++ b/crates/ra_ide/src/completion/complete_dot.rs
@@ -250,6 +250,44 @@ mod tests {
     }
 
     #[test]
+    fn test_union_field_completion() {
+        assert_debug_snapshot!(
+            do_ref_completion(
+                r"
+            union Un {
+                field: u8,
+                other: u16,
+            }
+
+            fn foo(u: Un) {
+                u.<|>
+            }
+            ",
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "field",
+                source_range: 140..140,
+                delete: 140..140,
+                insert: "field",
+                kind: Field,
+                detail: "u8",
+            },
+            CompletionItem {
+                label: "other",
+                source_range: 140..140,
+                delete: 140..140,
+                insert: "other",
+                kind: Field,
+                detail: "u16",
+            },
+        ]
+        "###
+        );
+    }
+
+    #[test]
     fn test_method_completion() {
         assert_debug_snapshot!(
         do_ref_completion(
diff --git a/crates/ra_ide/src/completion/complete_qualified_path.rs b/crates/ra_ide/src/completion/complete_qualified_path.rs
index dd10f74e6..aa56a5cd8 100644
--- a/crates/ra_ide/src/completion/complete_qualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_qualified_path.rs
@@ -5,19 +5,29 @@ use ra_syntax::AstNode;
 use test_utils::tested_by;
 
 use crate::completion::{CompletionContext, Completions};
+use rustc_hash::FxHashSet;
 
 pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionContext) {
     let path = match &ctx.path_prefix {
         Some(path) => path.clone(),
         _ => return,
     };
-    let def = match ctx.scope().resolve_hir_path(&path) {
-        Some(PathResolution::Def(def)) => def,
-        _ => return,
+    let scope = ctx.scope();
+    let context_module = scope.module();
+
+    let res = match scope.resolve_hir_path(&path) {
+        Some(res) => res,
+        None => return,
     };
-    let context_module = ctx.scope().module();
-    match def {
-        hir::ModuleDef::Module(module) => {
+
+    // Add associated types on type parameters and `Self`.
+    res.assoc_type_shorthand_candidates(ctx.db, |alias| {
+        acc.add_type_alias(ctx, alias);
+        None::<()>
+    });
+
+    match res {
+        PathResolution::Def(hir::ModuleDef::Module(module)) => {
             let module_scope = module.scope(ctx.db, context_module);
             for (name, def) in module_scope {
                 if ctx.use_item_syntax.is_some() {
@@ -35,7 +45,8 @@ pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
                 acc.add_resolution(ctx, name.to_string(), &def);
             }
         }
-        hir::ModuleDef::Adt(_) | hir::ModuleDef::TypeAlias(_) => {
+        PathResolution::Def(def @ hir::ModuleDef::Adt(_))
+        | PathResolution::Def(def @ hir::ModuleDef::TypeAlias(_)) => {
             if let hir::ModuleDef::Adt(Adt::Enum(e)) = def {
                 for variant in e.variants(ctx.db) {
                     acc.add_enum_variant(ctx, variant, None);
@@ -46,8 +57,10 @@ pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
                 hir::ModuleDef::TypeAlias(a) => a.ty(ctx.db),
                 _ => unreachable!(),
             };
-            // Iterate assoc types separately
-            // FIXME: complete T::AssocType
+
+            // XXX: For parity with Rust bug #22519, this does not complete Ty::AssocType.
+            // (where AssocType is defined on a trait, not an inherent impl)
+
             let krate = ctx.krate;
             if let Some(krate) = krate {
                 let traits_in_scope = ctx.scope().traits_in_scope();
@@ -65,6 +78,7 @@ pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
                     None::<()>
                 });
 
+                // Iterate assoc types separately
                 ty.iterate_impl_items(ctx.db, krate, |item| {
                     if context_module.map_or(false, |m| !item.is_visible_from(ctx.db, m)) {
                         return None;
@@ -77,7 +91,8 @@ pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
                 });
             }
         }
-        hir::ModuleDef::Trait(t) => {
+        PathResolution::Def(hir::ModuleDef::Trait(t)) => {
+            // Handles `Trait::assoc` as well as `<Ty as Trait>::assoc`.
             for item in t.items(ctx.db) {
                 if context_module.map_or(false, |m| !item.is_visible_from(ctx.db, m)) {
                     continue;
@@ -91,8 +106,38 @@ pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
                 }
             }
         }
+        PathResolution::TypeParam(_) | PathResolution::SelfType(_) => {
+            if let Some(krate) = ctx.krate {
+                let ty = match res {
+                    PathResolution::TypeParam(param) => param.ty(ctx.db),
+                    PathResolution::SelfType(impl_def) => impl_def.target_ty(ctx.db),
+                    _ => return,
+                };
+
+                let traits_in_scope = ctx.scope().traits_in_scope();
+                let mut seen = FxHashSet::default();
+                ty.iterate_path_candidates(ctx.db, krate, &traits_in_scope, None, |_ty, item| {
+                    if context_module.map_or(false, |m| !item.is_visible_from(ctx.db, m)) {
+                        return None;
+                    }
+
+                    // We might iterate candidates of a trait multiple times here, so deduplicate
+                    // them.
+                    if seen.insert(item) {
+                        match item {
+                            hir::AssocItem::Function(func) => {
+                                acc.add_function(ctx, func, None);
+                            }
+                            hir::AssocItem::Const(ct) => acc.add_const(ctx, ct),
+                            hir::AssocItem::TypeAlias(ty) => acc.add_type_alias(ctx, ty),
+                        }
+                    }
+                    None::<()>
+                });
+            }
+        }
         _ => {}
-    };
+    }
 }
 
 #[cfg(test)]
@@ -844,6 +889,211 @@ mod tests {
     }
 
     #[test]
+    fn completes_ty_param_assoc_ty() {
+        assert_debug_snapshot!(
+            do_reference_completion(
+                "
+                //- /lib.rs
+                trait Super {
+                    type Ty;
+                    const CONST: u8;
+                    fn func() {}
+                    fn method(&self) {}
+                }
+
+                trait Sub: Super {
+                    type SubTy;
+                    const C2: ();
+                    fn subfunc() {}
+                    fn submethod(&self) {}
+                }
+
+                fn foo<T: Sub>() {
+                    T::<|>
+                }
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "C2",
+                source_range: 219..219,
+                delete: 219..219,
+                insert: "C2",
+                kind: Const,
+                detail: "const C2: ();",
+            },
+            CompletionItem {
+                label: "CONST",
+                source_range: 219..219,
+                delete: 219..219,
+                insert: "CONST",
+                kind: Const,
+                detail: "const CONST: u8;",
+            },
+            CompletionItem {
+                label: "SubTy",
+                source_range: 219..219,
+                delete: 219..219,
+                insert: "SubTy",
+                kind: TypeAlias,
+                detail: "type SubTy;",
+            },
+            CompletionItem {
+                label: "Ty",
+                source_range: 219..219,
+                delete: 219..219,
+                insert: "Ty",
+                kind: TypeAlias,
+                detail: "type Ty;",
+            },
+            CompletionItem {
+                label: "func()",
+                source_range: 219..219,
+                delete: 219..219,
+                insert: "func()$0",
+                kind: Function,
+                lookup: "func",
+                detail: "fn func()",
+            },
+            CompletionItem {
+                label: "method()",
+                source_range: 219..219,
+                delete: 219..219,
+                insert: "method()$0",
+                kind: Method,
+                lookup: "method",
+                detail: "fn method(&self)",
+            },
+            CompletionItem {
+                label: "subfunc()",
+                source_range: 219..219,
+                delete: 219..219,
+                insert: "subfunc()$0",
+                kind: Function,
+                lookup: "subfunc",
+                detail: "fn subfunc()",
+            },
+            CompletionItem {
+                label: "submethod()",
+                source_range: 219..219,
+                delete: 219..219,
+                insert: "submethod()$0",
+                kind: Method,
+                lookup: "submethod",
+                detail: "fn submethod(&self)",
+            },
+        ]
+        "###
+        );
+    }
+
+    #[test]
+    fn completes_self_param_assoc_ty() {
+        assert_debug_snapshot!(
+            do_reference_completion(
+                "
+                //- /lib.rs
+                trait Super {
+                    type Ty;
+                    const CONST: u8 = 0;
+                    fn func() {}
+                    fn method(&self) {}
+                }
+
+                trait Sub: Super {
+                    type SubTy;
+                    const C2: () = ();
+                    fn subfunc() {}
+                    fn submethod(&self) {}
+                }
+
+                struct Wrap<T>(T);
+                impl<T> Super for Wrap<T> {}
+                impl<T> Sub for Wrap<T> {
+                    fn subfunc() {
+                        // Should be able to assume `Self: Sub + Super`
+                        Self::<|>
+                    }
+                }
+                "
+            ),
+            @r###"
+        [
+            CompletionItem {
+                label: "C2",
+                source_range: 365..365,
+                delete: 365..365,
+                insert: "C2",
+                kind: Const,
+                detail: "const C2: () = ();",
+            },
+            CompletionItem {
+                label: "CONST",
+                source_range: 365..365,
+                delete: 365..365,
+                insert: "CONST",
+                kind: Const,
+                detail: "const CONST: u8 = 0;",
+            },
+            CompletionItem {
+                label: "SubTy",
+                source_range: 365..365,
+                delete: 365..365,
+                insert: "SubTy",
+                kind: TypeAlias,
+                detail: "type SubTy;",
+            },
+            CompletionItem {
+                label: "Ty",
+                source_range: 365..365,
+                delete: 365..365,
+                insert: "Ty",
+                kind: TypeAlias,
+                detail: "type Ty;",
+            },
+            CompletionItem {
+                label: "func()",
+                source_range: 365..365,
+                delete: 365..365,
+                insert: "func()$0",
+                kind: Function,
+                lookup: "func",
+                detail: "fn func()",
+            },
+            CompletionItem {
+                label: "method()",
+                source_range: 365..365,
+                delete: 365..365,
+                insert: "method()$0",
+                kind: Method,
+                lookup: "method",
+                detail: "fn method(&self)",
+            },
+            CompletionItem {
+                label: "subfunc()",
+                source_range: 365..365,
+                delete: 365..365,
+                insert: "subfunc()$0",
+                kind: Function,
+                lookup: "subfunc",
+                detail: "fn subfunc()",
+            },
+            CompletionItem {
+                label: "submethod()",
+                source_range: 365..365,
+                delete: 365..365,
+                insert: "submethod()$0",
+                kind: Method,
+                lookup: "submethod",
+                detail: "fn submethod(&self)",
+            },
+        ]
+        "###
+        );
+    }
+
+    #[test]
     fn completes_type_alias() {
         assert_debug_snapshot!(
             do_reference_completion(
diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs
index f559f2b97..a6a5568de 100644
--- a/crates/ra_ide/src/completion/complete_unqualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -53,7 +53,7 @@ fn complete_enum_variants(acc: &mut Completions, ctx: &CompletionContext, ty: &T
                 // Variants with trivial paths are already added by the existing completion logic,
                 // so we should avoid adding these twice
                 if path.segments.len() > 1 {
-                    acc.add_enum_variant(ctx, variant, Some(path.to_string()));
+                    acc.add_qualified_enum_variant(ctx, variant, path);
                 }
             }
         }
@@ -1173,6 +1173,7 @@ mod tests {
                 delete: 248..250,
                 insert: "Foo::Bar",
                 kind: EnumVariant,
+                lookup: "Bar",
                 detail: "()",
             },
             CompletionItem {
@@ -1181,6 +1182,7 @@ mod tests {
                 delete: 248..250,
                 insert: "Foo::Baz",
                 kind: EnumVariant,
+                lookup: "Baz",
                 detail: "()",
             },
             CompletionItem {
@@ -1189,6 +1191,7 @@ mod tests {
                 delete: 248..250,
                 insert: "Foo::Quux",
                 kind: EnumVariant,
+                lookup: "Quux",
                 detail: "()",
             },
         ]
@@ -1231,6 +1234,7 @@ mod tests {
                 delete: 219..221,
                 insert: "Foo::Bar",
                 kind: EnumVariant,
+                lookup: "Bar",
                 detail: "()",
             },
             CompletionItem {
@@ -1239,6 +1243,7 @@ mod tests {
                 delete: 219..221,
                 insert: "Foo::Baz",
                 kind: EnumVariant,
+                lookup: "Baz",
                 detail: "()",
             },
             CompletionItem {
@@ -1247,6 +1252,7 @@ mod tests {
                 delete: 219..221,
                 insert: "Foo::Quux",
                 kind: EnumVariant,
+                lookup: "Quux",
                 detail: "()",
             },
         ]
@@ -1285,6 +1291,7 @@ mod tests {
                 delete: 185..186,
                 insert: "Foo::Bar",
                 kind: EnumVariant,
+                lookup: "Bar",
                 detail: "()",
             },
             CompletionItem {
@@ -1293,6 +1300,7 @@ mod tests {
                 delete: 185..186,
                 insert: "Foo::Baz",
                 kind: EnumVariant,
+                lookup: "Baz",
                 detail: "()",
             },
             CompletionItem {
@@ -1301,6 +1309,7 @@ mod tests {
                 delete: 185..186,
                 insert: "Foo::Quux",
                 kind: EnumVariant,
+                lookup: "Quux",
                 detail: "()",
             },
             CompletionItem {
@@ -1353,6 +1362,7 @@ mod tests {
                 delete: 98..99,
                 insert: "m::E::V",
                 kind: EnumVariant,
+                lookup: "V",
                 detail: "()",
             },
         ]
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index 118fceb2e..c529752d4 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/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()),
diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index 77d354376..2edb130cf 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -1,6 +1,6 @@
 //! This modules takes care of rendering various definitions as completion items.
 
-use hir::{Docs, HasAttrs, HasSource, HirDisplay, ScopeDef, StructKind, Type};
+use hir::{Docs, HasAttrs, HasSource, HirDisplay, ModPath, ScopeDef, StructKind, Type};
 use ra_syntax::ast::NameOwner;
 use stdx::SepBy;
 use test_utils::tested_by;
@@ -246,14 +246,37 @@ impl Completions {
             .add_to(self);
     }
 
+    pub(crate) fn add_qualified_enum_variant(
+        &mut self,
+        ctx: &CompletionContext,
+        variant: hir::EnumVariant,
+        path: ModPath,
+    ) {
+        self.add_enum_variant_impl(ctx, variant, None, Some(path))
+    }
+
     pub(crate) fn add_enum_variant(
         &mut self,
         ctx: &CompletionContext,
         variant: hir::EnumVariant,
         local_name: Option<String>,
     ) {
+        self.add_enum_variant_impl(ctx, variant, local_name, None)
+    }
+
+    fn add_enum_variant_impl(
+        &mut self,
+        ctx: &CompletionContext,
+        variant: hir::EnumVariant,
+        local_name: Option<String>,
+        path: Option<ModPath>,
+    ) {
         let is_deprecated = is_deprecated(variant, ctx.db);
         let name = local_name.unwrap_or_else(|| variant.name(ctx.db).to_string());
+        let qualified_name = match &path {
+            Some(it) => it.to_string(),
+            None => name.to_string(),
+        };
         let detail_types = variant
             .fields(ctx.db)
             .into_iter()
@@ -271,16 +294,23 @@ impl Completions {
                 .surround_with("{ ", " }")
                 .to_string(),
         };
-        let mut res =
-            CompletionItem::new(CompletionKind::Reference, ctx.source_range(), name.clone())
-                .kind(CompletionItemKind::EnumVariant)
-                .set_documentation(variant.docs(ctx.db))
-                .set_deprecated(is_deprecated)
-                .detail(detail);
+        let mut res = CompletionItem::new(
+            CompletionKind::Reference,
+            ctx.source_range(),
+            qualified_name.clone(),
+        )
+        .kind(CompletionItemKind::EnumVariant)
+        .set_documentation(variant.docs(ctx.db))
+        .set_deprecated(is_deprecated)
+        .detail(detail);
+
+        if path.is_some() {
+            res = res.lookup_by(name);
+        }
 
         if variant_kind == StructKind::Tuple {
             let params = Params::Anonymous(variant.fields(ctx.db).len());
-            res = res.add_call_parens(ctx, name, params)
+            res = res.add_call_parens(ctx, qualified_name, params)
         }
 
         res.add_to(self);
diff --git a/crates/ra_ide/src/display/function_signature.rs b/crates/ra_ide/src/display/function_signature.rs
index b5e2785fe..db3907fe6 100644
--- a/crates/ra_ide/src/display/function_signature.rs
+++ b/crates/ra_ide/src/display/function_signature.rs
@@ -26,6 +26,8 @@ pub struct FunctionSignature {
     pub kind: CallableKind,
     /// Optional visibility
     pub visibility: Option<String>,
+    /// Qualifiers like `async`, `unsafe`, ...
+    pub qualifier: FunctionQualifier,
     /// Name of the function
     pub name: Option<String>,
     /// Documentation for the function
@@ -46,6 +48,16 @@ pub struct FunctionSignature {
     pub has_self_param: bool,
 }
 
+#[derive(Debug, Default)]
+pub struct FunctionQualifier {
+    // `async` and `const` are mutually exclusive. Do we need to enforcing it here?
+    pub is_async: bool,
+    pub is_const: bool,
+    pub is_unsafe: bool,
+    /// The string `extern ".."`
+    pub extern_abi: Option<String>,
+}
+
 impl FunctionSignature {
     pub(crate) fn with_doc_opt(mut self, doc: Option<Documentation>) -> Self {
         self.doc = doc;
@@ -83,6 +95,8 @@ impl FunctionSignature {
             FunctionSignature {
                 kind: CallableKind::StructConstructor,
                 visibility: node.visibility().map(|n| n.syntax().text().to_string()),
+                // Do we need `const`?
+                qualifier: Default::default(),
                 name: node.name().map(|n| n.text().to_string()),
                 ret_type: node.name().map(|n| n.text().to_string()),
                 parameters: params,
@@ -128,6 +142,8 @@ impl FunctionSignature {
             FunctionSignature {
                 kind: CallableKind::VariantConstructor,
                 visibility: None,
+                // Do we need `const`?
+                qualifier: Default::default(),
                 name: Some(name),
                 ret_type: None,
                 parameters: params,
@@ -151,6 +167,7 @@ impl FunctionSignature {
             FunctionSignature {
                 kind: CallableKind::Macro,
                 visibility: None,
+                qualifier: Default::default(),
                 name: node.name().map(|n| n.text().to_string()),
                 ret_type: None,
                 parameters: params,
@@ -223,6 +240,12 @@ impl From<&'_ ast::FnDef> for FunctionSignature {
         FunctionSignature {
             kind: CallableKind::Function,
             visibility: node.visibility().map(|n| n.syntax().text().to_string()),
+            qualifier: FunctionQualifier {
+                is_async: node.async_token().is_some(),
+                is_const: node.const_token().is_some(),
+                is_unsafe: node.unsafe_token().is_some(),
+                extern_abi: node.abi().map(|n| n.to_string()),
+            },
             name: node.name().map(|n| n.text().to_string()),
             ret_type: node
                 .ret_type()
@@ -246,6 +269,23 @@ impl Display for FunctionSignature {
             write!(f, "{} ", t)?;
         }
 
+        if self.qualifier.is_async {
+            write!(f, "async ")?;
+        }
+
+        if self.qualifier.is_const {
+            write!(f, "const ")?;
+        }
+
+        if self.qualifier.is_unsafe {
+            write!(f, "unsafe ")?;
+        }
+
+        if let Some(extern_abi) = &self.qualifier.extern_abi {
+            // Keyword `extern` is included in the string.
+            write!(f, "{} ", extern_abi)?;
+        }
+
         if let Some(name) = &self.name {
             match self.kind {
                 CallableKind::Function => write!(f, "fn {}", name)?,
diff --git a/crates/ra_ide/src/display/short_label.rs b/crates/ra_ide/src/display/short_label.rs
index 4b081bf6c..d37260e96 100644
--- a/crates/ra_ide/src/display/short_label.rs
+++ b/crates/ra_ide/src/display/short_label.rs
@@ -33,7 +33,11 @@ impl ShortLabel for ast::EnumDef {
 
 impl ShortLabel for ast::TraitDef {
     fn short_label(&self) -> Option<String> {
-        short_label_from_node(self, "trait ")
+        if self.unsafe_token().is_some() {
+            short_label_from_node(self, "unsafe trait ")
+        } else {
+            short_label_from_node(self, "trait ")
+        }
     }
 }
 
diff --git a/crates/ra_ide/src/folding_ranges.rs b/crates/ra_ide/src/folding_ranges.rs
index 4379005aa..8657377de 100644
--- a/crates/ra_ide/src/folding_ranges.rs
+++ b/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),
diff --git a/crates/ra_ide/src/hover.rs b/crates/ra_ide/src/hover.rs
index 58c799eca..54d318858 100644
--- a/crates/ra_ide/src/hover.rs
+++ b/crates/ra_ide/src/hover.rs
@@ -844,4 +844,40 @@ fn func(foo: i32) { if true { <|>foo; }; }
             &["fn foo()\n```\n\n<- `\u{3000}` here"],
         );
     }
+
+    #[test]
+    fn test_hover_function_show_qualifiers() {
+        check_hover_result(
+            "
+            //- /lib.rs
+            async fn foo<|>() {}
+            ",
+            &["async fn foo()"],
+        );
+        check_hover_result(
+            "
+            //- /lib.rs
+            pub const unsafe fn foo<|>() {}
+            ",
+            &["pub const unsafe fn foo()"],
+        );
+        check_hover_result(
+            r#"
+            //- /lib.rs
+            pub(crate) async unsafe extern "C" fn foo<|>() {}
+            "#,
+            &[r#"pub(crate) async unsafe extern "C" fn foo()"#],
+        );
+    }
+
+    #[test]
+    fn test_hover_trait_show_qualifiers() {
+        check_hover_result(
+            "
+            //- /lib.rs
+            unsafe trait foo<|>() {}
+            ",
+            &["unsafe trait foo"],
+        );
+    }
 }
diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs
index fde0bfa98..63fd6b3e4 100644
--- a/crates/ra_ide/src/join_lines.rs
+++ b/crates/ra_ide/src/join_lines.rs
@@ -129,8 +129,10 @@ 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;
+    }
     let expr = extract_trivial_expression(&block_expr)?;
 
     let block_range = block_expr.syntax().text_range();
@@ -662,4 +664,67 @@ fn main() {
         ",
         )
     }
+
+    #[test]
+    fn join_lines_mandatory_blocks_block() {
+        check_join_lines(
+            r"
+<|>fn foo() {
+    92
+}
+        ",
+            r"
+<|>fn foo() { 92
+}
+        ",
+        );
+
+        check_join_lines(
+            r"
+fn foo() {
+    <|>if true {
+        92
+    }
+}
+        ",
+            r"
+fn foo() {
+    <|>if true { 92
+    }
+}
+        ",
+        );
+
+        check_join_lines(
+            r"
+fn foo() {
+    <|>loop {
+        92
+    }
+}
+        ",
+            r"
+fn foo() {
+    <|>loop { 92
+    }
+}
+        ",
+        );
+
+        check_join_lines(
+            r"
+fn foo() {
+    <|>unsafe {
+        92
+    }
+}
+        ",
+            r"
+fn foo() {
+    <|>unsafe { 92
+    }
+}
+        ",
+        );
+    }
 }
diff --git a/crates/ra_ide/src/syntax_tree.rs b/crates/ra_ide/src/syntax_tree.rs
index bf97f8c56..86c70ff83 100644
--- a/crates/ra_ide/src/syntax_tree.rs
+++ b/crates/ra_ide/src/syntax_tree.rs
@@ -120,9 +120,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -153,26 +152,25 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "assert"
-            [email protected] "!"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"\n    fn foo() {\n     ..."
-              [email protected] ","
-              [email protected] " "
-              [email protected] "\"\""
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "assert"
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected] "\"\n    fn foo() {\n     ..."
+            [email protected] ","
+            [email protected] " "
+            [email protected] "\"\""
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -196,9 +194,8 @@ [email protected]
     [email protected] ")"
   [email protected] " "
   [email protected]
-    [email protected]
-      [email protected] "{"
-      [email protected] "}"
+    [email protected] "{"
+    [email protected] "}"
 "#
             .trim()
         );
@@ -265,10 +262,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -300,10 +296,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );
@@ -334,10 +329,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -349,10 +343,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
 "#
             .trim()
         );
diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs
index 0d924ce58..c43003fd6 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/ra_mbe/src/tests.rs
@@ -266,21 +266,20 @@ fn test_expr_order() {
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "1"
-              [email protected] "+"
-              [email protected]
-                [email protected] "1"
-            [email protected] "*"
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "}""#,
+      [email protected] "{"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "1"
+            [email protected] "+"
+            [email protected]
+              [email protected] "1"
+          [email protected] "*"
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "}""#,
     );
 }
 
@@ -1114,68 +1113,67 @@ fn test_vec() {
     assert_eq!(
         format!("{:#?}", tree).trim(),
         r#"[email protected]
-  [email protected]
-    [email protected] "{"
-    [email protected]
-      [email protected] "let"
-      [email protected]
-        [email protected] "mut"
-        [email protected]
-          [email protected] "v"
-      [email protected] "="
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Vec"
-            [email protected] "::"
-            [email protected]
-              [email protected]
-                [email protected] "new"
-        [email protected]
-          [email protected] "("
-          [email protected] ")"
-      [email protected] ";"
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "v"
-        [email protected] "."
-        [email protected]
-          [email protected] "push"
-        [email protected]
-          [email protected] "("
-          [email protected]
-            [email protected] "1u32"
-          [email protected] ")"
-      [email protected] ";"
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "v"
-        [email protected] "."
-        [email protected]
-          [email protected] "push"
-        [email protected]
-          [email protected] "("
-          [email protected]
-            [email protected] "2"
-          [email protected] ")"
-      [email protected] ";"
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected] "v"
-    [email protected] "}""#
+  [email protected] "{"
+  [email protected]
+    [email protected] "let"
+    [email protected]
+      [email protected] "mut"
+      [email protected]
+        [email protected] "v"
+    [email protected] "="
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Vec"
+          [email protected] "::"
+          [email protected]
+            [email protected]
+              [email protected] "new"
+      [email protected]
+        [email protected] "("
+        [email protected] ")"
+    [email protected] ";"
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "v"
+      [email protected] "."
+      [email protected]
+        [email protected] "push"
+      [email protected]
+        [email protected] "("
+        [email protected]
+          [email protected] "1u32"
+        [email protected] ")"
+    [email protected] ";"
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "v"
+      [email protected] "."
+      [email protected]
+        [email protected] "push"
+      [email protected]
+        [email protected] "("
+        [email protected]
+          [email protected] "2"
+        [email protected] ")"
+    [email protected] ";"
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "v"
+  [email protected] "}""#
     );
 }
 
diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index c2a6e82e9..be0cd5661 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -54,7 +54,7 @@ pub(crate) mod fragments {
     use super::*;
 
     pub(crate) use super::{
-        expressions::block, paths::type_path as path, patterns::pattern, types::type_,
+        expressions::block_expr, paths::type_path as path, patterns::pattern, types::type_,
     };
 
     pub(crate) fn expr(p: &mut Parser) {
@@ -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_expr,
         RECORD_FIELD_DEF_LIST => items::record_field_def_list,
         RECORD_FIELD_LIST => items::record_field_list,
         ENUM_VARIANT_LIST => items::enum_variant_list,
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs
index cb30b25a8..34f039768 100644
--- a/crates/ra_parser/src/grammar/expressions.rs
+++ b/crates/ra_parser/src/grammar/expressions.rs
@@ -2,7 +2,7 @@
 
 mod atom;
 
-pub(crate) use self::atom::match_arm_list;
+pub(crate) use self::atom::{block_expr, match_arm_list};
 pub(super) use self::atom::{literal, LITERAL_FIRST};
 use super::*;
 
@@ -49,28 +49,6 @@ fn expr_no_struct(p: &mut Parser) {
     expr_bp(p, r, 1);
 }
 
-// test block
-// fn a() {}
-// fn b() { let _ = 1; }
-// fn c() { 1; 2; }
-// fn d() { 1; 2 }
-pub(crate) fn block(p: &mut Parser) {
-    if !p.at(T!['{']) {
-        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);
-}
-
 fn is_expr_stmt_attr_allowed(kind: SyntaxKind) -> bool {
     match kind {
         BIN_EXPR | RANGE_EXPR | IF_EXPR => false,
@@ -197,7 +175,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);
 
diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index 0d277a586..706a2f796 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/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_unchecked(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,
@@ -231,13 +240,9 @@ fn lambda_expr(p: &mut Parser) -> CompletedMarker {
     p.eat(T![move]);
     params::param_list_closure(p);
     if opt_fn_ret_type(p) {
-        if p.at(T!['{']) {
-            // test lambda_ret_block
-            // fn main() { || -> i32 { 92 }(); }
-            block_expr(p, None);
-        } else {
-            p.error("expected `{`");
-        }
+        // test lambda_ret_block
+        // fn main() { || -> i32 { 92 }(); }
+        block_expr(p);
     } else {
         if p.at_ts(EXPR_FIRST) {
             expr(p);
@@ -261,13 +266,13 @@ fn if_expr(p: &mut Parser) -> CompletedMarker {
     let m = p.start();
     p.bump(T![if]);
     cond(p);
-    block(p);
+    block_expr(p);
     if p.at(T![else]) {
         p.bump(T![else]);
         if p.at(T![if]) {
             if_expr(p);
         } else {
-            block(p);
+            block_expr(p);
         }
     }
     m.complete(p, IF_EXPR)
@@ -295,7 +300,7 @@ fn loop_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
     assert!(p.at(T![loop]));
     let m = m.unwrap_or_else(|| p.start());
     p.bump(T![loop]);
-    block(p);
+    block_expr(p);
     m.complete(p, LOOP_EXPR)
 }
 
@@ -310,7 +315,7 @@ fn while_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
     let m = m.unwrap_or_else(|| p.start());
     p.bump(T![while]);
     cond(p);
-    block(p);
+    block_expr(p);
     m.complete(p, WHILE_EXPR)
 }
 
@@ -325,7 +330,7 @@ fn for_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
     patterns::pattern(p);
     p.expect(T![in]);
     expr_no_struct(p);
-    block(p);
+    block_expr(p);
     m.complete(p, FOR_EXPR)
 }
 
@@ -458,16 +463,25 @@ fn match_guard(p: &mut Parser) -> CompletedMarker {
     m.complete(p, MATCH_GUARD)
 }
 
-// test block_expr
-// fn foo() {
-//     {};
-//     unsafe {};
-//     'label: {};
-// }
-pub(super) fn block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
+// test block
+// fn a() {}
+// fn b() { let _ = 1; }
+// fn c() { 1; 2; }
+// fn d() { 1; 2 }
+pub(crate) fn block_expr(p: &mut Parser) {
+    if !p.at(T!['{']) {
+        p.error("expected a block");
+        return;
+    }
+    block_expr_unchecked(p);
+}
+
+fn block_expr_unchecked(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)
 }
 
@@ -535,9 +549,25 @@ fn break_expr(p: &mut Parser, r: Restrictions) -> CompletedMarker {
 fn try_block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
     assert!(p.at(T![try]));
     let m = m.unwrap_or_else(|| p.start());
+    // Special-case `try!` as macro.
+    // This is a hack until we do proper edition support
+    if p.nth_at(1, T![!]) {
+        // test try_macro_fallback
+        // fn foo() { try!(Ok(())); }
+        let path = p.start();
+        let path_segment = p.start();
+        let name_ref = p.start();
+        p.bump_remap(IDENT);
+        name_ref.complete(p, NAME_REF);
+        path_segment.complete(p, PATH_SEGMENT);
+        path.complete(p, PATH);
+        let _block_like = items::macro_call_after_excl(p);
+        return m.complete(p, MACRO_CALL);
+    }
+
     p.bump(T![try]);
-    block(p);
-    m.complete(p, TRY_EXPR)
+    block_expr(p);
+    m.complete(p, EFFECT_EXPR)
 }
 
 // test box_expr
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
index 433ed6812..67a924de5 100644
--- a/crates/ra_parser/src/grammar/items.rs
+++ b/crates/ra_parser/src/grammar/items.rs
@@ -329,7 +329,7 @@ fn fn_def(p: &mut Parser) {
     if p.at(T![;]) {
         p.bump(T![;]);
     } else {
-        expressions::block(p)
+        expressions::block_expr(p)
     }
 }
 
@@ -415,6 +415,17 @@ pub(super) fn macro_call_after_excl(p: &mut Parser) -> BlockLike {
     if p.at(IDENT) {
         name(p);
     }
+    // Special-case `macro_rules! try`.
+    // This is a hack until we do proper edition support
+
+    // test try_macro_rules
+    // macro_rules! try { () => {} }
+    if p.at(T![try]) {
+        let m = p.start();
+        p.bump_remap(IDENT);
+        m.complete(p, NAME);
+    }
+
     match p.current() {
         T!['{'] => {
             token_tree(p);
diff --git a/crates/ra_parser/src/grammar/items/use_item.rs b/crates/ra_parser/src/grammar/items/use_item.rs
index e3b991c8c..3a0c7a31a 100644
--- a/crates/ra_parser/src/grammar/items/use_item.rs
+++ b/crates/ra_parser/src/grammar/items/use_item.rs
@@ -47,7 +47,7 @@ fn use_tree(p: &mut Parser, top_level: bool) {
         // use {crate::path::from::root, or::path::from::crate_name}; // Rust 2018 (with a crate named `or`)
         // use {path::from::root}; // Rust 2015
         // use ::{some::arbritrary::path}; // Rust 2015
-        // use ::{{{crate::export}}}; // Nonsensical but perfectly legal nestnig
+        // use ::{{{root::export}}}; // Nonsensical but perfectly legal nesting
         T!['{'] => {
             use_tree_list(p);
         }
diff --git a/crates/ra_parser/src/grammar/type_args.rs b/crates/ra_parser/src/grammar/type_args.rs
index 33d9973e9..2d61f9d80 100644
--- a/crates/ra_parser/src/grammar/type_args.rs
+++ b/crates/ra_parser/src/grammar/type_args.rs
@@ -48,7 +48,7 @@ fn type_arg(p: &mut Parser) {
             m.complete(p, ASSOC_TYPE_ARG);
         }
         T!['{'] => {
-            expressions::block(p);
+            expressions::block_expr(p);
             m.complete(p, CONST_ARG);
         }
         k if k.is_literal() => {
diff --git a/crates/ra_parser/src/lib.rs b/crates/ra_parser/src/lib.rs
index 652492c1e..e08ad4dae 100644
--- a/crates/ra_parser/src/lib.rs
+++ b/crates/ra_parser/src/lib.rs
@@ -112,7 +112,7 @@ pub fn parse_fragment(
         FragmentKind::Type => grammar::fragments::type_,
         FragmentKind::Pattern => grammar::fragments::pattern,
         FragmentKind::Item => grammar::fragments::item,
-        FragmentKind::Block => grammar::fragments::block,
+        FragmentKind::Block => grammar::fragments::block_expr,
         FragmentKind::Visibility => grammar::fragments::opt_visibility,
         FragmentKind::MetaItem => grammar::fragments::meta_item,
         FragmentKind::Statement => grammar::fragments::stmt,
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs
index 524e7d784..e7404492a 100644
--- a/crates/ra_parser/src/syntax_kind/generated.rs
+++ b/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,
diff --git a/crates/ra_proc_macro_srv/Cargo.toml b/crates/ra_proc_macro_srv/Cargo.toml
index ac2d156dc..886e14870 100644
--- a/crates/ra_proc_macro_srv/Cargo.toml
+++ b/crates/ra_proc_macro_srv/Cargo.toml
@@ -21,4 +21,4 @@ test_utils = { path = "../test_utils" }
 cargo_metadata = "0.9.1"
 difference = "2.0.0"
 # used as proc macro test target
-serde_derive = "=1.0.104"
+serde_derive = "=1.0.106"
diff --git a/crates/ra_proc_macro_srv/src/cli.rs b/crates/ra_proc_macro_srv/src/cli.rs
index 7282e5b9b..1437794c9 100644
--- a/crates/ra_proc_macro_srv/src/cli.rs
+++ b/crates/ra_proc_macro_srv/src/cli.rs
@@ -1,15 +1,17 @@
 //! Driver for proc macro server
 
-use crate::{expand_task, list_macros};
+use crate::ProcMacroSrv;
 use ra_proc_macro::msg::{self, Message};
 use std::io;
 
 pub fn run() -> io::Result<()> {
+    let mut srv = ProcMacroSrv::default();
+
     while let Some(req) = read_request()? {
         let res = match req {
-            msg::Request::ListMacro(task) => Ok(msg::Response::ListMacro(list_macros(&task))),
+            msg::Request::ListMacro(task) => srv.list_macros(&task).map(msg::Response::ListMacro),
             msg::Request::ExpansionMacro(task) => {
-                expand_task(&task).map(msg::Response::ExpansionMacro)
+                srv.expand(&task).map(msg::Response::ExpansionMacro)
             }
         };
 
diff --git a/crates/ra_proc_macro_srv/src/dylib.rs b/crates/ra_proc_macro_srv/src/dylib.rs
index d202eb0fd..aa84e951c 100644
--- a/crates/ra_proc_macro_srv/src/dylib.rs
+++ b/crates/ra_proc_macro_srv/src/dylib.rs
@@ -2,13 +2,12 @@
 
 use crate::{proc_macro::bridge, rustc_server::TokenStream};
 use std::fs::File;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 use goblin::{mach::Mach, Object};
 use libloading::Library;
 use memmap::Mmap;
 use ra_proc_macro::ProcMacroKind;
-
 use std::io;
 
 const NEW_REGISTRAR_SYMBOL: &str = "_rustc_proc_macro_decls_";
@@ -109,23 +108,21 @@ impl ProcMacroLibraryLibloading {
     }
 }
 
-type ProcMacroLibraryImpl = ProcMacroLibraryLibloading;
-
 pub struct Expander {
-    libs: Vec<ProcMacroLibraryImpl>,
+    inner: ProcMacroLibraryLibloading,
 }
 
 impl Expander {
-    pub fn new(lib: &Path) -> Result<Expander, String> {
+    pub fn new(lib: &Path) -> io::Result<Expander> {
         // Some libraries for dynamic loading require canonicalized path even when it is
         // already absolute
-        let lib = lib
-            .canonicalize()
-            .unwrap_or_else(|err| panic!("Cannot canonicalize {}: {:?}", lib.display(), err));
+        let lib = lib.canonicalize()?;
+
+        let lib = ensure_file_with_lock_free_access(&lib)?;
 
-        let library = ProcMacroLibraryImpl::open(&lib).map_err(|e| e.to_string())?;
+        let library = ProcMacroLibraryLibloading::open(&lib)?;
 
-        Ok(Expander { libs: vec![library] })
+        Ok(Expander { inner: library })
     }
 
     pub fn expand(
@@ -141,38 +138,36 @@ impl Expander {
                 TokenStream::with_subtree(attr.clone())
             });
 
-        for lib in &self.libs {
-            for proc_macro in &lib.exported_macros {
-                match proc_macro {
-                    bridge::client::ProcMacro::CustomDerive { trait_name, client, .. }
-                        if *trait_name == macro_name =>
-                    {
-                        let res = client.run(
-                            &crate::proc_macro::bridge::server::SameThread,
-                            crate::rustc_server::Rustc::default(),
-                            parsed_body,
-                        );
-                        return res.map(|it| it.subtree);
-                    }
-                    bridge::client::ProcMacro::Bang { name, client } if *name == macro_name => {
-                        let res = client.run(
-                            &crate::proc_macro::bridge::server::SameThread,
-                            crate::rustc_server::Rustc::default(),
-                            parsed_body,
-                        );
-                        return res.map(|it| it.subtree);
-                    }
-                    bridge::client::ProcMacro::Attr { name, client } if *name == macro_name => {
-                        let res = client.run(
-                            &crate::proc_macro::bridge::server::SameThread,
-                            crate::rustc_server::Rustc::default(),
-                            parsed_attributes,
-                            parsed_body,
-                        );
-                        return res.map(|it| it.subtree);
-                    }
-                    _ => continue,
+        for proc_macro in &self.inner.exported_macros {
+            match proc_macro {
+                bridge::client::ProcMacro::CustomDerive { trait_name, client, .. }
+                    if *trait_name == macro_name =>
+                {
+                    let res = client.run(
+                        &crate::proc_macro::bridge::server::SameThread,
+                        crate::rustc_server::Rustc::default(),
+                        parsed_body,
+                    );
+                    return res.map(|it| it.subtree);
+                }
+                bridge::client::ProcMacro::Bang { name, client } if *name == macro_name => {
+                    let res = client.run(
+                        &crate::proc_macro::bridge::server::SameThread,
+                        crate::rustc_server::Rustc::default(),
+                        parsed_body,
+                    );
+                    return res.map(|it| it.subtree);
+                }
+                bridge::client::ProcMacro::Attr { name, client } if *name == macro_name => {
+                    let res = client.run(
+                        &crate::proc_macro::bridge::server::SameThread,
+                        crate::rustc_server::Rustc::default(),
+                        parsed_attributes,
+                        parsed_body,
+                    );
+                    return res.map(|it| it.subtree);
                 }
+                _ => continue,
             }
         }
 
@@ -180,9 +175,9 @@ impl Expander {
     }
 
     pub fn list_macros(&self) -> Vec<(String, ProcMacroKind)> {
-        self.libs
+        self.inner
+            .exported_macros
             .iter()
-            .flat_map(|it| &it.exported_macros)
             .map(|proc_macro| match proc_macro {
                 bridge::client::ProcMacro::CustomDerive { trait_name, .. } => {
                     (trait_name.to_string(), ProcMacroKind::CustomDerive)
@@ -197,3 +192,33 @@ impl Expander {
             .collect()
     }
 }
+
+/// Copy the dylib to temp directory to prevent locking in Windows
+#[cfg(windows)]
+fn ensure_file_with_lock_free_access(path: &Path) -> io::Result<PathBuf> {
+    use std::{ffi::OsString, time::SystemTime};
+
+    let mut to = std::env::temp_dir();
+
+    let file_name = path.file_name().ok_or_else(|| {
+        io::Error::new(
+            io::ErrorKind::InvalidInput,
+            format!("File path is invalid: {}", path.display()),
+        )
+    })?;
+
+    // generate a time deps unique number
+    let t = SystemTime::now().duration_since(std::time::UNIX_EPOCH).expect("Time went backwards");
+
+    let mut unique_name = OsString::from(t.as_millis().to_string());
+    unique_name.push(file_name);
+
+    to.push(unique_name);
+    std::fs::copy(path, &to).unwrap();
+    Ok(to)
+}
+
+#[cfg(unix)]
+fn ensure_file_with_lock_free_access(path: &Path) -> io::Result<PathBuf> {
+    Ok(path.to_path_buf())
+}
diff --git a/crates/ra_proc_macro_srv/src/lib.rs b/crates/ra_proc_macro_srv/src/lib.rs
index 3aca859db..922bb84bb 100644
--- a/crates/ra_proc_macro_srv/src/lib.rs
+++ b/crates/ra_proc_macro_srv/src/lib.rs
@@ -21,28 +21,46 @@ mod dylib;
 
 use proc_macro::bridge::client::TokenStream;
 use ra_proc_macro::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask};
-use std::path::Path;
+use std::{
+    collections::{hash_map::Entry, HashMap},
+    fs,
+    path::{Path, PathBuf},
+    time::SystemTime,
+};
 
-pub(crate) fn expand_task(task: &ExpansionTask) -> Result<ExpansionResult, String> {
-    let expander = create_expander(&task.lib);
+#[derive(Default)]
+pub(crate) struct ProcMacroSrv {
+    expanders: HashMap<(PathBuf, SystemTime), dylib::Expander>,
+}
 
-    match expander.expand(&task.macro_name, &task.macro_body, task.attributes.as_ref()) {
-        Ok(expansion) => Ok(ExpansionResult { expansion }),
-        Err(msg) => {
-            Err(format!("Cannot perform expansion for {}: error {:?}", &task.macro_name, msg))
+impl ProcMacroSrv {
+    pub fn expand(&mut self, task: &ExpansionTask) -> Result<ExpansionResult, String> {
+        let expander = self.expander(&task.lib)?;
+        match expander.expand(&task.macro_name, &task.macro_body, task.attributes.as_ref()) {
+            Ok(expansion) => Ok(ExpansionResult { expansion }),
+            Err(msg) => {
+                Err(format!("Cannot perform expansion for {}: error {:?}", &task.macro_name, msg))
+            }
         }
     }
-}
 
-pub(crate) fn list_macros(task: &ListMacrosTask) -> ListMacrosResult {
-    let expander = create_expander(&task.lib);
+    pub fn list_macros(&mut self, task: &ListMacrosTask) -> Result<ListMacrosResult, String> {
+        let expander = self.expander(&task.lib)?;
+        Ok(ListMacrosResult { macros: expander.list_macros() })
+    }
 
-    ListMacrosResult { macros: expander.list_macros() }
-}
+    fn expander(&mut self, path: &Path) -> Result<&dylib::Expander, String> {
+        let time = fs::metadata(path).and_then(|it| it.modified()).map_err(|err| {
+            format!("Failed to get file metadata for {}: {:?}", path.display(), err)
+        })?;
 
-fn create_expander(lib: &Path) -> dylib::Expander {
-    dylib::Expander::new(lib)
-        .unwrap_or_else(|err| panic!("Cannot create expander for {}: {:?}", lib.display(), err))
+        Ok(match self.expanders.entry((path.to_path_buf(), time)) {
+            Entry::Vacant(v) => v.insert(dylib::Expander::new(path).map_err(|err| {
+                format!("Cannot create expander for {}: {:?}", path.display(), err)
+            })?),
+            Entry::Occupied(e) => e.into_mut(),
+        })
+    }
 }
 
 pub mod cli;
diff --git a/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt b/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
index 1f5d940fa..6776f5231 100644
--- a/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
+++ b/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
@@ -1,6 +1,11 @@
 SUBTREE $
   PUNCH   # [alone] 4294967295
   SUBTREE [] 4294967295
+    IDENT   doc 4294967295
+    SUBTREE () 4294967295
+      IDENT   hidden 4294967295
+  PUNCH   # [alone] 4294967295
+  SUBTREE [] 4294967295
     IDENT   allow 4294967295
     SUBTREE () 4294967295
       IDENT   non_upper_case_globals 4294967295
@@ -184,4 +189,4 @@ SUBTREE $
         IDENT   end 4294967295
         SUBTREE () 4294967295
           IDENT   __serde_state 4294967295
-  PUNCH   ; [alone] 4294967295
\ No newline at end of file
+  PUNCH   ; [alone] 4294967295
diff --git a/crates/ra_proc_macro_srv/src/tests/mod.rs b/crates/ra_proc_macro_srv/src/tests/mod.rs
index 03f79bc5d..9cf58511c 100644
--- a/crates/ra_proc_macro_srv/src/tests/mod.rs
+++ b/crates/ra_proc_macro_srv/src/tests/mod.rs
@@ -10,7 +10,7 @@ fn test_derive_serialize_proc_macro() {
     assert_expand(
         "serde_derive",
         "Serialize",
-        "1.0.104",
+        "1.0.106",
         r##"struct Foo {}"##,
         include_str!("fixtures/test_serialize_proc_macro.txt"),
     );
@@ -21,7 +21,7 @@ fn test_derive_serialize_proc_macro_failed() {
     assert_expand(
         "serde_derive",
         "Serialize",
-        "1.0.104",
+        "1.0.106",
         r##"
     struct {}
 "##,
@@ -37,7 +37,7 @@ SUBTREE $
 
 #[test]
 fn test_derive_proc_macro_list() {
-    let res = list("serde_derive", "1.0.104").join("\n");
+    let res = list("serde_derive", "1.0.106").join("\n");
 
     assert_eq_text!(
         &res,
diff --git a/crates/ra_proc_macro_srv/src/tests/utils.rs b/crates/ra_proc_macro_srv/src/tests/utils.rs
index 2139ec7a4..646a427c5 100644
--- a/crates/ra_proc_macro_srv/src/tests/utils.rs
+++ b/crates/ra_proc_macro_srv/src/tests/utils.rs
@@ -1,7 +1,7 @@
 //! utils used in proc-macro tests
 
 use crate::dylib;
-use crate::list_macros;
+use crate::ProcMacroSrv;
 pub use difference::Changeset as __Changeset;
 use ra_proc_macro::ListMacrosTask;
 use std::str::FromStr;
@@ -59,7 +59,7 @@ pub fn assert_expand(
 pub fn list(crate_name: &str, version: &str) -> Vec<String> {
     let path = fixtures::dylib_path(crate_name, version);
     let task = ListMacrosTask { lib: path };
-
-    let res = list_macros(&task);
+    let mut srv = ProcMacroSrv::default();
+    let res = srv.list_macros(&task).unwrap();
     res.macros.into_iter().map(|(name, kind)| format!("{} [{:?}]", name, kind)).collect()
 }
diff --git a/crates/ra_prof/src/hprof.rs b/crates/ra_prof/src/hprof.rs
index 2b8a90363..a3f5321fb 100644
--- a/crates/ra_prof/src/hprof.rs
+++ b/crates/ra_prof/src/hprof.rs
@@ -30,8 +30,9 @@ pub fn init_from(spec: &str) {
 pub type Label = &'static str;
 
 /// This function starts a profiling scope in the current execution stack with a given description.
-/// It returns a Profile structure and measure elapsed time between this method invocation and Profile structure drop.
-/// It supports nested profiling scopes in case when this function invoked multiple times at the execution stack. In this case the profiling information will be nested at the output.
+/// It returns a `Profile` struct that measures elapsed time between this method invocation and `Profile` struct drop.
+/// It supports nested profiling scopes in case when this function is invoked multiple times at the execution stack.
+/// In this case the profiling information will be nested at the output.
 /// Profiling information is being printed in the stderr.
 ///
 /// # Example
@@ -58,36 +59,35 @@ pub type Label = &'static str;
 /// ```
 pub fn profile(label: Label) -> Profiler {
     assert!(!label.is_empty());
-    let enabled = PROFILING_ENABLED.load(Ordering::Relaxed)
-        && PROFILE_STACK.with(|stack| stack.borrow_mut().push(label));
-    let label = if enabled { Some(label) } else { None };
-    Profiler { label, detail: None }
+
+    if PROFILING_ENABLED.load(Ordering::Relaxed)
+        && PROFILE_STACK.with(|stack| stack.borrow_mut().push(label))
+    {
+        Profiler(Some(ProfilerImpl { label, detail: None }))
+    } else {
+        Profiler(None)
+    }
 }
 
-pub struct Profiler {
-    label: Option<Label>,
+pub struct Profiler(Option<ProfilerImpl>);
+
+struct ProfilerImpl {
+    label: Label,
     detail: Option<String>,
 }
 
 impl Profiler {
     pub fn detail(mut self, detail: impl FnOnce() -> String) -> Profiler {
-        if self.label.is_some() {
-            self.detail = Some(detail())
+        if let Some(profiler) = &mut self.0 {
+            profiler.detail = Some(detail())
         }
         self
     }
 }
 
-impl Drop for Profiler {
+impl Drop for ProfilerImpl {
     fn drop(&mut self) {
-        match self {
-            Profiler { label: Some(label), detail } => {
-                PROFILE_STACK.with(|stack| {
-                    stack.borrow_mut().pop(label, detail.take());
-                });
-            }
-            Profiler { label: None, .. } => (),
-        }
+        PROFILE_STACK.with(|it| it.borrow_mut().pop(self.label, self.detail.take()));
     }
 }
 
@@ -179,21 +179,18 @@ impl ProfileStack {
     pub fn pop(&mut self, label: Label, detail: Option<String>) {
         let start = self.starts.pop().unwrap();
         let duration = start.elapsed();
-        let level = self.starts.len();
         self.messages.finish(Message { duration, label, detail });
-        if level == 0 {
+        if self.starts.is_empty() {
             let longer_than = self.filter.longer_than;
             // Convert to millis for comparison to avoid problems with rounding
             // (otherwise we could print `0ms` despite user's `>0` filter when
             // `duration` is just a few nanos).
             if duration.as_millis() > longer_than.as_millis() {
-                let stderr = stderr();
                 if let Some(root) = self.messages.root() {
-                    print(&self.messages, root, 0, longer_than, &mut stderr.lock());
+                    print(&self.messages, root, 0, longer_than, &mut stderr().lock());
                 }
             }
             self.messages.clear();
-            assert!(self.starts.is_empty())
         }
     }
 }
diff --git a/crates/ra_project_model/Cargo.toml b/crates/ra_project_model/Cargo.toml
index b10644b4b..5e651fe70 100644
--- a/crates/ra_project_model/Cargo.toml
+++ b/crates/ra_project_model/Cargo.toml
@@ -18,7 +18,7 @@ ra_db = { path = "../ra_db" }
 ra_cfg = { path = "../ra_cfg" }
 ra_proc_macro =  { path = "../ra_proc_macro" }
 
-serde = { version = "1.0.104", features = ["derive"] }
+serde = { version = "1.0.106", features = ["derive"] }
 serde_json = "1.0.48"
 
 anyhow = "1.0.26"
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 7ffe46c69..c07ff488e 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
 [dependencies]
 itertools = "0.9.0"
 rowan = "0.10.0"
-rustc_lexer = { version = "652.0.0", package = "rustc-ap-rustc_lexer" }
+rustc_lexer = { version = "656.0.0", package = "rustc-ap-rustc_lexer" }
 rustc-hash = "1.1.0"
 arrayvec = "0.5.1"
 once_cell = "1.3.1"
@@ -27,7 +27,7 @@ ra_parser = { path = "../ra_parser" }
 # ideally, `serde` should be enabled by `rust-analyzer`, but we enable it here
 # to reduce number of compilations
 smol_str = { version = "0.1.15", features = ["serde"] }
-serde = { version = "1.0.104", features = ["derive"] }
+serde = { version = "1.0.106", features = ["derive"] }
 
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs
index 7fca5661e..1876afe95 100644
--- a/crates/ra_syntax/src/ast.rs
+++ b/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,
@@ -243,6 +243,21 @@ fn test_comments_preserve_trailing_whitespace() {
 }
 
 #[test]
+fn test_four_slash_line_comment() {
+    let file = SourceFile::parse(
+        r#"
+        //// too many slashes to be a doc comment
+        /// doc comment
+        mod foo {}
+        "#,
+    )
+    .ok()
+    .unwrap();
+    let module = file.syntax().descendants().find_map(Module::cast).unwrap();
+    assert_eq!("doc comment", module.doc_comment_text().unwrap());
+}
+
+#[test]
 fn test_where_predicates() {
     fn assert_bound(text: &str, bound: Option<TypeBound>) {
         assert_eq!(text, bound.unwrap().syntax().text().to_string());
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index 26e4576ff..c507dc683 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/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()
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs
index 93aa3d45f..7771d6759 100644
--- a/crates/ra_syntax/src/ast/expr_extensions.rs
+++ b/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,
         }
     }
@@ -43,7 +43,7 @@ impl ast::IfExpr {
         Some(res)
     }
 
-    fn blocks(&self) -> AstChildren<ast::BlockExpr> {
+    pub fn blocks(&self) -> AstChildren<ast::BlockExpr> {
         support::children(self.syntax())
     }
 }
@@ -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,12 +395,12 @@ impl ast::BlockExpr {
     /// const FOO: () = { stand_alone };
     /// ```
     pub fn is_standalone(&self) -> bool {
-        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 | MATCH_ARM | 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,
         }
     }
diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/extensions.rs
index f2ea5088e..528c873e0 100644
--- a/crates/ra_syntax/src/ast/extensions.rs
+++ b/crates/ra_syntax/src/ast/extensions.rs
@@ -407,7 +407,7 @@ impl ast::Visibility {
         } else if self.super_token().is_some() {
             VisibilityKind::PubSuper
         } else if self.self_token().is_some() {
-            VisibilityKind::PubSuper
+            VisibilityKind::PubSelf
         } else {
             VisibilityKind::Pub
         }
@@ -423,6 +423,10 @@ impl ast::MacroCall {
             None
         }
     }
+
+    pub fn is_bang(&self) -> bool {
+        self.is_macro_rules().is_none()
+    }
 }
 
 impl ast::LifetimeParam {
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs
index 2cb3ad011..5e844d5ae 100644
--- a/crates/ra_syntax/src/ast/generated/nodes.rs
+++ b/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,10 +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 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)]
@@ -626,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 +1126,6 @@ impl Condition {
 }
 
 #[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,
 }
@@ -1249,6 +1241,9 @@ pub struct PathSegment {
 }
 impl PathSegment {
     pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
+    pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) }
+    pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
+    pub fn super_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![super]) }
     pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) }
     pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
     pub fn type_arg_list(&self) -> Option<TypeArgList> { support::child(&self.syntax) }
@@ -1473,7 +1468,7 @@ pub enum Expr {
     FieldExpr(FieldExpr),
     AwaitExpr(AwaitExpr),
     TryExpr(TryExpr),
-    TryBlockExpr(TryBlockExpr),
+    EffectExpr(EffectExpr),
     CastExpr(CastExpr),
     RefExpr(RefExpr),
     PrefixExpr(PrefixExpr),
@@ -1956,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 })
@@ -2649,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> {
@@ -3308,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) }
@@ -3341,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,
         }
     }
@@ -3371,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 }),
@@ -3408,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,
@@ -3889,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)
     }
@@ -4204,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)
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs
index ee0f5cc40..7b17fef49 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/ra_syntax/src/ast/make.rs
@@ -22,8 +22,7 @@ pub fn path_unqualified(segment: ast::PathSegment) -> ast::Path {
 pub fn path_qualified(qual: ast::Path, segment: ast::PathSegment) -> ast::Path {
     path_from_text(&format!("{}::{}", qual, segment))
 }
-
-pub fn path_from_text(text: &str) -> ast::Path {
+fn path_from_text(text: &str) -> ast::Path {
     ast_from_text(text)
 }
 
@@ -83,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("()")
 }
diff --git a/crates/ra_syntax/src/ast/tokens.rs b/crates/ra_syntax/src/ast/tokens.rs
index 3865729b8..74906d8a6 100644
--- a/crates/ra_syntax/src/ast/tokens.rs
+++ b/crates/ra_syntax/src/ast/tokens.rs
@@ -13,7 +13,12 @@ impl Comment {
     }
 
     pub fn prefix(&self) -> &'static str {
-        prefix_by_kind(self.kind())
+        for (prefix, k) in COMMENT_PREFIX_TO_KIND.iter() {
+            if *k == self.kind() && self.text().starts_with(prefix) {
+                return prefix;
+            }
+        }
+        unreachable!()
     }
 }
 
@@ -48,6 +53,7 @@ pub enum CommentPlacement {
 const COMMENT_PREFIX_TO_KIND: &[(&str, CommentKind)] = {
     use {CommentPlacement::*, CommentShape::*};
     &[
+        ("////", CommentKind { shape: Line, doc: None }),
         ("///", CommentKind { shape: Line, doc: Some(Outer) }),
         ("//!", CommentKind { shape: Line, doc: Some(Inner) }),
         ("/**", CommentKind { shape: Block, doc: Some(Outer) }),
@@ -69,15 +75,6 @@ fn kind_by_prefix(text: &str) -> CommentKind {
     panic!("bad comment text: {:?}", text)
 }
 
-fn prefix_by_kind(kind: CommentKind) -> &'static str {
-    for (prefix, k) in COMMENT_PREFIX_TO_KIND.iter() {
-        if *k == kind {
-            return prefix;
-        }
-    }
-    unreachable!()
-}
-
 impl Whitespace {
     pub fn spans_multiple_lines(&self) -> bool {
         let text = self.text();
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index ceeb2bde9..d0234cada 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/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)
diff --git a/crates/ra_syntax/src/parsing/lexer.rs b/crates/ra_syntax/src/parsing/lexer.rs
index f450ef4a2..1a5a6dc06 100644
--- a/crates/ra_syntax/src/parsing/lexer.rs
+++ b/crates/ra_syntax/src/parsing/lexer.rs
@@ -180,7 +180,7 @@ fn rustc_token_kind_to_syntax_kind(
     return (syntax_kind, None);
 
     fn match_literal_kind(kind: &rustc_lexer::LiteralKind) -> (SyntaxKind, Option<&'static str>) {
-        use rustc_lexer::LiteralKind as LK;
+        use rustc_lexer::{LexRawStrError, LiteralKind as LK};
 
         #[rustfmt::skip]
         let syntax_kind = match *kind {
@@ -215,21 +215,28 @@ fn rustc_token_kind_to_syntax_kind(
                 return (BYTE_STRING, Some("Missing trailing `\"` symbol to terminate the byte string literal"))
             }
 
-            LK::RawStr { started: true, terminated: true, .. } => RAW_STRING,
-            LK::RawStr { started: true, terminated: false, .. } => {
-                return (RAW_STRING, Some("Missing trailing `\"` with `#` symbols to terminate the raw string literal"))
-            }
-            LK::RawStr { started: false, .. } => {
-                return (RAW_STRING, Some("Missing `\"` symbol after `#` symbols to begin the raw string literal"))
-            }
+            LK::RawStr(str) => match str.validate() {
+                Ok(_) => RAW_STRING,
+                Err(LexRawStrError::InvalidStarter) => return (RAW_STRING, Some("Missing `\"` symbol after `#` symbols to begin the raw string literal")),
+                Err(LexRawStrError::NoTerminator { expected, found, .. }) => if expected == found {
+                    return (RAW_STRING, Some("Missing trailing `\"` to terminate the raw string literal"))
+                } else {
+                    return (RAW_STRING, Some("Missing trailing `\"` with `#` symbols to terminate the raw string literal"))
+
+                },
+                Err(LexRawStrError::TooManyDelimiters { .. }) => return (RAW_STRING, Some("Too many `#` symbols: raw strings may be delimited by up to 65535 `#` symbols")),
+            },
+            LK::RawByteStr(str) => match str.validate() {
+                Ok(_) => RAW_BYTE_STRING,
+                Err(LexRawStrError::InvalidStarter) => return (RAW_BYTE_STRING, Some("Missing `\"` symbol after `#` symbols to begin the raw byte string literal")),
+                Err(LexRawStrError::NoTerminator { expected, found, .. }) => if expected == found {
+                    return (RAW_BYTE_STRING, Some("Missing trailing `\"` to terminate the raw byte string literal"))
+                } else {
+                    return (RAW_BYTE_STRING, Some("Missing trailing `\"` with `#` symbols to terminate the raw byte string literal"))
 
-            LK::RawByteStr { started: true, terminated: true, .. } => RAW_BYTE_STRING,
-            LK::RawByteStr { started: true, terminated: false, .. } => {
-                return (RAW_BYTE_STRING, Some("Missing trailing `\"` with `#` symbols to terminate the raw byte string literal"))
-            }
-            LK::RawByteStr { started: false, .. } => {
-                return (RAW_BYTE_STRING, Some("Missing `\"` symbol after `#` symbols to begin the raw byte string literal"))
-            }
+                },
+                Err(LexRawStrError::TooManyDelimiters { .. }) => return (RAW_BYTE_STRING, Some("Too many `#` symbols: raw byte strings may be delimited by up to 65535 `#` symbols")),
+            },
         };
 
         (syntax_kind, None)
diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs
index 5e93895ec..e075cd801 100644
--- a/crates/ra_syntax/src/validation.rs
+++ b/crates/ra_syntax/src/validation.rs
@@ -96,6 +96,7 @@ pub(crate) fn validate(root: &SyntaxNode) -> Vec<SyntaxError> {
                 ast::RecordField(it) => validate_numeric_name(it.name_ref(), &mut errors),
                 ast::Visibility(it) => validate_visibility(it, &mut errors),
                 ast::RangeExpr(it) => validate_range_expr(it, &mut errors),
+                ast::PathSegment(it) => validate_path_keywords(it, &mut errors),
                 _ => (),
             }
         }
@@ -222,3 +223,83 @@ fn validate_range_expr(expr: ast::RangeExpr, errors: &mut Vec<SyntaxError>) {
         ));
     }
 }
+
+fn validate_path_keywords(segment: ast::PathSegment, errors: &mut Vec<SyntaxError>) {
+    use ast::PathSegmentKind;
+
+    let path = segment.parent_path();
+    let is_path_start = segment.coloncolon_token().is_none() && path.qualifier().is_none();
+
+    if let Some(token) = segment.self_token() {
+        if !is_path_start {
+            errors.push(SyntaxError::new(
+                "The `self` keyword is only allowed as the first segment of a path",
+                token.text_range(),
+            ));
+        }
+    } else if let Some(token) = segment.crate_token() {
+        if !is_path_start || use_prefix(path).is_some() {
+            errors.push(SyntaxError::new(
+                "The `crate` keyword is only allowed as the first segment of a path",
+                token.text_range(),
+            ));
+        }
+    } else if let Some(token) = segment.super_token() {
+        if !all_supers(&path) {
+            errors.push(SyntaxError::new(
+                "The `super` keyword may only be preceded by other `super`s",
+                token.text_range(),
+            ));
+            return;
+        }
+
+        let mut curr_path = path;
+        while let Some(prefix) = use_prefix(curr_path) {
+            if !all_supers(&prefix) {
+                errors.push(SyntaxError::new(
+                    "The `super` keyword may only be preceded by other `super`s",
+                    token.text_range(),
+                ));
+                return;
+            }
+            curr_path = prefix;
+        }
+    }
+
+    fn use_prefix(mut path: ast::Path) -> Option<ast::Path> {
+        for node in path.syntax().ancestors().skip(1) {
+            match_ast! {
+                match node {
+                    ast::UseTree(it) => if let Some(tree_path) = it.path() {
+                        // Even a top-level path exists within a `UseTree` so we must explicitly
+                        // allow our path but disallow anything else
+                        if tree_path != path {
+                            return Some(tree_path);
+                        }
+                    },
+                    ast::UseTreeList(_it) => continue,
+                    ast::Path(parent) => path = parent,
+                    _ => return None,
+                }
+            };
+        }
+        return None;
+    }
+
+    fn all_supers(path: &ast::Path) -> bool {
+        let segment = match path.segment() {
+            Some(it) => it,
+            None => return false,
+        };
+
+        if segment.kind() != Some(PathSegmentKind::SuperKw) {
+            return false;
+        }
+
+        if let Some(ref subpath) = path.qualifier() {
+            return all_supers(subpath);
+        }
+
+        return true;
+    }
+}
diff --git a/crates/ra_syntax/src/validation/block.rs b/crates/ra_syntax/src/validation/block.rs
index 8e962ab5b..2c08f7e6e 100644
--- a/crates/ra_syntax/src/validation/block.rs
+++ b/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(),
+        )
+    }))
 }
diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
index 95cc83caa..375ed45e0 100644
--- a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
@@ -28,10 +28,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n\n"
   [email protected]
     [email protected] "#"
diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
index dc3e12091..b72c92c33 100644
--- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
+++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
@@ -21,9 +21,8 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "}"
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
index 97539fcf2..33953d8d7 100644
--- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
@@ -9,10 +9,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected]
@@ -34,30 +33,28 @@ [email protected]
           [email protected] "true"
       [email protected] " "
       [email protected]
-        [email protected]
-          [email protected] "{"
-          [email protected] "\n        "
-          [email protected]
-            [email protected] "1"
-          [email protected] "\n    "
-          [email protected] "}"
+        [email protected] "{"
+        [email protected] "\n        "
+        [email protected]
+          [email protected] "1"
+        [email protected] "\n    "
+        [email protected] "}"
       [email protected] " "
       [email protected] "else"
       [email protected] " "
       [email protected]
-        [email protected]
-          [email protected] "{"
-          [email protected] "\n        "
-          [email protected]
-            [email protected]
-              [email protected] "2"
-            [email protected] " "
-            [email protected] "+"
-            [email protected] " "
-            [email protected]
-              [email protected] "3"
-          [email protected] "\n    "
-          [email protected] "}"
+        [email protected] "{"
+        [email protected] "\n        "
+        [email protected]
+          [email protected]
+            [email protected] "2"
+          [email protected] " "
+          [email protected] "+"
+          [email protected] " "
+          [email protected]
+            [email protected] "3"
+        [email protected] "\n    "
+        [email protected] "}"
     [email protected] "\n"
     [email protected] "}"
   [email protected] "\n\n"
@@ -71,10 +68,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 17..17: expected BANG
 error 19..19: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
index e10bb8174..3bf57eacc 100644
--- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
+++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
@@ -9,37 +9,36 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected] "->"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "unsafe"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "->"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "unsafe"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
-error 24..24: expected `{`
+error 24..24: expected a block
 error 24..24: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
index 61c361833..9323b7890 100644
--- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
@@ -25,8 +25,7 @@ [email protected]
                 [email protected] "T"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 19..19: expected colon
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
index 92bb47316..93434f34f 100644
--- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
+++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
@@ -9,36 +9,35 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] "\n    "
-              [email protected] ")"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "return"
-            [email protected] " "
-            [email protected]
-              [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] "\n    "
+            [email protected] ")"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "return"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 38..38: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
index 7bc718302..628315c78 100644
--- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
+++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
@@ -20,28 +20,27 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "bar"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "1"
-          [email protected] " "
-          [email protected] "+"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "bar"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "1"
+        [email protected] " "
+        [email protected] "+"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 44..44: expected expression
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
index 63194f974..31cc4e551 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
@@ -33,89 +33,88 @@ [email protected]
                   [email protected] "ScopeId"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected] "let"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "res"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "self"
-                  [email protected] "."
-                  [email protected]
-                    [email protected] "scopes"
-                [email protected] "."
-                [email protected]
-                  [email protected] "len"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ";"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "self"
-                [email protected] "."
-                [email protected]
-                  [email protected] "scopes"
-              [email protected] "."
-              [email protected]
-                [email protected] "push"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "ScopeData"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "parent"
-                      [email protected] ":"
-                      [email protected] " "
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "None"
-                    [email protected] ","
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "entries"
-                      [email protected] ":"
-                      [email protected] " "
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "vec"
-                        [email protected] "!"
-                        [email protected]
-                          [email protected] "["
-                          [email protected] "]"
-                    [email protected] " "
-                    [email protected] "}"
-                [email protected] ")"
-            [email protected] "\n    "
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "let"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "res"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "self"
+                [email protected] "."
+                [email protected]
+                  [email protected] "scopes"
+              [email protected] "."
+              [email protected]
+                [email protected] "len"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ";"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "self"
+              [email protected] "."
+              [email protected]
+                [email protected] "scopes"
+            [email protected] "."
+            [email protected]
+              [email protected] "push"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "ScopeData"
+                [email protected] " "
+                [email protected]
+                  [email protected] "{"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected] "parent"
+                    [email protected] ":"
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "None"
+                  [email protected] ","
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected] "entries"
+                    [email protected] ":"
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "vec"
+                      [email protected] "!"
+                      [email protected]
+                        [email protected] "["
+                        [email protected] "]"
+                  [email protected] " "
+                  [email protected] "}"
+              [email protected] ")"
+          [email protected] "\n    "
+          [email protected] "}"
       [email protected] "\n\n    "
       [email protected]
         [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
index d20bb60f1..4ff27f5c8 100644
--- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
@@ -9,91 +9,87 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "foo"
-          [email protected] " "
-          [email protected] "="
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "bar"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "baz"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "loop"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "foo"
+        [email protected] " "
+        [email protected] "="
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "bar"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "baz"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "loop"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 24..24: expected expression
 error 24..24: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
index 1185f44f9..5f3a31473 100644
--- a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
@@ -12,9 +12,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 2..2: expected a name
 error 2..2: expected function arguments
diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
index c7bf4caa0..1746bd3c1 100644
--- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
+++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
@@ -26,10 +26,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 16..16: expected COLON
 error 16..16: expected type
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
index cc0d75cc8..28146f44e 100644
--- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
@@ -9,37 +9,36 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected] "1"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] "@"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "struct"
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected]
-            [email protected] "]"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected] "1"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] "@"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "struct"
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected]
+          [email protected] "]"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -51,44 +50,43 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "@"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "impl"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-        [email protected]
-          [email protected] ")"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "@"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "impl"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+      [email protected]
+        [email protected] ")"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -100,53 +98,52 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected] "."
-            [email protected]
-              [email protected] "bar"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "@"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "]"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "trait"
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-        [email protected]
-          [email protected] ")"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected] "."
+          [email protected]
+            [email protected] "bar"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "@"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "]"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "trait"
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+      [email protected]
+        [email protected] ")"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
 error 16..16: expected expression
 error 17..17: expected R_BRACK
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
index c37594146..9ea9d715e 100644
--- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
+++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
@@ -9,31 +9,30 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "foo"
-          [email protected] "!"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] "\n        "
-            [email protected] "bar"
-            [email protected] ","
-            [email protected] " "
-            [email protected] "\"baz\""
-            [email protected] ","
-            [email protected] " "
-            [email protected] "1"
-            [email protected] ","
-            [email protected] " "
-            [email protected] "2.0"
-        [email protected] "\n    "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "foo"
+        [email protected] "!"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] "\n        "
+          [email protected] "bar"
+          [email protected] ","
+          [email protected] " "
+          [email protected] "\"baz\""
+          [email protected] ","
+          [email protected] " "
+          [email protected] "1"
+          [email protected] ","
+          [email protected] " "
+          [email protected] "2.0"
+      [email protected] "\n    "
+      [email protected] "}"
   [email protected] " "
   [email protected] "//~ ERROR incorrect c ..."
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
index 4296355f2..7c957fdde 100644
--- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
+++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
@@ -62,9 +62,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -76,219 +75,218 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Box"
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected]
-                            [email protected] "("
-                            [email protected]
-                              [email protected]
-                                [email protected]
-                                  [email protected]
-                                    [email protected] "Copy"
-                            [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] "?"
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Sized"
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "for"
-                  [email protected]
-                    [email protected] "<"
-                    [email protected]
-                      [email protected] "\'a"
-                    [email protected] ">"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Trait"
-                        [email protected]
-                          [email protected] "<"
-                          [email protected]
-                            [email protected] "\'a"
-                          [email protected] ">"
-                [email protected] ")"
-        [email protected]
-          [email protected]
-            [email protected] ">"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Box"
-                [email protected]
-                  [email protected] "<"
-                  [email protected]
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "?"
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Sized"
-        [email protected]
-          [email protected]
-            [email protected] ")"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "+"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "for"
-                        [email protected]
-                          [email protected] "<"
-                        [email protected]
-                          [email protected] "\'a"
-                      [email protected] ">"
-                      [email protected] " "
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "Trait"
-                    [email protected] "<"
-                    [email protected]
-                      [email protected] "\'a"
-                  [email protected] ">"
-                  [email protected]
-                    [email protected] ")"
-                [email protected] " "
-                [email protected] "+"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Copy"
-                  [email protected] ")"
-              [email protected] ">"
-              [email protected]
-                [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Box"
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected]
-                            [email protected] "("
-                            [email protected]
-                              [email protected] "for"
-                              [email protected]
-                                [email protected] "<"
-                                [email protected]
-                                  [email protected] "\'a"
-                                [email protected] ">"
-                              [email protected] " "
-                              [email protected]
-                                [email protected]
-                                  [email protected]
-                                    [email protected]
-                                      [email protected] "Trait"
-                                    [email protected]
-                                      [email protected] "<"
-                                      [email protected]
-                                        [email protected] "\'a"
-                                      [email protected] ">"
-                            [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Copy"
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] "?"
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Sized"
-                [email protected] ")"
-        [email protected]
-          [email protected]
-            [email protected] ">"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Box"
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected]
+                          [email protected] "("
+                          [email protected]
+                            [email protected]
+                              [email protected]
+                                [email protected]
+                                  [email protected] "Copy"
+                          [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] "?"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Sized"
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "for"
+                [email protected]
+                  [email protected] "<"
+                  [email protected]
+                    [email protected] "\'a"
+                  [email protected] ">"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Trait"
+                      [email protected]
+                        [email protected] "<"
+                        [email protected]
+                          [email protected] "\'a"
+                        [email protected] ">"
+              [email protected] ")"
+      [email protected]
+        [email protected]
+          [email protected] ">"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Box"
+              [email protected]
+                [email protected] "<"
+                [email protected]
+                  [email protected]
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "?"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Sized"
+      [email protected]
+        [email protected]
+          [email protected] ")"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "+"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "for"
+                      [email protected]
+                        [email protected] "<"
+                      [email protected]
+                        [email protected] "\'a"
+                    [email protected] ">"
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "Trait"
+                  [email protected] "<"
+                  [email protected]
+                    [email protected] "\'a"
+                [email protected] ">"
+                [email protected]
+                  [email protected] ")"
+              [email protected] " "
+              [email protected] "+"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Copy"
+                [email protected] ")"
+            [email protected] ">"
+            [email protected]
+              [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Box"
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected]
+                          [email protected] "("
+                          [email protected]
+                            [email protected] "for"
+                            [email protected]
+                              [email protected] "<"
+                              [email protected]
+                                [email protected] "\'a"
+                              [email protected] ">"
+                            [email protected] " "
+                            [email protected]
+                              [email protected]
+                                [email protected]
+                                  [email protected]
+                                    [email protected] "Trait"
+                                  [email protected]
+                                    [email protected] "<"
+                                    [email protected]
+                                      [email protected] "\'a"
+                                    [email protected] ">"
+                          [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Copy"
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] "?"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Sized"
+              [email protected] ")"
+      [email protected]
+        [email protected]
+          [email protected] ">"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 88..88: expected COMMA
 error 88..88: expected R_ANGLE
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
index 195c08bd9..88b086daf 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
@@ -9,187 +9,185 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "enum"
-          [email protected] " "
-          [email protected]
-            [email protected] "Test"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Var1"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Var2"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "String"
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Var3"
-              [email protected] " "
-              [email protected]
-                [email protected] "{"
-                [email protected] "\n            "
-                [email protected]
-                  [email protected]
-                    [email protected] "abc"
-                  [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-                [email protected]
-                  [email protected] ","
-                [email protected] " "
-                [email protected] "//~ ERROR: expected t ..."
-                [email protected] "\n        "
-                [email protected] "}"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected] "// recover..."
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "a"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "enum"
-          [email protected] " "
-          [email protected]
-            [email protected] "Test2"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Fine"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected] "enum"
-          [email protected] " "
-          [email protected]
-            [email protected] "Test3"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "StillFine"
-              [email protected] " "
-              [email protected]
-                [email protected] "{"
-                [email protected] "\n            "
-                [email protected]
-                  [email protected]
-                    [email protected] "def"
-                  [email protected] ":"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "i32"
-                [email protected] ","
-                [email protected] "\n        "
-                [email protected] "}"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "// fail again"
-                [email protected] "\n        "
-                [email protected] "enum"
-                [email protected] " "
-                [email protected]
-                  [email protected] "Test4"
-                [email protected] " "
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "\n            "
-                  [email protected]
-                    [email protected]
-                      [email protected] "Nope"
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected] "i32"
-                      [email protected] " "
-                      [email protected]
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] "}"
-                  [email protected]
-                    [email protected] ")"
-                  [email protected] " "
-                  [email protected] "//~ ERROR: found `{`"
-                  [email protected] "\n                     ..."
-                  [email protected] "//~^ ERROR: found `{`"
-                  [email protected] "\n        "
-                  [email protected] "}"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected] "// still recover later"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "bad_syntax"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "//~ ERROR: expected e ..."
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "enum"
+        [email protected] " "
+        [email protected]
+          [email protected] "Test"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Var1"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Var2"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "String"
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Var3"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "\n            "
+              [email protected]
+                [email protected]
+                  [email protected] "abc"
+                [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] "}"
+              [email protected]
+                [email protected] ","
+              [email protected] " "
+              [email protected] "//~ ERROR: expected t ..."
+              [email protected] "\n        "
+              [email protected] "}"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected] "// recover..."
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "a"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "enum"
+        [email protected] " "
+        [email protected]
+          [email protected] "Test2"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Fine"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected] "enum"
+        [email protected] " "
+        [email protected]
+          [email protected] "Test3"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "StillFine"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "\n            "
+              [email protected]
+                [email protected]
+                  [email protected] "def"
+                [email protected] ":"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "i32"
+              [email protected] ","
+              [email protected] "\n        "
+              [email protected] "}"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "// fail again"
+            [email protected] "\n        "
+            [email protected] "enum"
+            [email protected] " "
+            [email protected]
+              [email protected] "Test4"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "\n            "
+              [email protected]
+                [email protected]
+                  [email protected] "Nope"
+                [email protected]
+                  [email protected] "("
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "i32"
+                  [email protected] " "
+                  [email protected]
+              [email protected]
+                [email protected] "{"
+                [email protected] "}"
+              [email protected]
+                [email protected] ")"
+              [email protected] " "
+              [email protected] "//~ ERROR: found `{`"
+              [email protected] "\n                     ..."
+              [email protected] "//~^ ERROR: found `{`"
+              [email protected] "\n        "
+              [email protected] "}"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected] "// still recover later"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "bad_syntax"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "//~ ERROR: expected e ..."
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 95..95: expected type
 error 95..95: expected COMMA
diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
index f2fada510..568a4cc02 100644
--- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
@@ -21,9 +21,8 @@ [email protected]
             [email protected] ">"
     [email protected] "\n"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 26..26: expected a path
 error 26..26: expected colon
diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
index 56682f966..0da8f59f0 100644
--- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
+++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
@@ -20,17 +20,16 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "a"
-          [email protected] "."
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "a"
+        [email protected] "."
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 21..21: expected field name or number
diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
index aac476430..515819e42 100644
--- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
@@ -9,115 +9,111 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "inner"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "!"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "doc"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "\"Inner attributes not ..."
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected] "//! Nor are ModuleDoc ..."
-              [email protected] "\n    "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "\n        "
-                [email protected]
-                  [email protected] "#"
-                  [email protected] "!"
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "doc"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "\"Nor here\""
-                    [email protected] ")"
-                  [email protected] "]"
-                [email protected] "\n        "
-                [email protected]
-                  [email protected] "#"
-                  [email protected] "!"
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "doc"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "\"We error on each attr\""
-                    [email protected] ")"
-                  [email protected] "]"
-                [email protected] "\n        "
-                [email protected] "//! Nor are ModuleDoc ..."
-                [email protected] "\n    "
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "while"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "true"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "!"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "doc"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "\"Nor here\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected] "//! Nor are ModuleDoc ..."
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "inner"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Inner attributes not ..."
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected] "//! Nor are ModuleDoc ..."
+          [email protected] "\n    "
+          [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+              [email protected] "!"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"Nor here\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+              [email protected] "!"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"We error on each attr\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected] "//! Nor are ModuleDoc ..."
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "while"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "true"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Nor here\""
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected] "//! Nor are ModuleDoc ..."
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\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
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
index f98de7f15..c6859eca8 100644
--- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
@@ -9,187 +9,186 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "#"
-                [email protected]
-                  [email protected] "!"
-                [email protected]
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "doc"
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "\"Not allowed here\""
-                      [email protected] ")"
-                  [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "#"
-                [email protected]
-                  [email protected] "!"
-                [email protected]
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "doc"
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "\"Nor here\""
-                      [email protected] ")"
-                  [email protected] "]"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "test"
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-              [email protected]
-                [email protected] "!"
-              [email protected]
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "doc"
-                  [email protected]
-                    [email protected] "("
-                    [email protected]
-                      [email protected] "\"Nor here\""
-                    [email protected] ")"
-                [email protected] "]"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "#"
+              [email protected]
+                [email protected] "!"
+              [email protected]
+                [email protected] "["
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "doc"
+                  [email protected]
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "\"Not allowed here\""
+                    [email protected] ")"
+                [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "#"
+              [email protected]
+                [email protected] "!"
+              [email protected]
+                [email protected] "["
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "doc"
+                  [email protected]
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "\"Nor here\""
+                    [email protected] ")"
+                [email protected] "]"
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "test"
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+            [email protected]
+              [email protected] "!"
+            [email protected]
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "doc"
+                [email protected]
+                  [email protected] "("
+                  [email protected]
+                    [email protected] "\"Nor here\""
+                  [email protected] ")"
+              [email protected] "]"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 52..52: expected `[`
 error 52..52: expected pattern
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
index d0017c883..53e445459 100644
--- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
@@ -9,58 +9,57 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "test"
-                  [email protected] ")"
-                [email protected] "]"
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "test"
+                [email protected] ")"
+              [email protected] "]"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 80..80: expected pattern
 error 80..80: expected FAT_ARROW
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
index 2c0bddec8..1b2ac5011 100644
--- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
@@ -9,84 +9,83 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected]
-              [email protected] "box"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "i"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "box"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "i"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "box"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "i"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected]
+            [email protected] "box"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "i"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "box"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "i"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "box"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "i"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
 error 24..24: expected a name
 error 27..27: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
index 83851f5d2..9588cf3b3 100644
--- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
@@ -44,9 +44,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 17..17: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
 error 17..17: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
index a328222aa..e3cda7c43 100644
--- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
+++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
@@ -27,9 +27,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected]
@@ -44,9 +43,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
index bcd1fad69..21db9ee85 100644
--- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
+++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
@@ -9,22 +9,21 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "0"
-            [email protected] "..="
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "..="
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "0"
+          [email protected] "..="
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "..="
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 16..20: An inclusive range must have an end expression
 error 26..29: An inclusive range must have an end expression
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
index 433ea7bad..ec950381b 100644
--- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
@@ -18,66 +18,65 @@ [email protected]
               [email protected] "i32"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "["
-                  [email protected]
-                    [email protected] "1"
-                  [email protected] ","
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "2"
-                  [email protected] ","
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "3"
-                  [email protected] "]"
-                [email protected] "."
-                [email protected]
-                  [email protected] "iter"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] "\n        "
-              [email protected] "."
-              [email protected]
-                [email protected] "map"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected] "|"
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "it"
-                    [email protected] "|"
-                [email protected] ")"
-            [email protected] "\n        "
-            [email protected] "."
-            [email protected]
-              [email protected] "max"
-            [email protected]
-              [email protected] "::"
-              [email protected] "<"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "i32"
-              [email protected] ">"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "["
+                [email protected]
+                  [email protected] "1"
+                [email protected] ","
+                [email protected] " "
+                [email protected]
+                  [email protected] "2"
+                [email protected] ","
+                [email protected] " "
+                [email protected]
+                  [email protected] "3"
+                [email protected] "]"
+              [email protected] "."
+              [email protected]
+                [email protected] "iter"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] "\n        "
+            [email protected] "."
+            [email protected]
+              [email protected] "map"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected] "|"
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "it"
+                  [email protected] "|"
+              [email protected] ")"
+          [email protected] "\n        "
+          [email protected] "."
+          [email protected]
+            [email protected] "max"
+          [email protected]
+            [email protected] "::"
+            [email protected] "<"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "i32"
+            [email protected] ">"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 56..56: expected expression
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
new file mode 100644
index 000000000..d2a549273
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
@@ -0,0 +1,91 @@
+[email protected]
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "::"
+          [email protected] "crate"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected] "{"
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "crate"
+        [email protected] ","
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "foo"
+          [email protected] "::"
+          [email protected]
+            [email protected] "{"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "crate"
+                    [email protected] "::"
+                    [email protected]
+                      [email protected]
+                        [email protected] "foo"
+                  [email protected] "::"
+                  [email protected]
+                    [email protected]
+                      [email protected] "bar"
+                [email protected] "::"
+                [email protected]
+                  [email protected]
+                    [email protected] "baz"
+            [email protected] "}"
+        [email protected] "}"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "hello"
+        [email protected] "::"
+        [email protected]
+          [email protected] "crate"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "hello"
+          [email protected] "::"
+          [email protected]
+            [email protected] "crate"
+        [email protected] "::"
+        [email protected]
+          [email protected]
+            [email protected] "there"
+    [email protected] ";"
+  [email protected] "\n"
+error 6..11: The `crate` keyword is only allowed as the first segment of a path
+error 31..36: The `crate` keyword is only allowed as the first segment of a path
+error 66..71: The `crate` keyword is only allowed as the first segment of a path
+error 84..89: The `crate` keyword is only allowed as the first segment of a path
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs
new file mode 100644
index 000000000..508def2c7
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs
@@ -0,0 +1,4 @@
+use ::crate;
+use {crate, foo::{crate::foo::bar::baz}};
+use hello::crate;
+use hello::crate::there;
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
new file mode 100644
index 000000000..d0360c467
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
@@ -0,0 +1,70 @@
+[email protected]
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "::"
+          [email protected] "super"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "a"
+        [email protected] "::"
+        [email protected]
+          [email protected] "super"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "super"
+          [email protected] "::"
+          [email protected]
+            [email protected]
+              [email protected] "a"
+        [email protected] "::"
+        [email protected]
+          [email protected] "super"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "a"
+      [email protected] "::"
+      [email protected]
+        [email protected] "{"
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "super"
+            [email protected] "::"
+            [email protected]
+              [email protected]
+                [email protected] "b"
+        [email protected] "}"
+    [email protected] ";"
+  [email protected] "\n"
+error 6..11: The `super` keyword may only be preceded by other `super`s
+error 20..25: The `super` keyword may only be preceded by other `super`s
+error 41..46: The `super` keyword may only be preceded by other `super`s
+error 56..61: The `super` keyword may only be preceded by other `super`s
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs
new file mode 100644
index 000000000..bd4d58042
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs
@@ -0,0 +1,4 @@
+use ::super;
+use a::super;
+use super::a::super;
+use a::{super::b};
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
new file mode 100644
index 000000000..4f382b06c
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
@@ -0,0 +1,27 @@
+[email protected]
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "::"
+          [email protected] "self"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "a"
+        [email protected] "::"
+        [email protected]
+          [email protected] "self"
+    [email protected] ";"
+  [email protected] "\n"
+error 6..10: The `self` keyword is only allowed as the first segment of a path
+error 19..23: The `self` keyword is only allowed as the first segment of a path
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs
new file mode 100644
index 000000000..b9e1d7d8b
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs
@@ -0,0 +1,2 @@
+use ::self;
+use a::self;
diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
new file mode 100644
index 000000000..e46456384
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
@@ -0,0 +1,71 @@
+[email protected]
+  [email protected]
+    [email protected] "fn"
+    [email protected] " "
+    [email protected]
+      [email protected] "main"
+    [email protected]
+      [email protected] "("
+      [email protected] ")"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected] "unsafe"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected] "async"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "try"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "{"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "\'label"
+              [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] " "
+        [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
+  [email protected] "\n"
+error 24..24: expected existential, fn, trait or impl
+error 41..41: expected existential, fn, trait or impl
+error 56..56: expected a block
+error 75..75: expected a loop
+error 75..75: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs
new file mode 100644
index 000000000..8fa324c1a
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs
@@ -0,0 +1,6 @@
+fn main() {
+    { unsafe 92 }
+    { async 92 }
+    { try 92 }
+    { 'label: 92 }
+}
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
index 85bf276a0..75668c818 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
@@ -9,19 +9,18 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "\'loop"
-              [email protected] ":"
-        [email protected] " "
-        [email protected]
-          [email protected] "impl"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "\'loop"
+            [email protected] ":"
+      [email protected] " "
+      [email protected]
+        [email protected] "impl"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 22..22: expected a loop
 error 22..22: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
index b901c17f7..c789e8d82 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
@@ -8,9 +8,8 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] " "
   [email protected]
     [email protected] "unsafe"
@@ -29,9 +28,8 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 11..11: expected an item
 error 18..18: expected an item
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
index 3f48b86ed..cd24313d4 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
@@ -9,24 +9,23 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "async"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "async"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
 error 27..27: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
index be02eaeeb..c5fa7a404 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
@@ -9,18 +9,17 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "pub"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "92"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "pub"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "92"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
 error 14..14: expected an item
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
index b344e4f7f..0656fdf73 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
@@ -9,53 +9,51 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n   "
-        [email protected]
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "A"
-            [email protected] "]"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] " "
-            [email protected] "+"
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "\n   "
-        [email protected]
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "B"
-            [email protected] "]"
-          [email protected] " "
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n   "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "A"
+          [email protected] "]"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] " "
+          [email protected] "+"
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "\n   "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "B"
+          [email protected] "]"
+        [email protected] " "
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 24..24: attributes are not allowed on BIN_EXPR
 error 44..44: attributes are not allowed on IF_EXPR
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
index 5339a84d7..e1abc5633 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
@@ -9,45 +9,44 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "."
-            [email protected] "0."
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "."
-            [email protected]
-              [email protected] "1i32"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "."
-            [email protected]
-              [email protected] "0x01"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "."
+          [email protected] "0."
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "."
+          [email protected]
+            [email protected] "1i32"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "."
+          [email protected]
+            [email protected] "0x01"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\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
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
index 20ed39046..9be441110 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
@@ -14,9 +14,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "unsafe"
@@ -33,9 +32,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 6..6: expected existential, fn, trait or impl
 error 31..31: expected existential, fn, trait or impl
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
index 88567263e..b8cd0587d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_default_fn_type.rast
@@ -45,9 +45,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
index 578befa56..a9de44b57 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
@@ -9,41 +9,40 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "S"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "field"
-              [email protected] " "
-              [email protected]
-                [email protected] ".."
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "S"
-                      [email protected] "::"
-                      [email protected]
-                        [email protected]
-                          [email protected] "default"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-            [email protected] " "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "S"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "field"
+            [email protected] " "
+            [email protected]
+              [email protected] ".."
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "S"
+                    [email protected] "::"
+                    [email protected]
+                      [email protected]
+                        [email protected] "default"
+                [email protected]
+                  [email protected] "("
+                  [email protected] ")"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 25..25: expected COLON
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
index a1fabb557..a38b4f573 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
@@ -51,9 +51,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
index bd74b44a6..cf3a90400 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
@@ -1,4 +1,4 @@
-[email protected]50
+[email protected]49
   [email protected]
     [email protected] "use"
     [email protected] " "
@@ -104,32 +104,33 @@ [email protected]
   [email protected] " "
   [email protected] "// Rust 2015"
   [email protected] "\n"
-  [email protected]6
+  [email protected]5
     [email protected] "use"
     [email protected] " "
-    [email protected]5
+    [email protected]4
       [email protected] "::"
-      [email protected]5
+      [email protected]4
         [email protected] "{"
-        [email protected]4
-          [email protected]4
+        [email protected]3
+          [email protected]3
             [email protected] "{"
-            [email protected]3
-              [email protected]3
+            [email protected]2
+              [email protected]2
                 [email protected] "{"
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "crate"
-                    [email protected] "::"
-                    [email protected]
-                      [email protected]
-                        [email protected] "export"
-                [email protected] "}"
-            [email protected] "}"
-        [email protected] "}"
-    [email protected] ";"
-  [email protected] " "
-  [email protected] "// Nonsensical but pe ..."
-  [email protected] "\n"
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "root"
+                    [email protected] "::"
+                    [email protected]
+                      [email protected]
+                        [email protected] "export"
+                [email protected] "}"
+            [email protected] "}"
+        [email protected] "}"
+    [email protected] ";"
+  [email protected] " "
+  [email protected] "// Nonsensical but pe ..."
+  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rs b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rs
index 06c387cee..381cba1e2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rs
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rs
@@ -1,4 +1,4 @@
 use {crate::path::from::root, or::path::from::crate_name}; // Rust 2018 (with a crate named `or`)
 use {path::from::root}; // Rust 2015
 use ::{some::arbritrary::path}; // Rust 2015
-use ::{{{crate::export}}}; // Nonsensical but perfectly legal nestnig
+use ::{{{root::export}}}; // Nonsensical but perfectly legal nesting
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
index a46d76fde..9dc473e43 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
@@ -55,8 +55,7 @@ [email protected]
                     [email protected] ")"
     [email protected] "\n"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
index 5181fcd2b..6c8c1e24b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
@@ -32,7 +32,6 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
index dd41b44e1..9f4a9e69b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
@@ -23,9 +23,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -41,9 +40,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -61,9 +59,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -95,9 +92,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -113,9 +109,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
index a8ddd20c9..10eb31d68 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
@@ -9,89 +9,88 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-              [email protected] "::"
-              [email protected]
-                [email protected]
-                  [email protected] "Bar"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "::"
-                [email protected]
-                  [email protected] "Bar"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Bar"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected] ".."
-              [email protected] " "
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Bar"
-            [email protected] "("
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+            [email protected] "::"
+            [email protected]
+              [email protected]
+                [email protected] "Bar"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "::"
+              [email protected]
+                [email protected] "Bar"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Bar"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected] ".."
+            [email protected] " "
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Bar"
+          [email protected] "("
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
index df8ada62a..425e5196c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
@@ -9,18 +9,16 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "loop"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "loop"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
index de01cc79e..d823c08fc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
@@ -9,52 +9,51 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "."
-            [email protected]
-              [email protected] "foo"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "x"
-              [email protected] "."
-              [email protected]
-                [email protected] "0"
-            [email protected] "."
-            [email protected]
-              [email protected] "bar"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "x"
-              [email protected] "."
-              [email protected]
-                [email protected] "0"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "."
+          [email protected]
+            [email protected] "foo"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "x"
+            [email protected] "."
+            [email protected]
+              [email protected] "0"
+          [email protected] "."
+          [email protected]
+            [email protected] "bar"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "x"
+            [email protected] "."
+            [email protected]
+              [email protected] "0"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
index 8ac307cb3..422912e3c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
@@ -9,29 +9,27 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "loop"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "continue"
-                [email protected] ";"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "continue"
-                  [email protected] " "
-                  [email protected] "\'l"
-                [email protected] ";"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "loop"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "continue"
+            [email protected] ";"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "continue"
+              [email protected] " "
+              [email protected] "\'l"
+            [email protected] ";"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
index 6f6400d00..15da6fdd6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
@@ -32,9 +32,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -66,9 +65,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
index ba422f1ae..10d6b2fde 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
@@ -9,37 +9,36 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "*"
-            [email protected]
-              [email protected] "*"
-              [email protected]
-                [email protected] "&"
-                [email protected]
-                  [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "!"
-            [email protected]
-              [email protected] "!"
-              [email protected]
-                [email protected] "true"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "-"
-            [email protected]
-              [email protected] "-"
-              [email protected]
-                [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "*"
+          [email protected]
+            [email protected] "*"
+            [email protected]
+              [email protected] "&"
+              [email protected]
+                [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "!"
+          [email protected]
+            [email protected] "!"
+            [email protected]
+              [email protected] "true"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "-"
+          [email protected]
+            [email protected] "-"
+            [email protected]
+              [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
index de22b22dd..c204aeb63 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
@@ -55,9 +55,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -72,9 +71,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
index 7da292a2d..7eb27d5e1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
@@ -9,34 +9,33 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "b"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] "]"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "b"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
index 574942f06..b4598768e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
@@ -9,97 +9,96 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] "("
-            [email protected]
-              [email protected] "_"
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] "("
-            [email protected]
-              [email protected] "_"
-            [email protected] ","
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] "("
-            [email protected]
-              [email protected] "_"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] " "
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "x"
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] "("
+          [email protected]
+            [email protected] "_"
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] "("
+          [email protected]
+            [email protected] "_"
+          [email protected] ","
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] "("
+          [email protected]
+            [email protected] "_"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] " "
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "x"
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
index 1927438bb..b824c10a8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
@@ -9,42 +9,41 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "&"
-            [email protected]
-              [email protected]
-                [email protected] "a"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "&"
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "b"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "&"
+          [email protected]
+            [email protected]
+              [email protected] "a"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "&"
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "b"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
index 9effb345f..fabb09937 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
@@ -9,82 +9,81 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "82"
-            [email protected] " "
-            [email protected] "as"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "i32"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "81"
-              [email protected] " "
-              [email protected] "as"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "i8"
-            [email protected] " "
-            [email protected] "+"
-            [email protected] " "
-            [email protected]
-              [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "79"
-              [email protected] " "
-              [email protected] "as"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "i16"
-            [email protected] " "
-            [email protected] "-"
-            [email protected] " "
-            [email protected]
-              [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "0x36"
-              [email protected] " "
-              [email protected] "as"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "u8"
-            [email protected] " "
-            [email protected] "<="
-            [email protected] " "
-            [email protected]
-              [email protected] "0x37"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "82"
+          [email protected] " "
+          [email protected] "as"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "i32"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "81"
+            [email protected] " "
+            [email protected] "as"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "i8"
+          [email protected] " "
+          [email protected] "+"
+          [email protected] " "
+          [email protected]
+            [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "79"
+            [email protected] " "
+            [email protected] "as"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "i16"
+          [email protected] " "
+          [email protected] "-"
+          [email protected] " "
+          [email protected]
+            [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "0x36"
+            [email protected] " "
+            [email protected] "as"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "u8"
+          [email protected] " "
+          [email protected] "<="
+          [email protected] " "
+          [email protected]
+            [email protected] "0x37"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
index b6759541e..3aed26732 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
@@ -9,39 +9,37 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "if"
-          [email protected] " "
-          [email protected]
-            [email protected] "let"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "Some"
-              [email protected] "("
-              [email protected]
-                [email protected] "_"
-              [email protected] ")"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "None"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "if"
+        [email protected] " "
+        [email protected]
+          [email protected] "let"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "Some"
+            [email protected] "("
+            [email protected]
+              [email protected] "_"
+            [email protected] ")"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "None"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -53,157 +51,152 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected] "let"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Some"
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "_"
-                  [email protected] ")"
-                [email protected] " "
-                [email protected] "|"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Some"
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "_"
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "None"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected] "let"
-              [email protected] " "
-              [email protected] "|"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "Some"
-                [email protected] "("
-                [email protected]
-                  [email protected] "_"
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "None"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected] "let"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Some"
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "_"
-                  [email protected] ")"
-                [email protected] " "
-                [email protected] "|"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Some"
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "_"
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "None"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "while"
-          [email protected] " "
-          [email protected]
-            [email protected] "let"
-            [email protected] " "
-            [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "Some"
-              [email protected] "("
-              [email protected]
-                [email protected] "_"
-              [email protected] ")"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "None"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected] "let"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Some"
+                [email protected] "("
+                [email protected]
+                  [email protected] "_"
+                [email protected] ")"
+              [email protected] " "
+              [email protected] "|"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Some"
+                [email protected] "("
+                [email protected]
+                  [email protected] "_"
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "None"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected] "let"
+            [email protected] " "
+            [email protected] "|"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "Some"
+              [email protected] "("
+              [email protected]
+                [email protected] "_"
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "None"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected] "let"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Some"
+                [email protected] "("
+                [email protected]
+                  [email protected] "_"
+                [email protected] ")"
+              [email protected] " "
+              [email protected] "|"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Some"
+                [email protected] "("
+                [email protected]
+                  [email protected] "_"
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "None"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "while"
+        [email protected] " "
+        [email protected]
+          [email protected] "let"
+          [email protected] " "
+          [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "Some"
+            [email protected] "("
+            [email protected]
+              [email protected] "_"
+            [email protected] ")"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "None"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
index e5138a599..899b63aac 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
@@ -9,81 +9,76 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected] "let"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "Some"
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "it"
-                [email protected] "."
-                [email protected]
-                  [email protected] "next"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "true"
-                  [email protected] " "
-                  [email protected] "}"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected] "let"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "Some"
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "it"
+              [email protected] "."
+              [email protected]
+                [email protected] "next"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "{"
+              [email protected] " "
+              [email protected]
+                [email protected] "true"
+              [email protected] " "
+              [email protected] "}"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
index 52644da8f..e064aafaf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
@@ -9,47 +9,45 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "loop"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "break"
-                [email protected] ";"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "break"
-                  [email protected] " "
-                  [email protected] "\'l"
-                [email protected] ";"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "break"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "92"
-                [email protected] ";"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "break"
-                  [email protected] " "
-                  [email protected] "\'l"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "92"
-                [email protected] ";"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "loop"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+            [email protected] ";"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+              [email protected] " "
+              [email protected] "\'l"
+            [email protected] ";"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+              [email protected] " "
+              [email protected]
+                [email protected] "92"
+            [email protected] ";"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+              [email protected] " "
+              [email protected] "\'l"
+              [email protected] " "
+              [email protected]
+                [email protected] "92"
+            [email protected] ";"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
index f061c0cac..cf5825593 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0036_unsafe_extern_fn.rast
@@ -16,7 +16,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
index e25fc8c3e..fbd90bc0f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
@@ -42,38 +42,37 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "<"
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "usize"
-                    [email protected] " "
-                    [email protected] "as"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "Default"
-                    [email protected] ">"
-                [email protected] "::"
-                [email protected]
-                  [email protected]
-                    [email protected] "default"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "<"
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "usize"
+                  [email protected] " "
+                  [email protected] "as"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "Default"
+                  [email protected] ">"
+              [email protected] "::"
+              [email protected]
+                [email protected]
+                  [email protected] "default"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
index a1238d610..a767f145d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
@@ -9,21 +9,20 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "xs"
-            [email protected] "["
-            [email protected]
-              [email protected] ".."
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "xs"
+          [email protected] "["
+          [email protected]
+            [email protected] ".."
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
index 69e5fe4bc..e92ea2bf2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
@@ -32,13 +32,12 @@ [email protected]
             [email protected] " "
             [email protected]
               [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "2"
-                  [email protected] " "
-                  [email protected] "}"
+                [email protected] "{"
+                [email protected] " "
+                [email protected]
+                  [email protected] "2"
+                [email protected] " "
+                [email protected] "}"
             [email protected] ","
             [email protected] " "
             [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
index 1a98e2610..aa582516a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
@@ -12,10 +12,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "struct"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
index bbf6dc494..0c1c6e877 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
@@ -9,140 +9,139 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "f"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "f"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "1"
-                [email protected] ")"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] ","
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "f"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected] "Foo"
-                        [email protected] ">"
-                    [email protected] "::"
-                    [email protected]
-                      [email protected]
-                        [email protected] "func"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "f"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected] "Foo"
-                        [email protected] " "
-                        [email protected] "as"
-                        [email protected] " "
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected] "Trait"
-                        [email protected] ">"
-                    [email protected] "::"
-                    [email protected]
-                      [email protected]
-                        [email protected] "func"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "f"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "f"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "1"
+              [email protected] ")"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] ","
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "f"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected]
+                              [email protected] "Foo"
+                      [email protected] ">"
+                  [email protected] "::"
+                  [email protected]
+                    [email protected]
+                      [email protected] "func"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "f"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected]
+                              [email protected] "Foo"
+                      [email protected] " "
+                      [email protected] "as"
+                      [email protected] " "
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected]
+                              [email protected] "Trait"
+                      [email protected] ">"
+                  [email protected] "::"
+                  [email protected]
+                    [email protected]
+                      [email protected] "func"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
index a454dfc3a..c23b3b67c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
@@ -9,22 +9,20 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "fn"
-          [email protected] " "
-          [email protected]
-            [email protected] "b"
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "fn"
+        [email protected] " "
+        [email protected]
+          [email protected] "b"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
index 2a50f796c..9ca2165ba 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
@@ -41,7 +41,6 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
index 7f87e05ec..b209f67f8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
@@ -35,9 +35,8 @@ [email protected]
               [email protected] ">"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -77,7 +76,6 @@ [email protected]
               [email protected] ">"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
index 5f846177e..70232a3b2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
@@ -9,88 +9,87 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "a"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-              [email protected] "::"
-              [email protected]
-                [email protected]
-                  [email protected] "b"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "::"
-                [email protected]
-                  [email protected] "a"
-                [email protected]
-                  [email protected] "::"
-                  [email protected] "<"
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "b"
-                  [email protected] ">"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "format"
-            [email protected] "!"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "a"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+            [email protected] "::"
+            [email protected]
+              [email protected]
+                [email protected] "b"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "::"
+              [email protected]
+                [email protected] "a"
+              [email protected]
+                [email protected] "::"
+                [email protected] "<"
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "b"
+                [email protected] ">"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "format"
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
index d9310e82e..03c52525e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
@@ -9,69 +9,68 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "-"
-                [email protected]
-                  [email protected] "1"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "92"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "\'c\'"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "\"hello\""
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "-"
+              [email protected]
+                [email protected] "1"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "92"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "\'c\'"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "\"hello\""
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
index 2e727c1ef..24f89b83f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
@@ -105,7 +105,6 @@ [email protected]
             [email protected] "\'a"
     [email protected] "\n"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
index c1e58f9bf..bb43d1eaf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0057_const_fn.rast
@@ -11,7 +11,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
index 9bdf2379f..8bd94a868 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
@@ -9,75 +9,74 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "92"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "0"
-                [email protected] " "
-                [email protected] "..."
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "100"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "101"
-                [email protected] " "
-                [email protected] "..="
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "200"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "200"
-                [email protected] " "
-                [email protected] ".."
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "301"
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "0"
+              [email protected] " "
+              [email protected] "..."
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "100"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "101"
+              [email protected] " "
+              [email protected] "..="
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "200"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "200"
+              [email protected] " "
+              [email protected] ".."
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "301"
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
index e9ca92364..9210f155c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
@@ -9,52 +9,50 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
index 15d332938..850465d82 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
@@ -9,117 +9,116 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "x"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "y"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "32"
-              [email protected] ","
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "x"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "y"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "32"
-              [email protected] ","
-              [email protected] " "
-              [email protected] ".."
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Default"
-                    [email protected] "::"
-                    [email protected]
-                      [email protected]
-                        [email protected] "default"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "TupleStruct"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "0"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "1"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "x"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "y"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "32"
+            [email protected] ","
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "x"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "y"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "32"
+            [email protected] ","
+            [email protected] " "
+            [email protected] ".."
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Default"
+                  [email protected] "::"
+                  [email protected]
+                    [email protected]
+                      [email protected] "default"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "TupleStruct"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "0"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "1"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
index 3cce106e4..02656df31 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
@@ -9,9 +9,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
index 5e1b4cc68..445d8d309 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
@@ -9,124 +9,113 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-            [email protected] " "
-            [email protected] "else"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-            [email protected] " "
-            [email protected] "else"
-            [email protected] " "
-            [email protected]
-              [email protected] "if"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "false"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-              [email protected] " "
-              [email protected] "else"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "true"
-                  [email protected] " "
-                  [email protected] "}"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected] "}"
-            [email protected] " "
-            [email protected] "else"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+          [email protected] " "
+          [email protected] "else"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+          [email protected] " "
+          [email protected] "else"
+          [email protected] " "
+          [email protected]
+            [email protected] "if"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "false"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+            [email protected] " "
+            [email protected] "else"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "{"
+              [email protected] " "
+              [email protected]
+                [email protected] "true"
+              [email protected] " "
+              [email protected] "}"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected] "}"
+          [email protected] " "
+          [email protected] "else"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
index 108e5c5cc..177bb5514 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
@@ -9,144 +9,143 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "Test"
-                    [email protected] " "
-                    [email protected] ">"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "Test"
-                      [email protected]
-                        [email protected] "{"
-                        [email protected]
-                          [email protected]
-                            [email protected] "field"
-                          [email protected] ":"
-                          [email protected] " "
-                          [email protected]
-                            [email protected] "0"
-                        [email protected] "}"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "X"
-                  [email protected] " "
-                  [email protected] "|"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "Y"
-                [email protected] " "
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Z"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "|"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "X"
-                  [email protected] " "
-                  [email protected] "|"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "Y"
-                [email protected] " "
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Z"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "|"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "X"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n    "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected]
+                [email protected] "if"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "Test"
+                  [email protected] " "
+                  [email protected] ">"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "Test"
+                    [email protected]
+                      [email protected] "{"
+                      [email protected]
+                        [email protected]
+                          [email protected] "field"
+                        [email protected] ":"
+                        [email protected] " "
+                        [email protected]
+                          [email protected] "0"
+                      [email protected] "}"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "X"
+                [email protected] " "
+                [email protected] "|"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected] "Y"
+              [email protected] " "
+              [email protected]
+                [email protected] "if"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Z"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "|"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "X"
+                [email protected] " "
+                [email protected] "|"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected] "Y"
+              [email protected] " "
+              [email protected]
+                [email protected] "if"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Z"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "|"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "X"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n    "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
index 1e888063e..f8ff7079b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
@@ -9,45 +9,42 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected]
-                  [email protected] "1"
-                [email protected] "}"
-            [email protected] " "
-            [email protected] "&"
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected]
-                [email protected] "1"
-              [email protected] "}"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "&"
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "{"
+            [email protected]
+              [email protected] "1"
+            [email protected] "}"
+          [email protected] " "
+          [email protected] "&"
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected]
+            [email protected] "1"
+          [email protected] "}"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "&"
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
index 218b3ec9e..07b3d1435 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
@@ -9,88 +9,85 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected] "}"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "S"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] "}"
-                [email protected] " "
-                [email protected] "}"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected] "}"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "S"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] "}"
+            [email protected] " "
+            [email protected] "}"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
index b8171dc9c..665f716a8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
@@ -9,21 +9,20 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "return"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "return"
-            [email protected] " "
-            [email protected]
-              [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "return"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "return"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
index c2a73ef25..3fd3a4391 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
@@ -9,55 +9,51 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "["
-                [email protected] "]"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "["
+              [email protected] "]"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
index 39a86d002..97c6e6a9d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
@@ -9,9 +9,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -23,22 +22,21 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -50,20 +48,19 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "2"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "2"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -75,16 +72,15 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] " "
-        [email protected]
-          [email protected] "2"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] " "
+      [email protected]
+        [email protected] "2"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
index 9621ba59e..e2c1a507d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
@@ -34,7 +34,6 @@ [email protected]
                     [email protected] "Copy"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
index ed9d62c5f..4f3a8ed24 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
@@ -9,18 +9,17 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "?"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "?"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
index 5141ce70d..462d1a8bb 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
@@ -9,88 +9,87 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "x"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] ".."
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "1"
-              [email protected] ".."
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "a"
-                [email protected] "."
-                [email protected]
-                  [email protected] "b"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ".."
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "x"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] ".."
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "1"
+            [email protected] ".."
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "a"
+              [email protected] "."
+              [email protected]
+                [email protected] "b"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ".."
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
index cdbe64180..dfb8d57ad 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
@@ -89,9 +89,8 @@ [email protected]
                     [email protected] "Iterator"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -155,9 +154,8 @@ [email protected]
                     [email protected] "Iterator"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -237,7 +235,6 @@ [email protected]
                     [email protected] "Iterator"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
index fbad33389..7fe96e17d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
@@ -9,47 +9,46 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "&"
-            [email protected]
-              [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "&"
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "&"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "f"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "&"
+          [email protected]
+            [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "&"
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "&"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "f"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
index b165789fd..9fcb7899e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
@@ -9,128 +9,127 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "true"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "false"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "2.0"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "b\'a\'"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "\'b\'"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "\"c\""
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "r\"d\""
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "b\"e\""
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "br\"f\""
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "true"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "false"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "2.0"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "b\'a\'"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "\'b\'"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "\"c\""
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "r\"d\""
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "b\"e\""
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "br\"f\""
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
index 36f17133d..a42abc189 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
@@ -9,9 +9,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -30,7 +29,6 @@ [email protected]
         [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
index ca5aa007e..7e71d7373 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
@@ -8,62 +8,58 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "break"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "break"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "for"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "i"
-            [email protected] " "
-            [email protected] "in"
-            [email protected] " "
-            [email protected]
-              [email protected] "break"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "break"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "for"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "i"
+          [email protected] " "
+          [email protected] "in"
+          [email protected] " "
+          [email protected]
+            [email protected] "break"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "break"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
index 1c1e349e1..48aaf1004 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0089_extern_fn.rast
@@ -12,7 +12,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
index c264dae5e..aed81f9b0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
@@ -9,26 +9,25 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "x"
-              [email protected] "["
-              [email protected]
-                [email protected] "1"
-              [email protected] "]"
-            [email protected] "["
-            [email protected]
-              [email protected] "2"
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "x"
+            [email protected] "["
+            [email protected]
+              [email protected] "1"
+            [email protected] "]"
+          [email protected] "["
+          [email protected]
+            [email protected] "2"
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
index 24e1ba8a0..67d9595d3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
@@ -9,21 +9,20 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
index 47462d44e..031e74652 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
@@ -9,122 +9,115 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "loop"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "for"
-            [email protected] " "
-            [email protected]
-              [email protected] "_"
-            [email protected] " "
-            [email protected] "in"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "macro_rules"
-            [email protected] "!"
-            [email protected] " "
-            [email protected]
-              [email protected] "test"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n         "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "="
-              [email protected] ">"
-              [email protected] " "
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "test"
-          [email protected] "!"
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "loop"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "for"
+          [email protected] " "
+          [email protected]
+            [email protected] "_"
+          [email protected] " "
+          [email protected] "in"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "macro_rules"
+          [email protected] "!"
+          [email protected] " "
+          [email protected]
+            [email protected] "test"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n         "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "="
+            [email protected] ">"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "}"
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "test"
+        [email protected] "!"
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
index a51fb5511..816e49310 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0098_const_unsafe_fn.rast
@@ -13,7 +13,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
index 61b47bf35..d48ef865c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
@@ -9,9 +9,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -34,9 +33,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -61,9 +59,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -97,7 +94,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
index 89d435d1f..e4455cd3e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
@@ -9,28 +9,26 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "for"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "x"
-            [email protected] " "
-            [email protected] "in"
-            [email protected] " "
-            [email protected]
-              [email protected] "["
-              [email protected] "]"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "for"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "x"
+          [email protected] " "
+          [email protected] "in"
+          [email protected] " "
+          [email protected]
+            [email protected] "["
+            [email protected] "]"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
index 57b4d0c4f..8a8743060 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0101_unsafe_fn.rast
@@ -11,7 +11,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
index ed6f6f326..9f966ff8a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
@@ -9,125 +9,124 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "f"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "ref"
-                  [email protected] " "
-                  [email protected] "mut"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "g"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "h"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "_"
-              [email protected] ","
-              [email protected] " "
-              [email protected] ".."
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "h"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "_"
-              [email protected] ","
-              [email protected] " "
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "f"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "ref"
+                [email protected] " "
+                [email protected] "mut"
+                [email protected] " "
+                [email protected]
+                  [email protected] "g"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "h"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "_"
+            [email protected] ","
+            [email protected] " "
+            [email protected] ".."
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "h"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "_"
+            [email protected] ","
+            [email protected] " "
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
index 461c61914..9b3bef04e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
@@ -9,47 +9,46 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "["
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected] "1"
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected] "1"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-            [email protected] ","
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected] "1"
-            [email protected] ";"
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-            [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "["
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected] "1"
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected] "1"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+          [email protected] ","
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected] "1"
+          [email protected] ";"
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+          [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
deleted file mode 100644
index 8b2323cf2..000000000
--- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rast
+++ /dev/null
@@ -1,43 +0,0 @@
-[email protected]
-  [email protected]
-    [email protected] "fn"
-    [email protected] " "
-    [email protected]
-      [email protected] "foo"
-    [email protected]
-      [email protected] "("
-      [email protected] ")"
-    [email protected] " "
-    [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "unsafe"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "\'label"
-              [email protected] ":"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
-  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
deleted file mode 100644
index 2fed74c5e..000000000
--- a/crates/ra_syntax/test_data/parser/inline/ok/0105_block_expr.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn foo() {
-    {};
-    unsafe {};
-    'label: {};
-}
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
index 73c314e07..e64717152 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
@@ -9,132 +9,127 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected] "->"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "i32"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected]
-                  [email protected] "92"
-                [email protected] " "
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "|"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "move"
-            [email protected] " "
-            [email protected]
-              [email protected] "|"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "i32"
-              [email protected] ","
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "async"
-            [email protected] " "
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "move"
-            [email protected] " "
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "async"
-            [email protected] " "
-            [email protected] "move"
-            [email protected] " "
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "->"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "i32"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected] "92"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "|"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "move"
+          [email protected] " "
+          [email protected]
+            [email protected] "|"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "i32"
+            [email protected] ","
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "async"
+          [email protected] " "
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "move"
+          [email protected] " "
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "async"
+          [email protected] " "
+          [email protected] "move"
+          [email protected] " "
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
index 5392b1a74..98963dc62 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
@@ -9,55 +9,54 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "."
-            [email protected]
-              [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "y"
-            [email protected] "."
-            [email protected]
-              [email protected] "bar"
-            [email protected]
-              [email protected] "::"
-              [email protected] "<"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "T"
-              [email protected] ">"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] ","
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "."
+          [email protected]
+            [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "y"
+          [email protected] "."
+          [email protected]
+            [email protected] "bar"
+          [email protected]
+            [email protected] "::"
+            [email protected] "<"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "T"
+            [email protected] ">"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] ","
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
index 54f18adac..ea603e2c9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
@@ -9,31 +9,30 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] "1"
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] "1"
-            [email protected] ","
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] "1"
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] "1"
+          [email protected] ","
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
index 6c9e45684..30ff96a7c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
@@ -9,60 +9,56 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "\'a"
-              [email protected] ":"
-            [email protected] " "
-            [email protected] "loop"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "\'b"
-              [email protected] ":"
-            [email protected] " "
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "\'c"
-            [email protected] ":"
-          [email protected] " "
-          [email protected] "for"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "x"
-          [email protected] " "
-          [email protected] "in"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "\'a"
+            [email protected] ":"
+          [email protected] " "
+          [email protected] "loop"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "\'b"
+            [email protected] ":"
+          [email protected] " "
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "\'c"
+          [email protected] ":"
+        [email protected] " "
+        [email protected] "for"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "x"
+        [email protected] " "
+        [email protected] "in"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
index a1c5475e7..b58f40ac1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
@@ -9,82 +9,81 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "b"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "b"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
index 42a770a83..b67714c17 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
@@ -9,120 +9,119 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "a"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "b"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected]
-              [email protected] "c"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "d"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "e"
-            [email protected] " "
-            [email protected] "@"
-            [email protected] " "
-            [email protected]
-              [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "f"
-            [email protected] " "
-            [email protected] "@"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "g"
-              [email protected] " "
-              [email protected] "@"
-              [email protected] " "
-              [email protected]
-                [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "a"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "b"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected]
+            [email protected] "c"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "d"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "e"
+          [email protected] " "
+          [email protected] "@"
+          [email protected] " "
+          [email protected]
+            [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "f"
+          [email protected] " "
+          [email protected] "@"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "g"
+            [email protected] " "
+            [email protected] "@"
+            [email protected] " "
+            [email protected]
+              [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
index 5414c90b8..5de480da9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
@@ -8,50 +8,48 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "some_expr"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] ";"
-              [email protected] ";"
-              [email protected] ";"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Ok"
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] ")"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "some_expr"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] ";"
+          [email protected] ";"
+          [email protected] ";"
+          [email protected] "}"
+        [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Ok"
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] ")"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
index 8e080fb60..e152c6b6c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
@@ -9,40 +9,39 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected]
-                [email protected] "if"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "foo"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected]
+              [email protected] "if"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "foo"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
index 728164f8e..b283ab804 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
@@ -9,73 +9,72 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected] "#"
-              [email protected] "!"
-              [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "doc"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"Inner attribute\""
-                [email protected] ")"
-              [email protected] "]"
-            [email protected] "\n        "
-            [email protected]
-              [email protected] "#"
-              [email protected] "!"
-              [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "doc"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"Can be\""
-                [email protected] ")"
-              [email protected] "]"
-            [email protected] "\n        "
-            [email protected]
-              [email protected] "#"
-              [email protected] "!"
-              [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "doc"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"Stacked\""
-                [email protected] ")"
-              [email protected] "]"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Inner attribute\""
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Can be\""
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Stacked\""
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
index 6123885e3..9d5470914 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
@@ -9,138 +9,137 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "feature"
-                  [email protected] " "
-                  [email protected] "="
-                  [email protected] " "
-                  [email protected] "\"some\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "feature"
-                  [email protected] " "
-                  [email protected] "="
-                  [email protected] " "
-                  [email protected] "\"other\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "feature"
-                  [email protected] " "
-                  [email protected] "="
-                  [email protected] " "
-                  [email protected] "\"many\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "feature"
-                  [email protected] " "
-                  [email protected] "="
-                  [email protected] " "
-                  [email protected] "\"attributes\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "feature"
-                  [email protected] " "
-                  [email protected] "="
-                  [email protected] " "
-                  [email protected] "\"before\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "feature"
+                [email protected] " "
+                [email protected] "="
+                [email protected] " "
+                [email protected] "\"some\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "feature"
+                [email protected] " "
+                [email protected] "="
+                [email protected] " "
+                [email protected] "\"other\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "feature"
+                [email protected] " "
+                [email protected] "="
+                [email protected] " "
+                [email protected] "\"many\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "feature"
+                [email protected] " "
+                [email protected] "="
+                [email protected] " "
+                [email protected] "\"attributes\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "feature"
+                [email protected] " "
+                [email protected] "="
+                [email protected] " "
+                [email protected] "\"before\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
index 67b9c10d5..ada2fc54e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
@@ -59,8 +59,7 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
index baf22a8d7..6178dfe59 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0124_async_fn.rast
@@ -11,7 +11,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
index 16f5b90b6..ced59b7c1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
@@ -9,24 +9,23 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "crate"
-                [email protected] "::"
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "crate"
+              [email protected] "::"
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
index 07ed14773..97611f7f3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
@@ -9,40 +9,39 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "S"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "test"
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] " "
-              [email protected]
-                [email protected] "field"
-              [email protected] ":"
-              [email protected] " "
-              [email protected]
-                [email protected] "1"
-            [email protected] " "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "S"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "test"
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] " "
+            [email protected]
+              [email protected] "field"
+            [email protected] ":"
+            [email protected] " "
+            [email protected]
+              [email protected] "1"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
index 8307d4c15..09221fc54 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
@@ -9,91 +9,89 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "A"
-            [email protected] "]"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "B"
-            [email protected] "]"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "bar"
-            [email protected] "!"
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "C"
-            [email protected] "]"
-          [email protected] " "
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "D"
-            [email protected] "]"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "D"
-            [email protected] "]"
-          [email protected] " "
-          [email protected]
-            [email protected] "return"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "A"
+          [email protected] "]"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "B"
+          [email protected] "]"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "bar"
+          [email protected] "!"
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "C"
+          [email protected] "]"
+        [email protected] " "
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "D"
+          [email protected] "]"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "D"
+          [email protected] "]"
+        [email protected] " "
+        [email protected]
+          [email protected] "return"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
index 19c47ea25..93cc41533 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
@@ -9,51 +9,49 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "#"
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "A"
-                  [email protected] "]"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "bar"
-                  [email protected] "!"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-                [email protected] "?"
-              [email protected] " "
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "B"
-            [email protected] "]"
-          [email protected] " "
-          [email protected] "&"
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "A"
+              [email protected] "]"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "bar"
+              [email protected] "!"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] "?"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "B"
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "&"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
index 5630b20af..0901f2348 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0128_combined_fns.rast
@@ -13,9 +13,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "const"
@@ -31,7 +30,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
index 4946ee050..28291afc2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
@@ -9,29 +9,28 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "m"
-              [email protected] "!"
-              [email protected]
-                [email protected] "("
-                [email protected] "x"
-                [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "0"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "m"
+            [email protected] "!"
+            [email protected]
+              [email protected] "("
+              [email protected] "x"
+              [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "0"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
index 18fdd9dc9..bb94a05c6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
@@ -9,121 +9,118 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "a"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "b"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "i32"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "c"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "d"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "i32"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "e"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected] "!"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected] "!"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "f"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "#"
-              [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "attr"
-              [email protected] "]"
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "a"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "b"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "i32"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "c"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "d"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "i32"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "e"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected] "!"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected] "!"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "f"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "#"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "attr"
+            [email protected] "]"
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
index 01fffd7b0..8f2f144c7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
@@ -9,25 +9,23 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "try"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "try"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
index 498b3121e..87ac42748 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
@@ -9,82 +9,81 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "x"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "box"
-            [email protected] " "
-            [email protected]
-              [email protected] "1i32"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "y"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] "box"
-              [email protected] " "
-              [email protected]
-                [email protected] "1i32"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] "box"
-              [email protected] " "
-              [email protected]
-                [email protected] "2i32"
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "z"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "Foo"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "box"
-                [email protected] " "
-                [email protected]
-                  [email protected] "1i32"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "box"
-                [email protected] " "
-                [email protected]
-                  [email protected] "2i32"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "x"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "box"
+          [email protected] " "
+          [email protected]
+            [email protected] "1i32"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "y"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] "box"
+            [email protected] " "
+            [email protected]
+              [email protected] "1i32"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] "box"
+            [email protected] " "
+            [email protected]
+              [email protected] "2i32"
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "z"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "Foo"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "box"
+              [email protected] " "
+              [email protected]
+                [email protected] "1i32"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "box"
+              [email protected] " "
+              [email protected]
+                [email protected] "2i32"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
index db58a928e..00ce5ecf0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0132_default_fn_type.rast
@@ -48,9 +48,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
index 4ca554ef8..b330a0932 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
@@ -9,56 +9,54 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "enum"
-          [email protected] " "
-          [email protected]
-            [email protected] "LocalEnum"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "One"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Two"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "fn"
-          [email protected] " "
-          [email protected]
-            [email protected] "f"
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "struct"
-          [email protected] " "
-          [email protected]
-            [email protected] "S"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
-        [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "enum"
+        [email protected] " "
+        [email protected]
+          [email protected] "LocalEnum"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "One"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Two"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "fn"
+        [email protected] " "
+        [email protected]
+          [email protected] "f"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "struct"
+        [email protected] " "
+        [email protected]
+          [email protected] "S"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
index 7fa3b9f32..8e8d9e992 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
@@ -9,62 +9,61 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] "."
-            [email protected] "await"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "x"
-              [email protected] "."
-              [email protected]
-                [email protected] "0"
-            [email protected] "."
-            [email protected] "await"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "x"
-                    [email protected] "."
-                    [email protected]
-                      [email protected] "0"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-                [email protected] "."
-                [email protected] "await"
-              [email protected] "?"
-            [email protected] "."
-            [email protected]
-              [email protected] "hello"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] "."
+          [email protected] "await"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "x"
+            [email protected] "."
+            [email protected]
+              [email protected] "0"
+          [email protected] "."
+          [email protected] "await"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "x"
+                  [email protected] "."
+                  [email protected]
+                    [email protected] "0"
+                [email protected]
+                  [email protected] "("
+                  [email protected] ")"
+              [email protected] "."
+              [email protected] "await"
+            [email protected] "?"
+          [email protected] "."
+          [email protected]
+            [email protected] "hello"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
index a32484f2c..c457851c9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
@@ -50,7 +50,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
index 9017236cc..ea325831e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
@@ -9,58 +9,56 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n   "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "p"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "F"
-            [email protected]
-              [email protected] "{"
-              [email protected]
-                [email protected]
-                  [email protected] "x"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "5"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n   "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "p"
-                  [email protected] "}"
-              [email protected] "."
-              [email protected]
-                [email protected] "x"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "10"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n   "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "p"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "F"
+          [email protected]
+            [email protected] "{"
+            [email protected]
+              [email protected]
+                [email protected] "x"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "5"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n   "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "{"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "p"
+              [email protected] "}"
+            [email protected] "."
+            [email protected]
+              [email protected] "x"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "10"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
index 2cb5b52f4..9135de9df 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
@@ -20,7 +20,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
index ac3f4de26..14610a0a2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
@@ -29,7 +29,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
index 8d4919cbd..e6be8b7e4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
@@ -9,34 +9,32 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n   "
-        [email protected]
-          [email protected] "for"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "x"
-          [email protected] " "
-          [email protected] "in"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "0"
-            [email protected] " "
-            [email protected] ".."
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n       "
-              [email protected]
-                [email protected]
-                  [email protected] "break"
-                [email protected] ";"
-              [email protected] "\n   "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n   "
+      [email protected]
+        [email protected] "for"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "x"
+        [email protected] " "
+        [email protected] "in"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "0"
+          [email protected] " "
+          [email protected] ".."
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n       "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+            [email protected] ";"
+          [email protected] "\n   "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
index 2c933fa76..57fba5fd5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
@@ -9,103 +9,102 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "box"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "i"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "box"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "Outer"
-              [email protected] " "
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "box"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "i"
-                [email protected] ","
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "j"
-                  [email protected] ":"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "box"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "Inner"
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "box"
-                        [email protected] " "
-                        [email protected]
-                          [email protected] "&"
-                          [email protected]
-                            [email protected]
-                              [email protected] "x"
-                      [email protected] ")"
-                [email protected] " "
-                [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "box"
-            [email protected] " "
-            [email protected]
-              [email protected] "ref"
-              [email protected] " "
-              [email protected] "mut"
-              [email protected] " "
-              [email protected]
-                [email protected] "i"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "box"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "i"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "box"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "Outer"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "box"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected] "i"
+              [email protected] ","
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "j"
+                [email protected] ":"
+                [email protected] " "
+                [email protected]
+                  [email protected] "box"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "Inner"
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "box"
+                      [email protected] " "
+                      [email protected]
+                        [email protected] "&"
+                        [email protected]
+                          [email protected]
+                            [email protected] "x"
+                    [email protected] ")"
+              [email protected] " "
+              [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "box"
+          [email protected] " "
+          [email protected]
+            [email protected] "ref"
+            [email protected] " "
+            [email protected] "mut"
+            [email protected] " "
+            [email protected]
+              [email protected] "i"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
index e0b50d8be..8d8b9597b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
@@ -9,448 +9,447 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] ".."
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected] "//"
-        [email protected] "\n    "
-        [email protected] "// Tuples"
-        [email protected] "\n    "
-        [email protected] "//"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Tuple"
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Tuple"
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Tuple"
-            [email protected] "("
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Tuple"
-            [email protected] "("
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "a"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ")"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected] "//"
-        [email protected] "\n    "
-        [email protected] "// Slices"
-        [email protected] "\n    "
-        [email protected] "//"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected] ".."
-            [email protected] "]"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected] "head"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] "]"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected] "head"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "tail"
-              [email protected] " "
-              [email protected] "@"
-              [email protected] " "
-              [email protected]
-                [email protected] ".."
-            [email protected] "]"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected] "head"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "cons"
-            [email protected] "]"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected] "head"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "mid"
-              [email protected] " "
-              [email protected] "@"
-              [email protected] " "
-              [email protected]
-                [email protected] ".."
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "cons"
-            [email protected] "]"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected] "head"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "cons"
-            [email protected] "]"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected] "head"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "mid"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "tail"
-              [email protected] " "
-              [email protected] "@"
-              [email protected] " "
-              [email protected]
-                [email protected] ".."
-            [email protected] "]"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected] "head"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "mid"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] ".."
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "cons"
-            [email protected] "]"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] ".."
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected] "//"
+      [email protected] "\n    "
+      [email protected] "// Tuples"
+      [email protected] "\n    "
+      [email protected] "//"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Tuple"
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Tuple"
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Tuple"
+          [email protected] "("
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Tuple"
+          [email protected] "("
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "a"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ")"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected] "//"
+      [email protected] "\n    "
+      [email protected] "// Slices"
+      [email protected] "\n    "
+      [email protected] "//"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected] ".."
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected] "head"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected] "head"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "tail"
+            [email protected] " "
+            [email protected] "@"
+            [email protected] " "
+            [email protected]
+              [email protected] ".."
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected] "head"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "cons"
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected] "head"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "mid"
+            [email protected] " "
+            [email protected] "@"
+            [email protected] " "
+            [email protected]
+              [email protected] ".."
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "cons"
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected] "head"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "cons"
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected] "head"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "mid"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "tail"
+            [email protected] " "
+            [email protected] "@"
+            [email protected] " "
+            [email protected]
+              [email protected] ".."
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected] "head"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "mid"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] ".."
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "cons"
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
index 10434b637..7c092d518 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
@@ -9,68 +9,67 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "0"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "1"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "S"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "x"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "1"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "0"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "1"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "S"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "x"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "1"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
index 66ad546b9..8382a4f96 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
@@ -9,35 +9,34 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "&"
-              [email protected]
-                [email protected] "1"
-            [email protected] " "
-            [email protected] "as"
-            [email protected] " "
-            [email protected]
-              [email protected] "*"
-              [email protected] "const"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "i32"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "&"
+            [email protected]
+              [email protected] "1"
+          [email protected] " "
+          [email protected] "as"
+          [email protected] " "
+          [email protected]
+            [email protected] "*"
+            [email protected] "const"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "i32"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
index c2e290a62..f43dfbe63 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
@@ -9,29 +9,28 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "foo"
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "attr"
-                [email protected] "]"
-              [email protected] " "
-              [email protected] "92"
-            [email protected] ")"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "foo"
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "attr"
+              [email protected] "]"
+            [email protected] " "
+            [email protected] "92"
+          [email protected] ")"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
index dad3dfe4d..ecac05950 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
@@ -9,62 +9,61 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n   "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "foo"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "|"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "bar"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "baz"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Baz"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "qux"
-                [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Qux"
-                    [email protected] "::"
-                    [email protected]
-                      [email protected]
-                        [email protected] "Quux"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n   "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "foo"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "|"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "bar"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "baz"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Baz"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "qux"
+              [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Qux"
+                  [email protected] "::"
+                  [email protected]
+                    [email protected]
+                      [email protected] "Quux"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
index 3110bf5c0..092833417 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
@@ -38,7 +38,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
index 3f3e6a9a2..88d512f1a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
@@ -9,104 +9,103 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected] "_"
-                  [email protected] " "
-                  [email protected] "|"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "_"
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "&"
-                [email protected]
-                  [email protected] "("
-                  [email protected]
-                    [email protected]
-                      [email protected] "_"
-                    [email protected] " "
-                    [email protected] "|"
-                    [email protected] " "
-                    [email protected]
-                      [email protected] "_"
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected] "_"
-                  [email protected] " "
-                  [email protected] "|"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "_"
-                [email protected] ","
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected] "_"
-                  [email protected] " "
-                  [email protected] "|"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "_"
-                [email protected] ","
-                [email protected] "]"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected] "_"
+                [email protected] " "
+                [email protected] "|"
+                [email protected] " "
+                [email protected]
+                  [email protected] "_"
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "&"
+              [email protected]
+                [email protected] "("
+                [email protected]
+                  [email protected]
+                    [email protected] "_"
+                  [email protected] " "
+                  [email protected] "|"
+                  [email protected] " "
+                  [email protected]
+                    [email protected] "_"
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected] "_"
+                [email protected] " "
+                [email protected] "|"
+                [email protected] " "
+                [email protected]
+                  [email protected] "_"
+              [email protected] ","
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected] "_"
+                [email protected] " "
+                [email protected] "|"
+                [email protected] " "
+                [email protected]
+                  [email protected] "_"
+              [email protected] ","
+              [email protected] "]"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
index 50db9e967..bd9e8d40f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
@@ -9,30 +9,28 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "v"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected]
-                    [email protected] "1"
-                  [email protected] "}"
-              [email protected] "&"
-              [email protected]
-                [email protected] "2"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "v"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "{"
+              [email protected]
+                [email protected] "1"
+              [email protected] "}"
+            [email protected] "&"
+            [email protected]
+              [email protected] "2"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
index c05e05bf3..08333a325 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
@@ -9,37 +9,35 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "|"
-                [email protected] "|"
-              [email protected] " "
-              [email protected]
-                [email protected] "->"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "i32"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "{"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "92"
-                  [email protected] " "
-                  [email protected] "}"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "|"
+              [email protected] "|"
+            [email protected] " "
+            [email protected]
+              [email protected] "->"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "i32"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] " "
+              [email protected]
+                [email protected] "92"
+              [email protected] " "
+              [email protected] "}"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast
new file mode 100644
index 000000000..5f09e4f4a
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast
@@ -0,0 +1,34 @@
+[email protected]
+  [email protected]
+    [email protected] "fn"
+    [email protected] " "
+    [email protected]
+      [email protected] "foo"
+    [email protected]
+      [email protected] "("
+      [email protected] ")"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "try"
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected] "Ok"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+              [email protected] ")"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
+  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rs b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rs
new file mode 100644
index 000000000..61a6b46a0
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rs
@@ -0,0 +1 @@
+fn foo() { try!(Ok(())); }
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast b/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast
new file mode 100644
index 000000000..05b89d1c3
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast
@@ -0,0 +1,27 @@
+[email protected]
+  [email protected]
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "macro_rules"
+    [email protected] "!"
+    [email protected] " "
+    [email protected]
+      [email protected] "try"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "("
+        [email protected] ")"
+      [email protected] " "
+      [email protected] "="
+      [email protected] ">"
+      [email protected] " "
+      [email protected]
+        [email protected] "{"
+        [email protected] "}"
+      [email protected] " "
+      [email protected] "}"
+  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rs b/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rs
new file mode 100644
index 000000000..2e2ab6e60
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rs
@@ -0,0 +1 @@
+macro_rules! try { () => {} }
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast
new file mode 100644
index 000000000..9efebd8b8
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast
@@ -0,0 +1,26 @@
+[email protected]
+  [email protected]
+    [email protected] "fn"
+    [email protected] " "
+    [email protected]
+      [email protected] "f"
+    [email protected]
+      [email protected] "("
+      [email protected] ")"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "\'label"
+            [email protected] ":"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
+  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs
new file mode 100644
index 000000000..18b4ff4b1
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs
@@ -0,0 +1 @@
+fn f() { 'label: {}; }
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
new file mode 100644
index 000000000..4991f2c36
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
@@ -0,0 +1,23 @@
+[email protected]
+  [email protected]
+    [email protected] "fn"
+    [email protected] " "
+    [email protected]
+      [email protected] "f"
+    [email protected]
+      [email protected] "("
+      [email protected] ")"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "unsafe"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] " "
+      [email protected] "}"
+  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs
new file mode 100644
index 000000000..dfb9b2a1c
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs
@@ -0,0 +1 @@
+fn f() { unsafe { } }
diff --git a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
index 993ba72b6..0ec237f8e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
@@ -9,8 +9,7 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
index 353bf2d2e..37b452ec4 100644
--- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
@@ -36,10 +36,9 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n    "
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "\n    "
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "struct"
diff --git a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
index 3919cc78b..0b9bc58e8 100644
--- a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
@@ -31,9 +31,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected]
diff --git a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
index 750a045ef..980b34049 100644
--- a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
@@ -9,9 +9,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected]
@@ -26,9 +25,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected]
@@ -46,9 +44,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected]
@@ -66,9 +63,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected]
@@ -101,7 +97,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
index a5a90df7b..05d9c05ad 100644
--- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
@@ -1,4 +1,4 @@
-SOURCE_FILE@0..65
+SOURCE_FILE@0..38
   [email protected]
     [email protected] "use"
     [email protected] " "
@@ -31,27 +31,3 @@ [email protected]
             [email protected] "bar"
     [email protected] ";"
   [email protected] "\n"
-  [email protected]
-    [email protected] "use"
-    [email protected] " "
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "::"
-                [email protected] "self"
-            [email protected] "::"
-            [email protected]
-              [email protected]
-                [email protected] "a"
-          [email protected] "::"
-          [email protected]
-            [email protected] "super"
-        [email protected] "::"
-        [email protected]
-          [email protected]
-            [email protected] "bar"
-    [email protected] ";"
-  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs
index faf6a42c7..9d9eb9917 100644
--- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs
@@ -1,3 +1,2 @@
 use self::foo;
 use super::super::bar;
-use ::self::a::super::bar;
diff --git a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
index b5747aacd..964cbf5dd 100644
--- a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
@@ -23,7 +23,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
index 643a1d16c..873791f50 100644
--- a/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0021_extern_fn.rast
@@ -12,10 +12,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected]
@@ -32,10 +31,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected]
@@ -52,8 +50,7 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
index 60af55837..5701f566e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
@@ -9,25 +9,23 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "extern"
-          [email protected] " "
-          [email protected] "fn"
-          [email protected] " "
-          [email protected]
-            [email protected] "f"
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "extern"
+        [email protected] " "
+        [email protected] "fn"
+        [email protected] " "
+        [email protected]
+          [email protected] "f"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
index 4432c0163..b029d8692 100644
--- a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
@@ -9,24 +9,22 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "const"
-          [email protected] " "
-          [email protected] "fn"
-          [email protected] " "
-          [email protected]
-            [email protected] "f"
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "const"
+        [email protected] " "
+        [email protected] "fn"
+        [email protected] " "
+        [email protected]
+          [email protected] "f"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
index c0162c609..299bbd136 100644
--- a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
@@ -9,35 +9,33 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "unsafe"
-          [email protected] " "
-          [email protected] "fn"
-          [email protected] " "
-          [email protected]
-            [email protected] "f"
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "unsafe"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] " "
-            [email protected]
-              [email protected] "92"
-            [email protected] " "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "unsafe"
+        [email protected] " "
+        [email protected] "fn"
+        [email protected] " "
+        [email protected]
+          [email protected] "f"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "unsafe"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
index 6c0daef52..de3c4b786 100644
--- a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
@@ -9,178 +9,177 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "x"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "1"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "2"
-                  [email protected] " "
-                  [email protected] "*"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "3"
-                [email protected] " "
-                [email protected] "%"
-                [email protected] " "
-                [email protected]
-                  [email protected] "4"
-            [email protected] " "
-            [email protected] "-"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "5"
-              [email protected] " "
-              [email protected] "/"
-              [email protected] " "
-              [email protected]
-                [email protected] "6"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] " "
-            [email protected] "+"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "2"
-              [email protected] " "
-              [email protected] "*"
-              [email protected] " "
-              [email protected]
-                [email protected] "3"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] " "
-            [email protected] "<<"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "2"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "3"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] " "
-            [email protected] "&"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "2"
-              [email protected] " "
-              [email protected] ">>"
-              [email protected] " "
-              [email protected]
-                [email protected] "3"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] " "
-            [email protected] "^"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "2"
-              [email protected] " "
-              [email protected] "&"
-              [email protected] " "
-              [email protected]
-                [email protected] "3"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] " "
-            [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "2"
-              [email protected] " "
-              [email protected] "^"
-              [email protected] " "
-              [email protected]
-                [email protected] "3"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] " "
-            [email protected] "=="
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "2"
-              [email protected] " "
-              [email protected] "|"
-              [email protected] " "
-              [email protected]
-                [email protected] "3"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] " "
-            [email protected] "&&"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "2"
-              [email protected] " "
-              [email protected] "=="
-              [email protected] " "
-              [email protected]
-                [email protected] "3"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected] "//1 || 2 && 2;"
-        [email protected] "\n    "
-        [email protected] "//1 .. 2 || 3;"
-        [email protected] "\n    "
-        [email protected] "//1 = 2 .. 3;"
-        [email protected] "\n    "
-        [email protected] "//---&*1 - --2 * 9;"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "x"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "1"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "2"
+                [email protected] " "
+                [email protected] "*"
+                [email protected] " "
+                [email protected]
+                  [email protected] "3"
+              [email protected] " "
+              [email protected] "%"
+              [email protected] " "
+              [email protected]
+                [email protected] "4"
+          [email protected] " "
+          [email protected] "-"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "5"
+            [email protected] " "
+            [email protected] "/"
+            [email protected] " "
+            [email protected]
+              [email protected] "6"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] " "
+          [email protected] "+"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "2"
+            [email protected] " "
+            [email protected] "*"
+            [email protected] " "
+            [email protected]
+              [email protected] "3"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] " "
+          [email protected] "<<"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "2"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "3"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] " "
+          [email protected] "&"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "2"
+            [email protected] " "
+            [email protected] ">>"
+            [email protected] " "
+            [email protected]
+              [email protected] "3"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] " "
+          [email protected] "^"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "2"
+            [email protected] " "
+            [email protected] "&"
+            [email protected] " "
+            [email protected]
+              [email protected] "3"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] " "
+          [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "2"
+            [email protected] " "
+            [email protected] "^"
+            [email protected] " "
+            [email protected]
+              [email protected] "3"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] " "
+          [email protected] "=="
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "2"
+            [email protected] " "
+            [email protected] "|"
+            [email protected] " "
+            [email protected]
+              [email protected] "3"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] " "
+          [email protected] "&&"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "2"
+            [email protected] " "
+            [email protected] "=="
+            [email protected] " "
+            [email protected]
+              [email protected] "3"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected] "//1 || 2 && 2;"
+      [email protected] "\n    "
+      [email protected] "//1 .. 2 || 3;"
+      [email protected] "\n    "
+      [email protected] "//1 = 2 .. 3;"
+      [email protected] "\n    "
+      [email protected] "//---&*1 - --2 * 9;"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
index 8177bd89b..dc47d68a6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
@@ -9,144 +9,143 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] ".."
-            [email protected]
-              [email protected]
-                [email protected] "1"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] ".."
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "z"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "false"
-              [email protected] ".."
-              [email protected]
-                [email protected]
-                  [email protected] "1"
-                [email protected] " "
-                [email protected] "=="
-                [email protected] " "
-                [email protected]
-                  [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "x"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] ".."
-          [email protected] ";"
-        [email protected] "\n    \n    "
-        [email protected]
-          [email protected]
-            [email protected] "..="
-            [email protected]
-              [email protected]
-                [email protected] "1"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "..="
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "z"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "x"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "false"
-              [email protected] "..="
-              [email protected]
-                [email protected]
-                  [email protected] "1"
-                [email protected] " "
-                [email protected] "=="
-                [email protected] " "
-                [email protected]
-                  [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "x"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "1"
-            [email protected] ".."
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] ".."
+          [email protected]
+            [email protected]
+              [email protected] "1"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] ".."
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "z"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "false"
+            [email protected] ".."
+            [email protected]
+              [email protected]
+                [email protected] "1"
+              [email protected] " "
+              [email protected] "=="
+              [email protected] " "
+              [email protected]
+                [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "x"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] ".."
+        [email protected] ";"
+      [email protected] "\n    \n    "
+      [email protected]
+        [email protected]
+          [email protected] "..="
+          [email protected]
+            [email protected]
+              [email protected] "1"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "..="
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "z"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "x"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "false"
+            [email protected] "..="
+            [email protected]
+              [email protected]
+                [email protected] "1"
+              [email protected] " "
+              [email protected] "=="
+              [email protected] " "
+              [email protected]
+                [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "x"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "1"
+          [email protected] ".."
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
index 953930f6c..86c3b46c4 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
@@ -9,56 +9,55 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "\'c\'u32"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "\"string\"invalid"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "b\'b\'_suff"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "b\"bs\"invalid"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "\'c\'u32"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "\"string\"invalid"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "b\'b\'_suff"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "b\"bs\"invalid"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
index 68eb16bbd..8d76c4e0b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
@@ -85,7 +85,6 @@ [email protected]
       [email protected] ","
     [email protected] "\n"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
index 3977faa60..13b730ded 100644
--- a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
@@ -11,210 +11,205 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "\'empty_block"
-              [email protected] ":"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "\'block"
-              [email protected] ":"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "do_thing"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-                [email protected] ";"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "condition_not_met"
-                      [email protected]
-                        [email protected] "("
-                        [email protected] ")"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "{"
-                      [email protected] "\n            "
-                      [email protected]
-                        [email protected]
-                          [email protected] "break"
-                          [email protected] " "
-                          [email protected] "\'block"
-                        [email protected] ";"
-                      [email protected] "\n        "
-                      [email protected] "}"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "do_next_thing"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-                [email protected] ";"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "condition_not_met"
-                      [email protected]
-                        [email protected] "("
-                        [email protected] ")"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "{"
-                      [email protected] "\n            "
-                      [email protected]
-                        [email protected]
-                          [email protected] "break"
-                          [email protected] " "
-                          [email protected] "\'block"
-                        [email protected] ";"
-                      [email protected] "\n        "
-                      [email protected] "}"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "do_last_thing"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-                [email protected] ";"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "result"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "\'block"
-              [email protected] ":"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "foo"
-                      [email protected]
-                        [email protected] "("
-                        [email protected] ")"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "{"
-                      [email protected] "\n            "
-                      [email protected] "// comment"
-                      [email protected] "\n            "
-                      [email protected]
-                        [email protected]
-                          [email protected] "break"
-                          [email protected] " "
-                          [email protected] "\'block"
-                          [email protected] " "
-                          [email protected]
-                            [email protected] "1"
-                        [email protected] ";"
-                      [email protected] "\n        "
-                      [email protected] "}"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "bar"
-                      [email protected]
-                        [email protected] "("
-                        [email protected] ")"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "{"
-                      [email protected] "\n            "
-                      [email protected] "/* comment */"
-                      [email protected] "\n            "
-                      [email protected]
-                        [email protected]
-                          [email protected] "break"
-                          [email protected] " "
-                          [email protected] "\'block"
-                          [email protected] " "
-                          [email protected]
-                            [email protected] "2"
-                        [email protected] ";"
-                      [email protected] "\n        "
-                      [email protected] "}"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "3"
-              [email protected] "\n    "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "\'empty_block"
+            [email protected] ":"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "\'block"
+            [email protected] ":"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "do_thing"
+                [email protected]
+                  [email protected] "("
+                  [email protected] ")"
+              [email protected] ";"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "if"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "condition_not_met"
+                    [email protected]
+                      [email protected] "("
+                      [email protected] ")"
+                [email protected] " "
+                [email protected]
+                  [email protected] "{"
+                  [email protected] "\n            "
+                  [email protected]
+                    [email protected]
+                      [email protected] "break"
+                      [email protected] " "
+                      [email protected] "\'block"
+                    [email protected] ";"
+                  [email protected] "\n        "
+                  [email protected] "}"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "do_next_thing"
+                [email protected]
+                  [email protected] "("
+                  [email protected] ")"
+              [email protected] ";"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "if"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "condition_not_met"
+                    [email protected]
+                      [email protected] "("
+                      [email protected] ")"
+                [email protected] " "
+                [email protected]
+                  [email protected] "{"
+                  [email protected] "\n            "
+                  [email protected]
+                    [email protected]
+                      [email protected] "break"
+                      [email protected] " "
+                      [email protected] "\'block"
+                    [email protected] ";"
+                  [email protected] "\n        "
+                  [email protected] "}"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "do_last_thing"
+                [email protected]
+                  [email protected] "("
+                  [email protected] ")"
+              [email protected] ";"
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "result"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "\'block"
+            [email protected] ":"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "if"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "foo"
+                    [email protected]
+                      [email protected] "("
+                      [email protected] ")"
+                [email protected] " "
+                [email protected]
+                  [email protected] "{"
+                  [email protected] "\n            "
+                  [email protected] "// comment"
+                  [email protected] "\n            "
+                  [email protected]
+                    [email protected]
+                      [email protected] "break"
+                      [email protected] " "
+                      [email protected] "\'block"
+                      [email protected] " "
+                      [email protected]
+                        [email protected] "1"
+                    [email protected] ";"
+                  [email protected] "\n        "
+                  [email protected] "}"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "if"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "bar"
+                    [email protected]
+                      [email protected] "("
+                      [email protected] ")"
+                [email protected] " "
+                [email protected]
+                  [email protected] "{"
+                  [email protected] "\n            "
+                  [email protected] "/* comment */"
+                  [email protected] "\n            "
+                  [email protected]
+                    [email protected]
+                      [email protected] "break"
+                      [email protected] " "
+                      [email protected] "\'block"
+                      [email protected] " "
+                      [email protected]
+                        [email protected] "2"
+                    [email protected] ";"
+                  [email protected] "\n        "
+                  [email protected] "}"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "3"
+            [email protected] "\n    "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
index 3b9e8c71c..21874ae3a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
@@ -9,34 +9,33 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "make_query"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "crate"
-                    [email protected] "::"
-                    [email protected]
-                      [email protected]
-                        [email protected] "module_map"
-                  [email protected] "::"
-                  [email protected]
-                    [email protected]
-                      [email protected] "module_tree"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "make_query"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "crate"
+                  [email protected] "::"
+                  [email protected]
+                    [email protected]
+                      [email protected] "module_map"
+                [email protected] "::"
+                [email protected]
+                  [email protected]
+                    [email protected] "module_tree"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
index 9af689635..eb59d6e17 100644
--- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
@@ -139,33 +139,32 @@ [email protected]
               [email protected] "bool"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "_x"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "bool"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "return"
-            [email protected] " "
-            [email protected]
-              [email protected] "true"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "_x"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "bool"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "return"
+          [email protected] " "
+          [email protected]
+            [email protected] "true"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -177,48 +176,46 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "fn"
-          [email protected] " "
-          [email protected]
-            [email protected] "f"
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "_x"
-              [email protected] ":"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "f"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "return"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "fn"
+        [email protected] " "
+        [email protected]
+          [email protected] "f"
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "_x"
+            [email protected] ":"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "f"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "return"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -230,189 +227,185 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "fn"
-          [email protected] " "
-          [email protected]
-            [email protected] "the"
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "x"
-              [email protected] ":"
-              [email protected] " "
-              [email protected]
-                [email protected] "&"
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Cell"
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected]
-                                  [email protected] "bool"
-                        [email protected] ">"
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "return"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "while"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "!"
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected]
-                                  [email protected] "x"
-                          [email protected] "."
-                          [email protected]
-                            [email protected] "get"
-                          [email protected]
-                            [email protected] "("
-                            [email protected] ")"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "{"
-                        [email protected] " "
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected]
-                                  [email protected]
-                                    [email protected] "x"
-                            [email protected] "."
-                            [email protected]
-                              [email protected] "set"
-                            [email protected]
-                              [email protected] "("
-                              [email protected]
-                                [email protected] "true"
-                              [email protected] ")"
-                          [email protected] ";"
-                        [email protected] " "
-                        [email protected] "}"
-                [email protected] ";"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "i"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "&"
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Cell"
-                  [email protected] "::"
-                  [email protected]
-                    [email protected]
-                      [email protected] "new"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "false"
-                [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "dont"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected]
-                [email protected]
-                  [email protected] "|"
-                  [email protected] "|"
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "the"
-                  [email protected]
-                    [email protected] "("
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "i"
-                    [email protected] ")"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "dont"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "assert"
-            [email protected] "!"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "("
-                [email protected] "i"
-                [email protected] "."
-                [email protected] "get"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-                [email protected] ")"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "fn"
+        [email protected] " "
+        [email protected]
+          [email protected] "the"
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "x"
+            [email protected] ":"
+            [email protected] " "
+            [email protected]
+              [email protected] "&"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Cell"
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected]
+                              [email protected]
+                                [email protected] "bool"
+                      [email protected] ">"
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "return"
+              [email protected] " "
+              [email protected]
+                [email protected] "while"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected] "!"
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected]
+                              [email protected] "x"
+                      [email protected] "."
+                      [email protected]
+                        [email protected] "get"
+                      [email protected]
+                        [email protected] "("
+                        [email protected] ")"
+                [email protected] " "
+                [email protected]
+                  [email protected] "{"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected]
+                              [email protected] "x"
+                      [email protected] "."
+                      [email protected]
+                        [email protected] "set"
+                      [email protected]
+                        [email protected] "("
+                        [email protected]
+                          [email protected] "true"
+                        [email protected] ")"
+                    [email protected] ";"
+                  [email protected] " "
+                  [email protected] "}"
+            [email protected] ";"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "i"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "&"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Cell"
+                [email protected] "::"
+                [email protected]
+                  [email protected]
+                    [email protected] "new"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "false"
+              [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "dont"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected]
+            [email protected]
+              [email protected] "|"
+              [email protected] "|"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "the"
+              [email protected]
+                [email protected] "("
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "i"
+                [email protected] ")"
+          [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "dont"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "assert"
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "("
+              [email protected] "i"
+              [email protected] "."
+              [email protected] "get"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+              [email protected] ")"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -424,170 +417,160 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "loop"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "while"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "return"
-                      [email protected] ")"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "{"
-                      [email protected] "\n            "
-                      [email protected]
-                        [email protected] "if"
-                        [email protected] " "
-                        [email protected]
-                          [email protected]
-                            [email protected] "("
-                            [email protected]
-                              [email protected] "return"
-                            [email protected] ")"
-                        [email protected] " "
-                        [email protected]
-                          [email protected]
-                            [email protected] "{"
-                            [email protected] "\n                "
-                            [email protected]
-                              [email protected]
-                                [email protected] "match"
-                                [email protected] " "
-                                [email protected]
-                                  [email protected] "("
-                                  [email protected]
-                                    [email protected] "return"
-                                  [email protected] ")"
-                                [email protected] " "
-                                [email protected]
-                                  [email protected] "{"
-                                  [email protected] "\n                    "
-                                  [email protected]
-                                    [email protected]
-                                      [email protected]
-                                        [email protected] "1"
-                                    [email protected] " "
-                                    [email protected] "=>"
-                                    [email protected] " "
-                                    [email protected]
-                                      [email protected]
-                                        [email protected] "{"
-                                        [email protected] "\n                     ..."
-                                        [email protected]
-                                          [email protected] "if"
-                                          [email protected] " "
-                                          [email protected]
-                                            [email protected]
-                                              [email protected] "("
-                                              [email protected]
-                                                [email protected] "return"
-                                              [email protected] ")"
-                                          [email protected] " "
-                                          [email protected]
-                                            [email protected]
-                                              [email protected] "{"
-                                              [email protected] "\n                     ..."
-                                              [email protected]
-                                                [email protected] "return"
-                                              [email protected] "\n                     ..."
-                                              [email protected] "}"
-                                          [email protected] " "
-                                          [email protected] "else"
-                                          [email protected] " "
-                                          [email protected]
-                                            [email protected]
-                                              [email protected] "{"
-                                              [email protected] "\n                     ..."
-                                              [email protected]
-                                                [email protected] "return"
-                                              [email protected] "\n                     ..."
-                                              [email protected] "}"
-                                        [email protected] "\n                    "
-                                        [email protected] "}"
-                                  [email protected] "\n                    "
-                                  [email protected]
-                                    [email protected]
-                                      [email protected] "_"
-                                    [email protected] " "
-                                    [email protected] "=>"
-                                    [email protected] " "
-                                    [email protected]
-                                      [email protected]
-                                        [email protected] "{"
-                                        [email protected] " "
-                                        [email protected]
-                                          [email protected] "return"
-                                        [email protected] " "
-                                        [email protected] "}"
-                                  [email protected] "\n                "
-                                  [email protected] "}"
-                              [email protected] ";"
-                            [email protected] "\n            "
-                            [email protected] "}"
-                        [email protected] " "
-                        [email protected] "else"
-                        [email protected] " "
-                        [email protected]
-                          [email protected] "if"
-                          [email protected] " "
-                          [email protected]
-                            [email protected]
-                              [email protected] "("
-                              [email protected]
-                                [email protected] "return"
-                              [email protected] ")"
-                          [email protected] " "
-                          [email protected]
-                            [email protected]
-                              [email protected] "{"
-                              [email protected] "\n                "
-                              [email protected]
-                                [email protected]
-                                  [email protected] "return"
-                                [email protected] ";"
-                              [email protected] "\n            "
-                              [email protected] "}"
-                      [email protected] "\n        "
-                      [email protected] "}"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "if"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "("
-                    [email protected]
-                      [email protected] "return"
-                    [email protected] ")"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "break"
-                      [email protected] ";"
-                    [email protected] " "
-                    [email protected] "}"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "loop"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "while"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "("
+                  [email protected]
+                    [email protected] "return"
+                  [email protected] ")"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] "\n            "
+                [email protected]
+                  [email protected] "if"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected] "("
+                      [email protected]
+                        [email protected] "return"
+                      [email protected] ")"
+                  [email protected] " "
+                  [email protected]
+                    [email protected] "{"
+                    [email protected] "\n                "
+                    [email protected]
+                      [email protected]
+                        [email protected] "match"
+                        [email protected] " "
+                        [email protected]
+                          [email protected] "("
+                          [email protected]
+                            [email protected] "return"
+                          [email protected] ")"
+                        [email protected] " "
+                        [email protected]
+                          [email protected] "{"
+                          [email protected] "\n                    "
+                          [email protected]
+                            [email protected]
+                              [email protected]
+                                [email protected] "1"
+                            [email protected] " "
+                            [email protected] "=>"
+                            [email protected] " "
+                            [email protected]
+                              [email protected] "{"
+                              [email protected] "\n                     ..."
+                              [email protected]
+                                [email protected] "if"
+                                [email protected] " "
+                                [email protected]
+                                  [email protected]
+                                    [email protected] "("
+                                    [email protected]
+                                      [email protected] "return"
+                                    [email protected] ")"
+                                [email protected] " "
+                                [email protected]
+                                  [email protected] "{"
+                                  [email protected] "\n                     ..."
+                                  [email protected]
+                                    [email protected] "return"
+                                  [email protected] "\n                     ..."
+                                  [email protected] "}"
+                                [email protected] " "
+                                [email protected] "else"
+                                [email protected] " "
+                                [email protected]
+                                  [email protected] "{"
+                                  [email protected] "\n                     ..."
+                                  [email protected]
+                                    [email protected] "return"
+                                  [email protected] "\n                     ..."
+                                  [email protected] "}"
+                              [email protected] "\n                    "
+                              [email protected] "}"
+                          [email protected] "\n                    "
+                          [email protected]
+                            [email protected]
+                              [email protected] "_"
+                            [email protected] " "
+                            [email protected] "=>"
+                            [email protected] " "
+                            [email protected]
+                              [email protected] "{"
+                              [email protected] " "
+                              [email protected]
+                                [email protected] "return"
+                              [email protected] " "
+                              [email protected] "}"
+                          [email protected] "\n                "
+                          [email protected] "}"
+                      [email protected] ";"
+                    [email protected] "\n            "
+                    [email protected] "}"
+                  [email protected] " "
+                  [email protected] "else"
+                  [email protected] " "
+                  [email protected]
+                    [email protected] "if"
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected] "("
+                        [email protected]
+                          [email protected] "return"
+                        [email protected] ")"
+                    [email protected] " "
+                    [email protected]
+                      [email protected] "{"
+                      [email protected] "\n                "
+                      [email protected]
+                        [email protected]
+                          [email protected] "return"
+                        [email protected] ";"
+                      [email protected] "\n            "
+                      [email protected] "}"
+                [email protected] "\n        "
+                [email protected] "}"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "if"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "("
+                [email protected]
+                  [email protected] "return"
+                [email protected] ")"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "break"
+                [email protected] ";"
+              [email protected] " "
+              [email protected] "}"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -599,233 +582,232 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "_x"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "isize"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "_y"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "_x"
-                [email protected] " "
-                [email protected] "="
-                [email protected] " "
-                [email protected]
-                  [email protected] "0"
-              [email protected] ")"
-            [email protected] " "
-            [email protected] "=="
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "_x"
-                [email protected] " "
-                [email protected] "="
-                [email protected] " "
-                [email protected]
-                  [email protected] "0"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "_z"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "_x"
-                [email protected] " "
-                [email protected] "="
-                [email protected] " "
-                [email protected]
-                  [email protected] "0"
-              [email protected] ")"
-            [email protected] " "
-            [email protected] "<"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "_x"
-                [email protected] " "
-                [email protected] "="
-                [email protected] " "
-                [email protected]
-                  [email protected] "0"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "_a"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "_x"
-                [email protected] " "
-                [email protected] "+="
-                [email protected] " "
-                [email protected]
-                  [email protected] "0"
-              [email protected] ")"
-            [email protected] " "
-            [email protected] "=="
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "_x"
-                [email protected] " "
-                [email protected] "="
-                [email protected] " "
-                [email protected]
-                  [email protected] "0"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "_b"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "swap"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "&"
-                  [email protected] "mut"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "_y"
-                [email protected] ","
-                [email protected] " "
-                [email protected]
-                  [email protected] "&"
-                  [email protected] "mut"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "_z"
-                [email protected] ")"
-            [email protected] " "
-            [email protected] "=="
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "swap"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "&"
-                  [email protected] "mut"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "_y"
-                [email protected] ","
-                [email protected] " "
-                [email protected]
-                  [email protected] "&"
-                  [email protected] "mut"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "_z"
-                [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "_x"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "isize"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "_y"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "_x"
+              [email protected] " "
+              [email protected] "="
+              [email protected] " "
+              [email protected]
+                [email protected] "0"
+            [email protected] ")"
+          [email protected] " "
+          [email protected] "=="
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "_x"
+              [email protected] " "
+              [email protected] "="
+              [email protected] " "
+              [email protected]
+                [email protected] "0"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "_z"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "_x"
+              [email protected] " "
+              [email protected] "="
+              [email protected] " "
+              [email protected]
+                [email protected] "0"
+            [email protected] ")"
+          [email protected] " "
+          [email protected] "<"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "_x"
+              [email protected] " "
+              [email protected] "="
+              [email protected] " "
+              [email protected]
+                [email protected] "0"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "_a"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "_x"
+              [email protected] " "
+              [email protected] "+="
+              [email protected] " "
+              [email protected]
+                [email protected] "0"
+            [email protected] ")"
+          [email protected] " "
+          [email protected] "=="
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "_x"
+              [email protected] " "
+              [email protected] "="
+              [email protected] " "
+              [email protected]
+                [email protected] "0"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "_b"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "swap"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "&"
+                [email protected] "mut"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "_y"
+              [email protected] ","
+              [email protected] " "
+              [email protected]
+                [email protected] "&"
+                [email protected] "mut"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "_z"
+              [email protected] ")"
+          [email protected] " "
+          [email protected] "=="
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "swap"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "&"
+                [email protected] "mut"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "_y"
+              [email protected] ","
+              [email protected] " "
+              [email protected]
+                [email protected] "&"
+                [email protected] "mut"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "_z"
+              [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -846,167 +828,165 @@ [email protected]
               [email protected] "usize"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "fn"
-          [email protected] " "
-          [email protected]
-            [email protected] "p"
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "->"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "bool"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected] "true"
-              [email protected] " "
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "_a"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "assert"
-                [email protected] "!"
-                [email protected]
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "true"
-                    [email protected] ")"
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "=="
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "assert"
-                  [email protected] "!"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "p"
-                    [email protected]
-                      [email protected] "("
-                      [email protected] ")"
-                    [email protected] ")"
-                [email protected] ")"
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "_c"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "assert"
-                [email protected] "!"
-                [email protected]
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "p"
-                    [email protected]
-                      [email protected] "("
-                      [email protected] ")"
-                    [email protected] ")"
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "=="
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "_b"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "bool"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "println"
-                [email protected] "!"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "\"{}\""
-                  [email protected] ","
-                  [email protected] " "
-                  [email protected] "0"
-                  [email protected] ")"
-              [email protected] " "
-              [email protected] "=="
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "return"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "0"
-                [email protected] ")"
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "fn"
+        [email protected] " "
+        [email protected]
+          [email protected] "p"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "->"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "bool"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected] "true"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "_a"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "assert"
+              [email protected] "!"
+              [email protected]
+                [email protected] "("
+                [email protected]
+                  [email protected] "("
+                  [email protected] "true"
+                  [email protected] ")"
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "=="
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "assert"
+                [email protected] "!"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "p"
+                  [email protected]
+                    [email protected] "("
+                    [email protected] ")"
+                  [email protected] ")"
+              [email protected] ")"
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "_c"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "assert"
+              [email protected] "!"
+              [email protected]
+                [email protected] "("
+                [email protected]
+                  [email protected] "("
+                  [email protected] "p"
+                  [email protected]
+                    [email protected] "("
+                    [email protected] ")"
+                  [email protected] ")"
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "=="
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "_b"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "bool"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "println"
+              [email protected] "!"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"{}\""
+                [email protected] ","
+                [email protected] " "
+                [email protected] "0"
+                [email protected] ")"
+            [email protected] " "
+            [email protected] "=="
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "return"
+                [email protected] " "
+                [email protected]
+                  [email protected] "0"
+              [email protected] ")"
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -1018,144 +998,138 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "loop"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "break"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "{"
-                      [email protected] " "
-                      [email protected] "}"
-                [email protected] " "
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "i"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "0"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "loop"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "i"
-                  [email protected] " "
-                  [email protected] "+="
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "1"
-                [email protected] ";"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "if"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "i"
-                      [email protected] " "
-                      [email protected] "=="
-                      [email protected] " "
-                      [email protected]
-                        [email protected] "1"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "{"
-                      [email protected] " "
-                      [email protected]
-                        [email protected] "match"
-                        [email protected] " "
-                        [email protected]
-                          [email protected] "("
-                          [email protected]
-                            [email protected] "continue"
-                          [email protected] ")"
-                        [email protected] " "
-                        [email protected]
-                          [email protected] "{"
-                          [email protected] " "
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected] "1"
-                            [email protected] " "
-                            [email protected] "=>"
-                            [email protected] " "
-                            [email protected]
-                              [email protected]
-                                [email protected] "{"
-                                [email protected] " "
-                                [email protected] "}"
-                          [email protected] ","
-                          [email protected] " "
-                          [email protected]
-                            [email protected]
-                              [email protected] "_"
-                            [email protected] " "
-                            [email protected] "=>"
-                            [email protected] " "
-                            [email protected]
-                              [email protected]
-                                [email protected]
-                                  [email protected]
-                                    [email protected] "panic"
-                              [email protected] "!"
-                              [email protected]
-                                [email protected] "("
-                                [email protected] "\"wat\""
-                                [email protected] ")"
-                          [email protected] " "
-                          [email protected] "}"
-                      [email protected] " "
-                      [email protected] "}"
-              [email protected] "\n      "
-              [email protected]
-                [email protected]
-                  [email protected] "break"
-                [email protected] ";"
-              [email protected] " "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "loop"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected] "if"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "break"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] " "
+                [email protected] "}"
+            [email protected] " "
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "i"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "0"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "loop"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "i"
+              [email protected] " "
+              [email protected] "+="
+              [email protected] " "
+              [email protected]
+                [email protected] "1"
+            [email protected] ";"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "if"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "i"
+                  [email protected] " "
+                  [email protected] "=="
+                  [email protected] " "
+                  [email protected]
+                    [email protected] "1"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] " "
+                [email protected]
+                  [email protected] "match"
+                  [email protected] " "
+                  [email protected]
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "continue"
+                    [email protected] ")"
+                  [email protected] " "
+                  [email protected]
+                    [email protected] "{"
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "1"
+                      [email protected] " "
+                      [email protected] "=>"
+                      [email protected] " "
+                      [email protected]
+                        [email protected] "{"
+                        [email protected] " "
+                        [email protected] "}"
+                    [email protected] ","
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected] "_"
+                      [email protected] " "
+                      [email protected] "=>"
+                      [email protected] " "
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected]
+                              [email protected] "panic"
+                        [email protected] "!"
+                        [email protected]
+                          [email protected] "("
+                          [email protected] "\"wat\""
+                          [email protected] ")"
+                    [email protected] " "
+                    [email protected] "}"
+                [email protected] " "
+                [email protected] "}"
+          [email protected] "\n      "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+            [email protected] ";"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -1167,31 +1141,30 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "_evil"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "println"
-            [email protected] "!"
-            [email protected]
-              [email protected] "("
-              [email protected] "\"lincoln\""
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "_evil"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "println"
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected] "\"lincoln\""
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -1203,114 +1176,113 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "assert_eq"
-            [email protected] "!"
-            [email protected]
-              [email protected] "("
-              [email protected] "String"
-              [email protected] ":"
-              [email protected] ":"
-              [email protected] "from"
-              [email protected]
-                [email protected] "("
-                [email protected] "\".................... ..."
-                [email protected] ")"
-              [email protected] ","
-              [email protected] "\n               "
-              [email protected] "format"
-              [email protected] "!"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"{:?}\""
-                [email protected] ","
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] "\n                     ..."
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] " "
-                [email protected] "."
-                [email protected] "."
-                [email protected] ")"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "assert_eq"
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected] "String"
+            [email protected] ":"
+            [email protected] ":"
+            [email protected] "from"
+            [email protected]
+              [email protected] "("
+              [email protected] "\".................... ..."
+              [email protected] ")"
+            [email protected] ","
+            [email protected] "\n               "
+            [email protected] "format"
+            [email protected] "!"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"{:?}\""
+              [email protected] ","
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] "\n                     ..."
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] " "
+              [email protected] "."
+              [email protected] "."
+              [email protected] ")"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -1333,170 +1305,168 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "if"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "u8"
-              [email protected] " "
-              [email protected] "!="
-              [email protected] " "
-              [email protected]
-                [email protected] "0u8"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "assert_eq"
-                  [email protected] "!"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "8u8"
-                    [email protected] ","
-                    [email protected] " "
-                    [email protected]
-                      [email protected] "{"
-                      [email protected] "\n            "
-                      [email protected] "macro_rules"
-                      [email protected] "!"
-                      [email protected] " "
-                      [email protected] "u8"
-                      [email protected] " "
-                      [email protected]
-                        [email protected] "{"
-                        [email protected] "\n                "
-                        [email protected]
-                          [email protected] "("
-                          [email protected] "u8"
-                          [email protected] ")"
-                        [email protected] " "
-                        [email protected] "="
-                        [email protected] ">"
-                        [email protected] " "
-                        [email protected]
-                          [email protected] "{"
-                          [email protected] "\n                    "
-                          [email protected] "mod"
-                          [email protected] " "
-                          [email protected] "u8"
-                          [email protected] " "
-                          [email protected]
-                            [email protected] "{"
-                            [email protected] "\n                     ..."
-                            [email protected] "pub"
-                            [email protected] " "
-                            [email protected] "fn"
-                            [email protected] " "
-                            [email protected] "u8"
-                            [email protected] "<"
-                            [email protected] "\'u8"
-                            [email protected] ":"
-                            [email protected] " "
-                            [email protected] "\'u8"
-                            [email protected] " "
-                            [email protected] "+"
-                            [email protected] " "
-                            [email protected] "\'u8"
-                            [email protected] ">"
-                            [email protected]
-                              [email protected] "("
-                              [email protected] "u8"
-                              [email protected] ":"
-                              [email protected] " "
-                              [email protected] "&"
-                              [email protected] "\'u8"
-                              [email protected] " "
-                              [email protected] "u8"
-                              [email protected] ")"
-                            [email protected] " "
-                            [email protected] "-"
-                            [email protected] ">"
-                            [email protected] " "
-                            [email protected] "&"
-                            [email protected] "\'u8"
-                            [email protected] " "
-                            [email protected] "u8"
-                            [email protected] " "
-                            [email protected]
-                              [email protected] "{"
-                              [email protected] "\n                     ..."
-                              [email protected] "\"u8\""
-                              [email protected] ";"
-                              [email protected] "\n                     ..."
-                              [email protected] "u8"
-                              [email protected] "\n                     ..."
-                              [email protected] "}"
-                            [email protected] "\n                    "
-                            [email protected] "}"
-                          [email protected] "\n                "
-                          [email protected] "}"
-                        [email protected] ";"
-                        [email protected] "\n            "
-                        [email protected] "}"
-                      [email protected] "\n\n            "
-                      [email protected] "u8"
-                      [email protected] "!"
-                      [email protected]
-                        [email protected] "("
-                        [email protected] "u8"
-                        [email protected] ")"
-                      [email protected] ";"
-                      [email protected] "\n            "
-                      [email protected] "let"
-                      [email protected] " "
-                      [email protected] "&"
-                      [email protected] "u8"
-                      [email protected] ":"
-                      [email protected] " "
-                      [email protected] "&"
-                      [email protected] "u8"
-                      [email protected] " "
-                      [email protected] "="
-                      [email protected] " "
-                      [email protected] "u8"
-                      [email protected] ":"
-                      [email protected] ":"
-                      [email protected] "u8"
-                      [email protected]
-                        [email protected] "("
-                        [email protected] "&"
-                        [email protected] "8u8"
-                        [email protected] ")"
-                      [email protected] ";"
-                      [email protected] "\n            "
-                      [email protected] "crate"
-                      [email protected] ":"
-                      [email protected] ":"
-                      [email protected] "u8"
-                      [email protected]
-                        [email protected] "("
-                        [email protected] "0u8"
-                        [email protected] ")"
-                      [email protected] ";"
-                      [email protected] "\n            "
-                      [email protected] "u8"
-                      [email protected] "\n        "
-                      [email protected] "}"
-                    [email protected] ")"
-                [email protected] ";"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "if"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "u8"
+            [email protected] " "
+            [email protected] "!="
+            [email protected] " "
+            [email protected]
+              [email protected] "0u8"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "assert_eq"
+              [email protected] "!"
+              [email protected]
+                [email protected] "("
+                [email protected] "8u8"
+                [email protected] ","
+                [email protected] " "
+                [email protected]
+                  [email protected] "{"
+                  [email protected] "\n            "
+                  [email protected] "macro_rules"
+                  [email protected] "!"
+                  [email protected] " "
+                  [email protected] "u8"
+                  [email protected] " "
+                  [email protected]
+                    [email protected] "{"
+                    [email protected] "\n                "
+                    [email protected]
+                      [email protected] "("
+                      [email protected] "u8"
+                      [email protected] ")"
+                    [email protected] " "
+                    [email protected] "="
+                    [email protected] ">"
+                    [email protected] " "
+                    [email protected]
+                      [email protected] "{"
+                      [email protected] "\n                    "
+                      [email protected] "mod"
+                      [email protected] " "
+                      [email protected] "u8"
+                      [email protected] " "
+                      [email protected]
+                        [email protected] "{"
+                        [email protected] "\n                     ..."
+                        [email protected] "pub"
+                        [email protected] " "
+                        [email protected] "fn"
+                        [email protected] " "
+                        [email protected] "u8"
+                        [email protected] "<"
+                        [email protected] "\'u8"
+                        [email protected] ":"
+                        [email protected] " "
+                        [email protected] "\'u8"
+                        [email protected] " "
+                        [email protected] "+"
+                        [email protected] " "
+                        [email protected] "\'u8"
+                        [email protected] ">"
+                        [email protected]
+                          [email protected] "("
+                          [email protected] "u8"
+                          [email protected] ":"
+                          [email protected] " "
+                          [email protected] "&"
+                          [email protected] "\'u8"
+                          [email protected] " "
+                          [email protected] "u8"
+                          [email protected] ")"
+                        [email protected] " "
+                        [email protected] "-"
+                        [email protected] ">"
+                        [email protected] " "
+                        [email protected] "&"
+                        [email protected] "\'u8"
+                        [email protected] " "
+                        [email protected] "u8"
+                        [email protected] " "
+                        [email protected]
+                          [email protected] "{"
+                          [email protected] "\n                     ..."
+                          [email protected] "\"u8\""
+                          [email protected] ";"
+                          [email protected] "\n                     ..."
+                          [email protected] "u8"
+                          [email protected] "\n                     ..."
+                          [email protected] "}"
+                        [email protected] "\n                    "
+                        [email protected] "}"
+                      [email protected] "\n                "
+                      [email protected] "}"
+                    [email protected] ";"
+                    [email protected] "\n            "
+                    [email protected] "}"
+                  [email protected] "\n\n            "
+                  [email protected] "u8"
+                  [email protected] "!"
+                  [email protected]
+                    [email protected] "("
+                    [email protected] "u8"
+                    [email protected] ")"
+                  [email protected] ";"
+                  [email protected] "\n            "
+                  [email protected] "let"
+                  [email protected] " "
+                  [email protected] "&"
+                  [email protected] "u8"
+                  [email protected] ":"
+                  [email protected] " "
+                  [email protected] "&"
+                  [email protected] "u8"
+                  [email protected] " "
+                  [email protected] "="
+                  [email protected] " "
+                  [email protected] "u8"
+                  [email protected] ":"
+                  [email protected] ":"
+                  [email protected] "u8"
+                  [email protected]
+                    [email protected] "("
+                    [email protected] "&"
+                    [email protected] "8u8"
+                    [email protected] ")"
+                  [email protected] ";"
+                  [email protected] "\n            "
+                  [email protected] "crate"
+                  [email protected] ":"
+                  [email protected] ":"
+                  [email protected] "u8"
+                  [email protected]
+                    [email protected] "("
+                    [email protected] "0u8"
+                    [email protected] ")"
+                  [email protected] ";"
+                  [email protected] "\n            "
+                  [email protected] "u8"
+                  [email protected] "\n        "
+                  [email protected] "}"
+                [email protected] ")"
+            [email protected] ";"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -1508,76 +1478,75 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "assert_eq"
-            [email protected] "!"
-            [email protected]
-              [email protected] "("
-              [email protected] "String"
-              [email protected] ":"
-              [email protected] ":"
-              [email protected] "from"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"><>\""
-                [email protected] ")"
-              [email protected] ","
-              [email protected] "\n               "
-              [email protected] "String"
-              [email protected] ":"
-              [email protected] ":"
-              [email protected] "<"
-              [email protected] ">"
-              [email protected] ":"
-              [email protected] ":"
-              [email protected] "from"
-              [email protected] ":"
-              [email protected] ":"
-              [email protected] "<"
-              [email protected] ">"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"><>\""
-                [email protected] ")"
-              [email protected] "."
-              [email protected] "chars"
-              [email protected] ":"
-              [email protected] ":"
-              [email protected] "<"
-              [email protected] ">"
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-              [email protected] "."
-              [email protected] "rev"
-              [email protected] ":"
-              [email protected] ":"
-              [email protected] "<"
-              [email protected] ">"
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-              [email protected] "."
-              [email protected] "collect"
-              [email protected] ":"
-              [email protected] ":"
-              [email protected] "<"
-              [email protected] "String"
-              [email protected] ">"
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "assert_eq"
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected] "String"
+            [email protected] ":"
+            [email protected] ":"
+            [email protected] "from"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"><>\""
+              [email protected] ")"
+            [email protected] ","
+            [email protected] "\n               "
+            [email protected] "String"
+            [email protected] ":"
+            [email protected] ":"
+            [email protected] "<"
+            [email protected] ">"
+            [email protected] ":"
+            [email protected] ":"
+            [email protected] "from"
+            [email protected] ":"
+            [email protected] ":"
+            [email protected] "<"
+            [email protected] ">"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"><>\""
+              [email protected] ")"
+            [email protected] "."
+            [email protected] "chars"
+            [email protected] ":"
+            [email protected] ":"
+            [email protected] "<"
+            [email protected] ">"
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+            [email protected] "."
+            [email protected] "rev"
+            [email protected] ":"
+            [email protected] ":"
+            [email protected] "<"
+            [email protected] ">"
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+            [email protected] "."
+            [email protected] "collect"
+            [email protected] ":"
+            [email protected] ":"
+            [email protected] "<"
+            [email protected] "String"
+            [email protected] ">"
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -1589,47 +1558,46 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "union"
-          [email protected] " "
-          [email protected]
-            [email protected] "union"
-          [email protected]
-            [email protected] "<"
-            [email protected]
-              [email protected] "\'union"
-            [email protected] ">"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "union"
-              [email protected] ":"
-              [email protected] " "
-              [email protected]
-                [email protected] "&"
-                [email protected] "\'union"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "union"
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected] "\'union"
-                        [email protected] ">"
-            [email protected] ","
-            [email protected] " "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "union"
+        [email protected] " "
+        [email protected]
+          [email protected] "union"
+        [email protected]
+          [email protected] "<"
+          [email protected]
+            [email protected] "\'union"
+          [email protected] ">"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "union"
+            [email protected] ":"
+            [email protected] " "
+            [email protected]
+              [email protected] "&"
+              [email protected] "\'union"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "union"
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected] "\'union"
+                      [email protected] ">"
+          [email protected] ","
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -1641,121 +1609,118 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "val"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "!"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "("
-                    [email protected]
-                      [email protected]
-                        [email protected] "|"
-                        [email protected]
-                          [email protected]
-                            [email protected] "("
-                            [email protected]
-                              [email protected] ".."
-                            [email protected] ")"
-                          [email protected] ":"
-                          [email protected]
-                            [email protected] "("
-                            [email protected]
-                              [email protected] "_"
-                            [email protected] ","
-                            [email protected]
-                              [email protected] "_"
-                            [email protected] ")"
-                        [email protected] ","
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "__"
-                            [email protected] "@"
-                            [email protected]
-                              [email protected] "_"
-                        [email protected] "|"
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "__"
-                    [email protected] ")"
-                  [email protected]
-                    [email protected] "("
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "&"
-                        [email protected]
-                          [email protected] "*"
-                          [email protected]
-                            [email protected] "\"\\\\\""
-                      [email protected] ","
-                      [email protected]
-                        [email protected] "\'🤔\'"
-                      [email protected] ")"
-                    [email protected] "/**/"
-                    [email protected] ","
-                    [email protected]
-                      [email protected]
-                        [email protected] "{"
-                        [email protected] "}"
-                    [email protected] ")"
-                [email protected] "=="
-                [email protected]
-                  [email protected]
-                    [email protected] "{"
-                    [email protected]
-                      [email protected]
-                        [email protected] "&"
-                        [email protected]
-                          [email protected]
-                            [email protected] "["
-                            [email protected]
-                              [email protected] "..="
-                              [email protected]
-                                [email protected] ".."
-                            [email protected] "]"
-                          [email protected] "["
-                          [email protected]
-                            [email protected] ".."
-                          [email protected] "]"
-                      [email protected] ";"
-                    [email protected] "}"
-              [email protected] ")"
-          [email protected] "//"
-          [email protected] "\n    "
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "assert"
-            [email protected] "!"
-            [email protected]
-              [email protected] "("
-              [email protected] "!"
-              [email protected] "val"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "val"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "("
+                  [email protected]
+                    [email protected]
+                      [email protected] "|"
+                      [email protected]
+                        [email protected]
+                          [email protected] "("
+                          [email protected]
+                            [email protected] ".."
+                          [email protected] ")"
+                        [email protected] ":"
+                        [email protected]
+                          [email protected] "("
+                          [email protected]
+                            [email protected] "_"
+                          [email protected] ","
+                          [email protected]
+                            [email protected] "_"
+                          [email protected] ")"
+                      [email protected] ","
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "__"
+                          [email protected] "@"
+                          [email protected]
+                            [email protected] "_"
+                      [email protected] "|"
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "__"
+                  [email protected] ")"
+                [email protected]
+                  [email protected] "("
+                  [email protected]
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "&"
+                      [email protected]
+                        [email protected] "*"
+                        [email protected]
+                          [email protected] "\"\\\\\""
+                    [email protected] ","
+                    [email protected]
+                      [email protected] "\'🤔\'"
+                    [email protected] ")"
+                  [email protected] "/**/"
+                  [email protected] ","
+                  [email protected]
+                    [email protected] "{"
+                    [email protected] "}"
+                  [email protected] ")"
+              [email protected] "=="
+              [email protected]
+                [email protected] "{"
+                [email protected]
+                  [email protected]
+                    [email protected] "&"
+                    [email protected]
+                      [email protected]
+                        [email protected] "["
+                        [email protected]
+                          [email protected] "..="
+                          [email protected]
+                            [email protected] ".."
+                        [email protected] "]"
+                      [email protected] "["
+                      [email protected]
+                        [email protected] ".."
+                      [email protected] "]"
+                  [email protected] ";"
+                [email protected] "}"
+            [email protected] ")"
+        [email protected] "//"
+        [email protected] "\n    "
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "assert"
+          [email protected] "!"
+          [email protected]
+            [email protected] "("
+            [email protected] "!"
+            [email protected] "val"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -1791,306 +1756,305 @@ [email protected]
                     [email protected] "Debug"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "..="
-          [email protected]
-            [email protected] "..="
-            [email protected]
-              [email protected] ".."
-              [email protected] " "
-              [email protected]
-                [email protected] ".."
-                [email protected] "    "
-                [email protected]
-                  [email protected] ".."
-                  [email protected] " "
-                  [email protected]
-                    [email protected] ".."
-                    [email protected] " "
-                    [email protected]
-                      [email protected] ".."
-                      [email protected] " "
-                      [email protected]
-                        [email protected] ".."
-                        [email protected] "    "
-                        [email protected]
-                          [email protected] ".."
-                          [email protected] " "
-                          [email protected]
-                            [email protected] ".."
-                            [email protected] " "
-                            [email protected]
-                              [email protected] ".."
-                              [email protected] " "
-                              [email protected]
-                                [email protected] ".."
-                                [email protected] "    "
-                                [email protected]
-                                  [email protected] ".."
-                                  [email protected] " "
-                                  [email protected]
-                                    [email protected] "..="
-                                    [email protected]
-                                      [email protected] ".."
-                                      [email protected] " "
-                                      [email protected]
-                                        [email protected] ".."
-                                        [email protected] "\n    "
-                                        [email protected]
-                                          [email protected] "..="
-                                          [email protected]
-                                            [email protected] ".."
-                                            [email protected] " "
-                                            [email protected]
-                                              [email protected] "..="
-                                              [email protected]
-                                                [email protected] ".."
-                                                [email protected] "    "
-                                                [email protected]
-                                                  [email protected] ".."
-                                                  [email protected] " "
-                                                  [email protected]
-                                                    [email protected] ".."
-                                                    [email protected] " "
-                                                    [email protected]
-                                                      [email protected] ".."
-                                                      [email protected] " "
-                                                      [email protected]
-                                                        [email protected] ".."
-                                                        [email protected] "    "
-                                                        [email protected]
-                                                          [email protected] ".."
-                                                          [email protected] " "
-                                                          [email protected]
-                                                            [email protected] ".."
-                                                            [email protected] " "
-                                                            [email protected]
-                                                              [email protected] ".."
-                                                              [email protected] " "
-                                                              [email protected]
-                                                                [email protected] ".."
-                                                                [email protected] "    "
-                                                                [email protected]
-                                                                  [email protected] "..="
-                                                                  [email protected]
-                                                                    [email protected] "..="
-                                                                    [email protected]
-                                                                      [email protected] "..="
-                                                                      [email protected]
-                                                                        [email protected] ".."
-                                                                        [email protected] "\n    "
-                                                                        [email protected]
-                                                                          [email protected] "..="
-                                                                          [email protected]
-                                                                            [email protected] ".."
-                                                                            [email protected] " "
-                                                                            [email protected]
-                                                                              [email protected] "..="
-                                                                              [email protected]
-                                                                                [email protected] ".."
-                                                                                [email protected] "    "
-                                                                                [email protected]
-                                                                                  [email protected] "..="
-                                                                                  [email protected]
-                                                                                    [email protected] ".."
-                                                                                    [email protected] " "
-                                                                                    [email protected]
-                                                                                      [email protected] "..="
-                                                                                      [email protected]
-                                                                                        [email protected] ".."
-                                                                                        [email protected] "    "
-                                                                                        [email protected]
-                                                                                          [email protected] ".."
-                                                                                          [email protected] " "
-                                                                                          [email protected]
-                                                                                            [email protected] "..="
-                                                                                            [email protected]
-                                                                                              [email protected] "..="
-                                                                                              [email protected]
-                                                                                                [email protected] ".."
-                                                                                                [email protected] "    "
-                                                                                                [email protected]
-                                                                                                  [email protected] ".."
-                                                                                                  [email protected] " "
-                                                                                                  [email protected]
-                                                                                                    [email protected] "..="
-                                                                                                    [email protected]
-                                                                                                      [email protected] ".."
-                                                                                                      [email protected] " "
-                                                                                                      [email protected]
-                                                                                                        [email protected] ".."
-                                                                                                        [email protected] "\n    "
-                                                                                                        [email protected]
-                                                                                                          [email protected] "..="
-                                                                                                          [email protected]
-                                                                                                            [email protected] "..="
-                                                                                                            [email protected]
-                                                                                                              [email protected] ".."
-                                                                                                              [email protected] " "
-                                                                                                              [email protected]
-                                                                                                                [email protected] ".."
-                                                                                                                [email protected] "    "
-                                                                                                                [email protected]
-                                                                                                                  [email protected] "..="
-                                                                                                                  [email protected]
-                                                                                                                    [email protected] ".."
-                                                                                                                    [email protected] " "
-                                                                                                                    [email protected]
-                                                                                                                      [email protected] "..="
-                                                                                                                      [email protected]
-                                                                                                                        [email protected] ".."
-                                                                                                                        [email protected] "    "
-                                                                                                                        [email protected]
-                                                                                                                          [email protected] "..="
-                                                                                                                          [email protected]
-                                                                                                                            [email protected] ".."
-                                                                                                                            [email protected] " "
-                                                                                                                            [email protected]
-                                                                                                                              [email protected] ".."
-                                                                                                                              [email protected] " "
-                                                                                                                              [email protected]
-                                                                                                                                [email protected] ".."
-                                                                                                                                [email protected] "    "
-                                                                                                                                [email protected]
-                                                                                                                                  [email protected] ".."
-                                                                                                                                  [email protected] " "
-                                                                                                                                  [email protected]
-                                                                                                                                    [email protected] "..="
-                                                                                                                                    [email protected]
-                                                                                                                                      [email protected] ".."
-                                                                                                                                      [email protected] " "
-                                                                                                                                      [email protected]
-                                                                                                                                        [email protected] ".."
-                                                                                                                                        [email protected] "\n    "
-                                                                                                                                        [email protected]
-                                                                                                                                          [email protected] "..="
-                                                                                                                                          [email protected]
-                                                                                                                                            [email protected] ".."
-                                                                                                                                            [email protected] " "
-                                                                                                                                            [email protected]
-                                                                                                                                              [email protected] "..="
-                                                                                                                                              [email protected]
-                                                                                                                                                [email protected] ".."
-                                                                                                                                                [email protected] "    "
-                                                                                                                                                [email protected]
-                                                                                                                                                  [email protected] "..="
-                                                                                                                                                  [email protected]
-                                                                                                                                                    [email protected] ".."
-                                                                                                                                                    [email protected] " "
-                                                                                                                                                    [email protected]
-                                                                                                                                                      [email protected] "..="
-                                                                                                                                                      [email protected]
-                                                                                                                                                        [email protected] ".."
-                                                                                                                                                        [email protected] "    "
-                                                                                                                                                        [email protected]
-                                                                                                                                                          [email protected] ".."
-                                                                                                                                                          [email protected] " "
-                                                                                                                                                          [email protected]
-                                                                                                                                                            [email protected] "..="
-                                                                                                                                                            [email protected]
-                                                                                                                                                              [email protected] ".."
-                                                                                                                                                              [email protected] " "
-                                                                                                                                                              [email protected]
-                                                                                                                                                                [email protected] ".."
-                                                                                                                                                                [email protected] "    "
-                                                                                                                                                                [email protected]
-                                                                                                                                                                  [email protected] ".."
-                                                                                                                                                                  [email protected] " "
-                                                                                                                                                                  [email protected]
-                                                                                                                                                                    [email protected] "..="
-                                                                                                                                                                    [email protected]
-                                                                                                                                                                      [email protected] ".."
-                                                                                                                                                                      [email protected] " "
-                                                                                                                                                                      [email protected]
-                                                                                                                                                                        [email protected] ".."
-                                                                                                                                                                        [email protected] "\n    "
-                                                                                                                                                                        [email protected]
-                                                                                                                                                                          [email protected] "..="
-                                                                                                                                                                          [email protected]
-                                                                                                                                                                            [email protected] ".."
-                                                                                                                                                                            [email protected] " "
-                                                                                                                                                                            [email protected]
-                                                                                                                                                                              [email protected] "..="
-                                                                                                                                                                              [email protected]
-                                                                                                                                                                                [email protected] ".."
-                                                                                                                                                                                [email protected] "    "
-                                                                                                                                                                                [email protected]
-                                                                                                                                                                                  [email protected] "..="
-                                                                                                                                                                                  [email protected]
-                                                                                                                                                                                    [email protected] ".."
-                                                                                                                                                                                    [email protected] " "
-                                                                                                                                                                                    [email protected]
-                                                                                                                                                                                      [email protected] "..="
-                                                                                                                                                                                      [email protected]
-                                                                                                                                                                                        [email protected] ".."
-                                                                                                                                                                                        [email protected] "    "
-                                                                                                                                                                                        [email protected]
-                                                                                                                                                                                          [email protected] ".."
-                                                                                                                                                                                          [email protected] " "
-                                                                                                                                                                                          [email protected]
-                                                                                                                                                                                            [email protected] ".."
-                                                                                                                                                                                            [email protected] " "
-                                                                                                                                                                                            [email protected]
-                                                                                                                                                                                              [email protected] "..="
-                                                                                                                                                                                              [email protected]
-                                                                                                                                                                                                [email protected] ".."
-                                                                                                                                                                                                [email protected] "    "
-                                                                                                                                                                                                [email protected]
-                                                                                                                                                                                                  [email protected] ".."
-                                                                                                                                                                                                  [email protected] " "
-                                                                                                                                                                                                  [email protected]
-                                                                                                                                                                                                    [email protected] "..="
-                                                                                                                                                                                                    [email protected]
-                                                                                                                                                                                                      [email protected] ".."
-                                                                                                                                                                                                      [email protected] " "
-                                                                                                                                                                                                      [email protected]
-                                                                                                                                                                                                        [email protected] ".."
-                                                                                                                                                                                                        [email protected] "\n    "
-                                                                                                                                                                                                        [email protected]
-                                                                                                                                                                                                          [email protected] "..="
-                                                                                                                                                                                                          [email protected]
-                                                                                                                                                                                                            [email protected] ".."
-                                                                                                                                                                                                            [email protected] " "
-                                                                                                                                                                                                            [email protected]
-                                                                                                                                                                                                              [email protected] "..="
-                                                                                                                                                                                                              [email protected]
-                                                                                                                                                                                                                [email protected] ".."
-                                                                                                                                                                                                                [email protected] "    "
-                                                                                                                                                                                                                [email protected]
-                                                                                                                                                                                                                  [email protected] ".."
-                                                                                                                                                                                                                  [email protected] " "
-                                                                                                                                                                                                                  [email protected]
-                                                                                                                                                                                                                    [email protected] "..="
-                                                                                                                                                                                                                    [email protected]
-                                                                                                                                                                                                                      [email protected] "..="
-                                                                                                                                                                                                                      [email protected]
-                                                                                                                                                                                                                        [email protected] ".."
-                                                                                                                                                                                                                        [email protected] "    "
-                                                                                                                                                                                                                        [email protected]
-                                                                                                                                                                                                                          [email protected] "..="
-                                                                                                                                                                                                                          [email protected]
-                                                                                                                                                                                                                            [email protected] "..="
-                                                                                                                                                                                                                            [email protected]
-                                                                                                                                                                                                                              [email protected] ".."
-                                                                                                                                                                                                                              [email protected] " "
-                                                                                                                                                                                                                              [email protected]
-                                                                                                                                                                                                                                [email protected] ".."
-                                                                                                                                                                                                                                [email protected] "    "
-                                                                                                                                                                                                                                [email protected]
-                                                                                                                                                                                                                                  [email protected] ".."
-                                                                                                                                                                                                                                  [email protected] " "
-                                                                                                                                                                                                                                  [email protected]
-                                                                                                                                                                                                                                    [email protected] "..="
-                                                                                                                                                                                                                                    [email protected]
-                                                                                                                                                                                                                                      [email protected] ".."
-                                                                                                                                                                                                                                      [email protected] " "
-                                                                                                                                                                                                                                      [email protected]
-                                                                                                                                                                                                                                        [email protected] ".."
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "..="
+        [email protected]
+          [email protected] "..="
+          [email protected]
+            [email protected] ".."
+            [email protected] " "
+            [email protected]
+              [email protected] ".."
+              [email protected] "    "
+              [email protected]
+                [email protected] ".."
+                [email protected] " "
+                [email protected]
+                  [email protected] ".."
+                  [email protected] " "
+                  [email protected]
+                    [email protected] ".."
+                    [email protected] " "
+                    [email protected]
+                      [email protected] ".."
+                      [email protected] "    "
+                      [email protected]
+                        [email protected] ".."
+                        [email protected] " "
+                        [email protected]
+                          [email protected] ".."
+                          [email protected] " "
+                          [email protected]
+                            [email protected] ".."
+                            [email protected] " "
+                            [email protected]
+                              [email protected] ".."
+                              [email protected] "    "
+                              [email protected]
+                                [email protected] ".."
+                                [email protected] " "
+                                [email protected]
+                                  [email protected] "..="
+                                  [email protected]
+                                    [email protected] ".."
+                                    [email protected] " "
+                                    [email protected]
+                                      [email protected] ".."
+                                      [email protected] "\n    "
+                                      [email protected]
+                                        [email protected] "..="
+                                        [email protected]
+                                          [email protected] ".."
+                                          [email protected] " "
+                                          [email protected]
+                                            [email protected] "..="
+                                            [email protected]
+                                              [email protected] ".."
+                                              [email protected] "    "
+                                              [email protected]
+                                                [email protected] ".."
+                                                [email protected] " "
+                                                [email protected]
+                                                  [email protected] ".."
+                                                  [email protected] " "
+                                                  [email protected]
+                                                    [email protected] ".."
+                                                    [email protected] " "
+                                                    [email protected]
+                                                      [email protected] ".."
+                                                      [email protected] "    "
+                                                      [email protected]
+                                                        [email protected] ".."
+                                                        [email protected] " "
+                                                        [email protected]
+                                                          [email protected] ".."
+                                                          [email protected] " "
+                                                          [email protected]
+                                                            [email protected] ".."
+                                                            [email protected] " "
+                                                            [email protected]
+                                                              [email protected] ".."
+                                                              [email protected] "    "
+                                                              [email protected]
+                                                                [email protected] "..="
+                                                                [email protected]
+                                                                  [email protected] "..="
+                                                                  [email protected]
+                                                                    [email protected] "..="
+                                                                    [email protected]
+                                                                      [email protected] ".."
+                                                                      [email protected] "\n    "
+                                                                      [email protected]
+                                                                        [email protected] "..="
+                                                                        [email protected]
+                                                                          [email protected] ".."
+                                                                          [email protected] " "
+                                                                          [email protected]
+                                                                            [email protected] "..="
+                                                                            [email protected]
+                                                                              [email protected] ".."
+                                                                              [email protected] "    "
+                                                                              [email protected]
+                                                                                [email protected] "..="
+                                                                                [email protected]
+                                                                                  [email protected] ".."
+                                                                                  [email protected] " "
+                                                                                  [email protected]
+                                                                                    [email protected] "..="
+                                                                                    [email protected]
+                                                                                      [email protected] ".."
+                                                                                      [email protected] "    "
+                                                                                      [email protected]
+                                                                                        [email protected] ".."
+                                                                                        [email protected] " "
+                                                                                        [email protected]
+                                                                                          [email protected] "..="
+                                                                                          [email protected]
+                                                                                            [email protected] "..="
+                                                                                            [email protected]
+                                                                                              [email protected] ".."
+                                                                                              [email protected] "    "
+                                                                                              [email protected]
+                                                                                                [email protected] ".."
+                                                                                                [email protected] " "
+                                                                                                [email protected]
+                                                                                                  [email protected] "..="
+                                                                                                  [email protected]
+                                                                                                    [email protected] ".."
+                                                                                                    [email protected] " "
+                                                                                                    [email protected]
+                                                                                                      [email protected] ".."
+                                                                                                      [email protected] "\n    "
+                                                                                                      [email protected]
+                                                                                                        [email protected] "..="
+                                                                                                        [email protected]
+                                                                                                          [email protected] "..="
+                                                                                                          [email protected]
+                                                                                                            [email protected] ".."
+                                                                                                            [email protected] " "
+                                                                                                            [email protected]
+                                                                                                              [email protected] ".."
+                                                                                                              [email protected] "    "
+                                                                                                              [email protected]
+                                                                                                                [email protected] "..="
+                                                                                                                [email protected]
+                                                                                                                  [email protected] ".."
+                                                                                                                  [email protected] " "
+                                                                                                                  [email protected]
+                                                                                                                    [email protected] "..="
+                                                                                                                    [email protected]
+                                                                                                                      [email protected] ".."
+                                                                                                                      [email protected] "    "
+                                                                                                                      [email protected]
+                                                                                                                        [email protected] "..="
+                                                                                                                        [email protected]
+                                                                                                                          [email protected] ".."
+                                                                                                                          [email protected] " "
+                                                                                                                          [email protected]
+                                                                                                                            [email protected] ".."
+                                                                                                                            [email protected] " "
+                                                                                                                            [email protected]
+                                                                                                                              [email protected] ".."
+                                                                                                                              [email protected] "    "
+                                                                                                                              [email protected]
+                                                                                                                                [email protected] ".."
+                                                                                                                                [email protected] " "
+                                                                                                                                [email protected]
+                                                                                                                                  [email protected] "..="
+                                                                                                                                  [email protected]
+                                                                                                                                    [email protected] ".."
+                                                                                                                                    [email protected] " "
+                                                                                                                                    [email protected]
+                                                                                                                                      [email protected] ".."
+                                                                                                                                      [email protected] "\n    "
+                                                                                                                                      [email protected]
+                                                                                                                                        [email protected] "..="
+                                                                                                                                        [email protected]
+                                                                                                                                          [email protected] ".."
+                                                                                                                                          [email protected] " "
+                                                                                                                                          [email protected]
+                                                                                                                                            [email protected] "..="
+                                                                                                                                            [email protected]
+                                                                                                                                              [email protected] ".."
+                                                                                                                                              [email protected] "    "
+                                                                                                                                              [email protected]
+                                                                                                                                                [email protected] "..="
+                                                                                                                                                [email protected]
+                                                                                                                                                  [email protected] ".."
+                                                                                                                                                  [email protected] " "
+                                                                                                                                                  [email protected]
+                                                                                                                                                    [email protected] "..="
+                                                                                                                                                    [email protected]
+                                                                                                                                                      [email protected] ".."
+                                                                                                                                                      [email protected] "    "
+                                                                                                                                                      [email protected]
+                                                                                                                                                        [email protected] ".."
+                                                                                                                                                        [email protected] " "
+                                                                                                                                                        [email protected]
+                                                                                                                                                          [email protected] "..="
+                                                                                                                                                          [email protected]
+                                                                                                                                                            [email protected] ".."
+                                                                                                                                                            [email protected] " "
+                                                                                                                                                            [email protected]
+                                                                                                                                                              [email protected] ".."
+                                                                                                                                                              [email protected] "    "
+                                                                                                                                                              [email protected]
+                                                                                                                                                                [email protected] ".."
+                                                                                                                                                                [email protected] " "
+                                                                                                                                                                [email protected]
+                                                                                                                                                                  [email protected] "..="
+                                                                                                                                                                  [email protected]
+                                                                                                                                                                    [email protected] ".."
+                                                                                                                                                                    [email protected] " "
+                                                                                                                                                                    [email protected]
+                                                                                                                                                                      [email protected] ".."
+                                                                                                                                                                      [email protected] "\n    "
+                                                                                                                                                                      [email protected]
+                                                                                                                                                                        [email protected] "..="
+                                                                                                                                                                        [email protected]
+                                                                                                                                                                          [email protected] ".."
+                                                                                                                                                                          [email protected] " "
+                                                                                                                                                                          [email protected]
+                                                                                                                                                                            [email protected] "..="
+                                                                                                                                                                            [email protected]
+                                                                                                                                                                              [email protected] ".."
+                                                                                                                                                                              [email protected] "    "
+                                                                                                                                                                              [email protected]
+                                                                                                                                                                                [email protected] "..="
+                                                                                                                                                                                [email protected]
+                                                                                                                                                                                  [email protected] ".."
+                                                                                                                                                                                  [email protected] " "
+                                                                                                                                                                                  [email protected]
+                                                                                                                                                                                    [email protected] "..="
+                                                                                                                                                                                    [email protected]
+                                                                                                                                                                                      [email protected] ".."
+                                                                                                                                                                                      [email protected] "    "
+                                                                                                                                                                                      [email protected]
+                                                                                                                                                                                        [email protected] ".."
+                                                                                                                                                                                        [email protected] " "
+                                                                                                                                                                                        [email protected]
+                                                                                                                                                                                          [email protected] ".."
+                                                                                                                                                                                          [email protected] " "
+                                                                                                                                                                                          [email protected]
+                                                                                                                                                                                            [email protected] "..="
+                                                                                                                                                                                            [email protected]
+                                                                                                                                                                                              [email protected] ".."
+                                                                                                                                                                                              [email protected] "    "
+                                                                                                                                                                                              [email protected]
+                                                                                                                                                                                                [email protected] ".."
+                                                                                                                                                                                                [email protected] " "
+                                                                                                                                                                                                [email protected]
+                                                                                                                                                                                                  [email protected] "..="
+                                                                                                                                                                                                  [email protected]
+                                                                                                                                                                                                    [email protected] ".."
+                                                                                                                                                                                                    [email protected] " "
+                                                                                                                                                                                                    [email protected]
+                                                                                                                                                                                                      [email protected] ".."
+                                                                                                                                                                                                      [email protected] "\n    "
+                                                                                                                                                                                                      [email protected]
+                                                                                                                                                                                                        [email protected] "..="
+                                                                                                                                                                                                        [email protected]
+                                                                                                                                                                                                          [email protected] ".."
+                                                                                                                                                                                                          [email protected] " "
+                                                                                                                                                                                                          [email protected]
+                                                                                                                                                                                                            [email protected] "..="
+                                                                                                                                                                                                            [email protected]
+                                                                                                                                                                                                              [email protected] ".."
+                                                                                                                                                                                                              [email protected] "    "
+                                                                                                                                                                                                              [email protected]
+                                                                                                                                                                                                                [email protected] ".."
+                                                                                                                                                                                                                [email protected] " "
+                                                                                                                                                                                                                [email protected]
+                                                                                                                                                                                                                  [email protected] "..="
+                                                                                                                                                                                                                  [email protected]
+                                                                                                                                                                                                                    [email protected] "..="
+                                                                                                                                                                                                                    [email protected]
+                                                                                                                                                                                                                      [email protected] ".."
+                                                                                                                                                                                                                      [email protected] "    "
+                                                                                                                                                                                                                      [email protected]
+                                                                                                                                                                                                                        [email protected] "..="
+                                                                                                                                                                                                                        [email protected]
+                                                                                                                                                                                                                          [email protected] "..="
+                                                                                                                                                                                                                          [email protected]
+                                                                                                                                                                                                                            [email protected] ".."
+                                                                                                                                                                                                                            [email protected] " "
+                                                                                                                                                                                                                            [email protected]
+                                                                                                                                                                                                                              [email protected] ".."
+                                                                                                                                                                                                                              [email protected] "    "
+                                                                                                                                                                                                                              [email protected]
+                                                                                                                                                                                                                                [email protected] ".."
+                                                                                                                                                                                                                                [email protected] " "
+                                                                                                                                                                                                                                [email protected]
+                                                                                                                                                                                                                                  [email protected] "..="
+                                                                                                                                                                                                                                  [email protected]
+                                                                                                                                                                                                                                    [email protected] ".."
+                                                                                                                                                                                                                                    [email protected] " "
+                                                                                                                                                                                                                                    [email protected]
+                                                                                                                                                                                                                                      [email protected] ".."
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -2102,30 +2066,29 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected]
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected] ";"
-        [email protected]
-          [email protected] "("
-          [email protected] ")"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected]
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected] ";"
+      [email protected]
+        [email protected] "("
+        [email protected] ")"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected]
@@ -2140,190 +2103,189 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "strange"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "funny"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "what"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "zombiejesus"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "notsure"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "canttouchthis"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "angrydome"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "evil_lincoln"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "dots"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "u8"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "8u8"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "fishy"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "union"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "special_characters"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "punch_card"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "ktulhu"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "strange"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "funny"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "what"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "zombiejesus"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "notsure"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "canttouchthis"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "angrydome"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "evil_lincoln"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "dots"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "u8"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "8u8"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "fishy"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "union"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "special_characters"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "punch_card"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "ktulhu"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
index 8f616623b..a64a82e94 100644
--- a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
@@ -76,18 +76,17 @@ [email protected]
       [email protected] ","
     [email protected] "\n"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "\"\""
-          [email protected] "."
-          [email protected]
-            [email protected] "to_owned"
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "\"\""
+        [email protected] "."
+        [email protected]
+          [email protected] "to_owned"
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
index 14d82feb0..7fd414090 100644
--- a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
@@ -38,6 +38,5 @@ [email protected]
                     [email protected] "Foo"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
diff --git a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
index d38a60665..17be2c238 100644
--- a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
@@ -9,8 +9,7 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
index db25bc2b8..acf32a852 100644
--- a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
@@ -9,42 +9,41 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "r#struct"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "92"
-          [email protected] ";"
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "r#trait"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "r#struct"
-            [email protected] " "
-            [email protected] "*"
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "r#struct"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] ";"
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "r#trait"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "r#struct"
+          [email protected] " "
+          [email protected] "*"
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "}"
diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
index 9704bea95..468982b74 100644
--- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
@@ -39,20 +39,19 @@ [email protected]
                   [email protected] "bool"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "unimplemented"
-              [email protected] "!"
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] "\n    "
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "unimplemented"
+            [email protected] "!"
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] "\n    "
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n\n"
@@ -76,9 +75,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -90,37 +88,36 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "baz"
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "<"
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "Foo"
-                      [email protected] ">"
-                  [email protected] "::"
-                  [email protected]
-                    [email protected]
-                      [email protected] "bar"
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ")"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "baz"
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "<"
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "Foo"
+                    [email protected] ">"
+                [email protected] "::"
+                [email protected]
+                  [email protected]
+                    [email protected] "bar"
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ")"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
index 6e5b25748..900eeb445 100644
--- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
@@ -40,71 +40,70 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Repr"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "raw"
-                      [email protected] ":"
-                      [email protected] " "
-                      [email protected]
-                        [email protected] "["
-                        [email protected]
-                          [email protected] "0"
-                        [email protected] "]"
-                    [email protected] " "
-                    [email protected] "}"
-                [email protected] "."
-                [email protected]
-                  [email protected] "raw"
-              [email protected] "["
-              [email protected]
-                [email protected] "0"
-              [email protected] "]"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "0"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "Repr"
-              [email protected]
-                [email protected] "{"
-                [email protected]
-                  [email protected]
-                    [email protected] "raw"
-                  [email protected] ":"
-                  [email protected]
-                    [email protected] "["
-                    [email protected]
-                      [email protected] "0"
-                    [email protected] "]"
-                [email protected] "}"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Repr"
+                [email protected] " "
+                [email protected]
+                  [email protected] "{"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected] "raw"
+                    [email protected] ":"
+                    [email protected] " "
+                    [email protected]
+                      [email protected] "["
+                      [email protected]
+                        [email protected] "0"
+                      [email protected] "]"
+                  [email protected] " "
+                  [email protected] "}"
+              [email protected] "."
+              [email protected]
+                [email protected] "raw"
+            [email protected] "["
+            [email protected]
+              [email protected] "0"
+            [email protected] "]"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "0"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "Repr"
+            [email protected]
+              [email protected] "{"
+              [email protected]
+                [email protected]
+                  [email protected] "raw"
+                [email protected] ":"
+                [email protected]
+                  [email protected] "["
+                  [email protected]
+                    [email protected] "0"
+                  [email protected] "]"
+              [email protected] "}"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
index f1eef3be0..6d941487b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
@@ -11,66 +11,65 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "#"
-            [email protected] "["
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "cfg"
-            [email protected]
-              [email protected] "("
-              [email protected] "feature"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected] "\"backtrace\""
-              [email protected] ")"
-            [email protected] "]"
-          [email protected] "\n    "
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "exit_code"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "panic"
-                [email protected] "::"
-                [email protected]
-                  [email protected]
-                    [email protected] "catch_unwind"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "move"
-                [email protected] " "
-                [email protected]
-                  [email protected] "|"
-                  [email protected] "|"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "main"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "cfg"
+          [email protected]
+            [email protected] "("
+            [email protected] "feature"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected] "\"backtrace\""
+            [email protected] ")"
+          [email protected] "]"
+        [email protected] "\n    "
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "exit_code"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "panic"
+              [email protected] "::"
+              [email protected]
+                [email protected]
+                  [email protected] "catch_unwind"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "move"
+              [email protected] " "
+              [email protected]
+                [email protected] "|"
+                [email protected] "|"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "main"
+                [email protected]
+                  [email protected] "("
+                  [email protected] ")"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
index f79feec19..e8b095251 100644
--- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
@@ -9,86 +9,83 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "#"
-          [email protected] "!"
-          [email protected] "["
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "doc"
-          [email protected]
-            [email protected] "("
-            [email protected] "\"Inner attributes all ..."
-            [email protected] ")"
-          [email protected] "]"
-        [email protected] "\n    "
-        [email protected] "//! As are ModuleDoc  ..."
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "!"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "doc"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "\"Inner attributes are ..."
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "!"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "doc"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "\"Being validated is n ..."
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected] "//! As are ModuleDoc  ..."
-              [email protected] "\n    "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected] "#"
-              [email protected] "!"
-              [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "doc"
-              [email protected]
-                [email protected] "("
-                [email protected] "\"Inner attributes are ..."
-                [email protected] ")"
-              [email protected] "]"
-            [email protected] "\n        "
-            [email protected] "//! As are ModuleDoc  ..."
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "#"
+        [email protected] "!"
+        [email protected] "["
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "doc"
+        [email protected]
+          [email protected] "("
+          [email protected] "\"Inner attributes all ..."
+          [email protected] ")"
+        [email protected] "]"
+      [email protected] "\n    "
+      [email protected] "//! As are ModuleDoc  ..."
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Inner attributes are ..."
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Being validated is n ..."
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected] "//! As are ModuleDoc  ..."
+          [email protected] "\n    "
+          [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "{"
+        [email protected] "\n        "
+        [email protected]
+          [email protected] "#"
+          [email protected] "!"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "doc"
+          [email protected]
+            [email protected] "("
+            [email protected] "\"Inner attributes are ..."
+            [email protected] ")"
+          [email protected] "]"
+        [email protected] "\n        "
+        [email protected] "//! As are ModuleDoc  ..."
+        [email protected] "\n    "
+        [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected] "// https://github.com ..."
   [email protected] "\n"
@@ -156,26 +153,25 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected] "#"
-              [email protected] "!"
-              [email protected] "["
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "allow"
-              [email protected]
-                [email protected] "("
-                [email protected] "unused_variables"
-                [email protected] ")"
-              [email protected] "]"
-            [email protected] " "
-            [email protected] "// this is  `inner_at ..."
-            [email protected] "\n    "
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "allow"
+            [email protected]
+              [email protected] "("
+              [email protected] "unused_variables"
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] " "
+          [email protected] "// this is  `inner_at ..."
+          [email protected] "\n    "
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
index 1cf12d670..38e44e48a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
@@ -11,252 +11,250 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "Some"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "-"
-                  [email protected]
-                    [email protected] "1"
-                [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Some"
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "-"
-                    [email protected]
-                      [email protected] "1"
-                  [email protected] ")"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "Some"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "-"
-                    [email protected]
-                      [email protected] "1"
-                  [email protected] ","
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "-"
-                    [email protected]
-                      [email protected] "1"
-                  [email protected] ")"
-                [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Some"
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "("
-                    [email protected]
-                      [email protected] "-"
-                      [email protected]
-                        [email protected] "1"
-                    [email protected] ","
-                    [email protected] " "
-                    [email protected]
-                      [email protected] "-"
-                      [email protected]
-                        [email protected] "1"
-                    [email protected] ")"
-                  [email protected] ")"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "A"
-                  [email protected] "::"
-                  [email protected]
-                    [email protected]
-                      [email protected] "B"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "-"
-                  [email protected]
-                    [email protected] "1"
-                [email protected] ","
-                [email protected] " "
-                [email protected]
-                  [email protected] "-"
-                  [email protected]
-                    [email protected] "1"
-                [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "A"
-                    [email protected] "::"
-                    [email protected]
-                      [email protected]
-                        [email protected] "B"
-                  [email protected] "("
-                  [email protected]
-                    [email protected] "-"
-                    [email protected]
-                      [email protected] "1"
-                  [email protected] ","
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "-"
-                    [email protected]
-                      [email protected] "1"
-                  [email protected] ")"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected] "if"
-          [email protected] " "
-          [email protected]
-            [email protected] "let"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "Some"
-              [email protected] "("
-              [email protected]
-                [email protected] "-"
-                [email protected]
-                  [email protected] "1"
-              [email protected] ")"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "Some"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "-"
-                  [email protected]
-                    [email protected] "1"
-                [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "Some"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "-"
+                [email protected]
+                  [email protected] "1"
+              [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Some"
+                [email protected] "("
+                [email protected]
+                  [email protected] "-"
+                  [email protected]
+                    [email protected] "1"
+                [email protected] ")"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "Some"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "("
+                [email protected]
+                  [email protected] "-"
+                  [email protected]
+                    [email protected] "1"
+                [email protected] ","
+                [email protected] " "
+                [email protected]
+                  [email protected] "-"
+                  [email protected]
+                    [email protected] "1"
+                [email protected] ")"
+              [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Some"
+                [email protected] "("
+                [email protected]
+                  [email protected] "("
+                  [email protected]
+                    [email protected] "-"
+                    [email protected]
+                      [email protected] "1"
+                  [email protected] ","
+                  [email protected] " "
+                  [email protected]
+                    [email protected] "-"
+                    [email protected]
+                      [email protected] "1"
+                  [email protected] ")"
+                [email protected] ")"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "A"
+                [email protected] "::"
+                [email protected]
+                  [email protected]
+                    [email protected] "B"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "-"
+                [email protected]
+                  [email protected] "1"
+              [email protected] ","
+              [email protected] " "
+              [email protected]
+                [email protected] "-"
+                [email protected]
+                  [email protected] "1"
+              [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "A"
+                  [email protected] "::"
+                  [email protected]
+                    [email protected]
+                      [email protected] "B"
+                [email protected] "("
+                [email protected]
+                  [email protected] "-"
+                  [email protected]
+                    [email protected] "1"
+                [email protected] ","
+                [email protected] " "
+                [email protected]
+                  [email protected] "-"
+                  [email protected]
+                    [email protected] "1"
+                [email protected] ")"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected] "if"
+        [email protected] " "
+        [email protected]
+          [email protected] "let"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "Some"
+            [email protected] "("
+            [email protected]
+              [email protected] "-"
+              [email protected]
+                [email protected] "1"
+            [email protected] ")"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "Some"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "-"
+                [email protected]
+                  [email protected] "1"
+              [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "enum"
@@ -317,7 +315,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
index 9c2701bf7..28233c5d0 100644
--- a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
@@ -11,191 +11,190 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "a"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "0"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] "+="
-            [email protected] " "
-            [email protected]
-              [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] "-="
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] "*="
-            [email protected] " "
-            [email protected]
-              [email protected] "3"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] "%="
-            [email protected] " "
-            [email protected]
-              [email protected] "4"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] "/="
-            [email protected] " "
-            [email protected]
-              [email protected] "5"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] "|="
-            [email protected] " "
-            [email protected]
-              [email protected] "6"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] "&="
-            [email protected] " "
-            [email protected]
-              [email protected] "7"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] "^="
-            [email protected] " "
-            [email protected]
-              [email protected] "8"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] "<="
-            [email protected] " "
-            [email protected]
-              [email protected] "9"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] ">="
-            [email protected] " "
-            [email protected]
-              [email protected] "10"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] ">>="
-            [email protected] " "
-            [email protected]
-              [email protected] "11"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "a"
-            [email protected] " "
-            [email protected] "<<="
-            [email protected] " "
-            [email protected]
-              [email protected] "12"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "a"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "0"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] "+="
+          [email protected] " "
+          [email protected]
+            [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] "-="
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] "*="
+          [email protected] " "
+          [email protected]
+            [email protected] "3"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] "%="
+          [email protected] " "
+          [email protected]
+            [email protected] "4"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] "/="
+          [email protected] " "
+          [email protected]
+            [email protected] "5"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] "|="
+          [email protected] " "
+          [email protected]
+            [email protected] "6"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] "&="
+          [email protected] " "
+          [email protected]
+            [email protected] "7"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] "^="
+          [email protected] " "
+          [email protected]
+            [email protected] "8"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] "<="
+          [email protected] " "
+          [email protected]
+            [email protected] "9"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] ">="
+          [email protected] " "
+          [email protected]
+            [email protected] "10"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] ">>="
+          [email protected] " "
+          [email protected]
+            [email protected] "11"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "a"
+          [email protected] " "
+          [email protected] "<<="
+          [email protected] " "
+          [email protected]
+            [email protected] "12"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
index 750527bb9..0569488f8 100644
--- a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
@@ -9,28 +9,27 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "async"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "async"
-            [email protected] " "
-            [email protected] "move"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "async"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "async"
+          [email protected] " "
+          [email protected] "move"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
index b5577e933..7847da085 100644
--- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
@@ -49,9 +49,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -63,30 +62,29 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "foo"
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected] "async"
-              [email protected] " "
-              [email protected] "move"
-              [email protected] " "
-              [email protected]
-                [email protected] "{"
-                [email protected] " "
-                [email protected]
-                  [email protected] "12"
-                [email protected] " "
-                [email protected] "}"
-            [email protected] ")"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "foo"
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected] "async"
+            [email protected] " "
+            [email protected] "move"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] " "
+              [email protected]
+                [email protected] "12"
+              [email protected] " "
+              [email protected] "}"
+          [email protected] ")"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
index 6aacc2141..816740a7c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -38,9 +38,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -72,9 +71,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected]
@@ -185,9 +183,8 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "trait"
@@ -287,9 +284,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n     "
       [email protected]
         [email protected] "fn"
@@ -312,9 +308,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n     "
       [email protected]
         [email protected] "fn"
@@ -338,9 +333,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n     "
       [email protected]
         [email protected] "fn"
@@ -371,9 +365,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n     "
       [email protected]
         [email protected] "fn"
@@ -404,9 +397,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n     "
       [email protected]
         [email protected] "fn"
@@ -439,9 +431,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n     "
       [email protected]
         [email protected] "fn"
@@ -471,9 +462,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n     "
       [email protected]
         [email protected] "fn"
@@ -512,8 +502,7 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
index f376f86a7..65cfa7bc5 100644
--- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
@@ -9,73 +9,70 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n   "
-        [email protected]
-          [email protected] "for"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "_x"
-          [email protected] " "
-          [email protected] "in"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "0"
-            [email protected] " "
-            [email protected] ".."
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected] "0"
-                  [email protected] " "
-                  [email protected] ".."
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected] "{"
-                      [email protected]
-                        [email protected]
-                          [email protected] "1"
-                        [email protected] " "
-                        [email protected] "+"
-                        [email protected] " "
-                        [email protected]
-                          [email protected] "2"
-                      [email protected] "}"
-                [email protected] ")"
-              [email protected] "."
-              [email protected]
-                [email protected] "sum"
-              [email protected]
-                [email protected] "::"
-                [email protected] "<"
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "u32"
-                [email protected] ">"
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n       "
-              [email protected]
-                [email protected]
-                  [email protected] "break"
-                [email protected] ";"
-              [email protected] "\n   "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n   "
+      [email protected]
+        [email protected] "for"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "_x"
+        [email protected] " "
+        [email protected] "in"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "0"
+          [email protected] " "
+          [email protected] ".."
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected] "0"
+                [email protected] " "
+                [email protected] ".."
+                [email protected] " "
+                [email protected]
+                  [email protected] "{"
+                  [email protected]
+                    [email protected]
+                      [email protected] "1"
+                    [email protected] " "
+                    [email protected] "+"
+                    [email protected] " "
+                    [email protected]
+                      [email protected] "2"
+                  [email protected] "}"
+              [email protected] ")"
+            [email protected] "."
+            [email protected]
+              [email protected] "sum"
+            [email protected]
+              [email protected] "::"
+              [email protected] "<"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "u32"
+              [email protected] ">"
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n       "
+          [email protected]
+            [email protected]
+              [email protected] "break"
+            [email protected] ";"
+          [email protected] "\n   "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
index f20819bd2..d6aec7ab9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
@@ -32,9 +32,8 @@ [email protected]
               [email protected] ">"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -75,9 +74,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -120,7 +118,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
index dcdb3cc6d..9e0cec35f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
@@ -22,29 +22,28 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ":"
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "::"
-                [email protected]
-                  [email protected] "X"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ":"
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "::"
+              [email protected]
+                [email protected] "X"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
index 6176a9620..7fa3033ac 100644
--- a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
@@ -9,58 +9,56 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "if"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "1.0f32"
-                  [email protected] "."
-                  [email protected]
-                    [email protected] "floor"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-                [email protected] " "
-                [email protected] "as"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "i64"
-              [email protected] " "
-              [email protected] "!="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "1.0f32"
-                  [email protected] "."
-                  [email protected]
-                    [email protected] "floor"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-                [email protected] " "
-                [email protected] "as"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "i64"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "if"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "1.0f32"
+                [email protected] "."
+                [email protected]
+                  [email protected] "floor"
+                [email protected]
+                  [email protected] "("
+                  [email protected] ")"
+              [email protected] " "
+              [email protected] "as"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "i64"
+            [email protected] " "
+            [email protected] "!="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "1.0f32"
+                [email protected] "."
+                [email protected]
+                  [email protected] "floor"
+                [email protected]
+                  [email protected] "("
+                  [email protected] ")"
+              [email protected] " "
+              [email protected] "as"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "i64"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
index 342fe23f5..d93968016 100644
--- a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
@@ -20,9 +20,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -34,26 +33,24 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "loop"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] "}"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "loop"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] "}"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
index 360b6e044..b5c72ee36 100644
--- a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
@@ -9,89 +9,88 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "1"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "*"
-                [email protected]
-                  [email protected] "&"
-                  [email protected]
-                    [email protected] "2"
-            [email protected] " "
-            [email protected] "+"
-            [email protected] " "
-            [email protected]
-              [email protected] "3"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "*"
-              [email protected]
-                [email protected] "&"
-                [email protected]
-                  [email protected] "1"
-            [email protected] " "
-            [email protected] "as"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "u64"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "*"
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "x"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "1"
-                [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "&"
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "x"
-              [email protected] "["
-              [email protected]
-                [email protected] "1"
-              [email protected] "]"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "-"
-              [email protected]
-                [email protected] "1"
-            [email protected] ".."
-            [email protected]
-              [email protected] "2"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "1"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "*"
+              [email protected]
+                [email protected] "&"
+                [email protected]
+                  [email protected] "2"
+          [email protected] " "
+          [email protected] "+"
+          [email protected] " "
+          [email protected]
+            [email protected] "3"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "*"
+            [email protected]
+              [email protected] "&"
+              [email protected]
+                [email protected] "1"
+          [email protected] " "
+          [email protected] "as"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "u64"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "*"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "x"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "1"
+              [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "&"
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "x"
+            [email protected] "["
+            [email protected]
+              [email protected] "1"
+            [email protected] "]"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "-"
+            [email protected]
+              [email protected] "1"
+          [email protected] ".."
+          [email protected]
+            [email protected] "2"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
index 225b1d0b6..ddcb139c1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
@@ -9,93 +9,89 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "Some"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "for"
-                [email protected] " "
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "in"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "["
-                    [email protected]
-                      [email protected] "1"
-                    [email protected] "]"
-                  [email protected] "."
-                  [email protected]
-                    [email protected] "into_iter"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] ")"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] "}"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "Some"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "loop"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "break"
-                      [email protected] ";"
-                    [email protected] " "
-                    [email protected] "}"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "Some"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "while"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "true"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] "}"
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "Some"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "for"
+              [email protected] " "
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "in"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "["
+                  [email protected]
+                    [email protected] "1"
+                  [email protected] "]"
+                [email protected] "."
+                [email protected]
+                  [email protected] "into_iter"
+                [email protected]
+                  [email protected] "("
+                  [email protected] ")"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] "}"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "Some"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "loop"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected] "break"
+                  [email protected] ";"
+                [email protected] " "
+                [email protected] "}"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "Some"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "while"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected] "true"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] "}"
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
index a52a08ed0..098152fc3 100644
--- a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
@@ -9,48 +9,47 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "0"
-              [email protected] " "
-              [email protected] "as"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "usize"
-            [email protected] " "
-            [email protected] ".."
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "1"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "2"
-                [email protected] " "
-                [email protected] "as"
-                [email protected] " "
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "usize"
-            [email protected] " "
-            [email protected] ".."
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "0"
+            [email protected] " "
+            [email protected] "as"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "usize"
+          [email protected] " "
+          [email protected] ".."
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "1"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "2"
+              [email protected] " "
+              [email protected] "as"
+              [email protected] " "
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "usize"
+          [email protected] " "
+          [email protected] ".."
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
index b8974c942..c6e982976 100644
--- a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
@@ -9,19 +9,18 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] ".."
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] ".."
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
index 46f370eec..bf791ee2b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
@@ -70,107 +70,106 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "macro"
-          [email protected] " "
-          [email protected]
-            [email protected] "test_merge"
-          [email protected]
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "["
-                [email protected] "$"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "$"
-                  [email protected] "input"
-                  [email protected] ":"
-                  [email protected] "expr"
-                  [email protected] ")"
-                [email protected] ","
-                [email protected] "*"
-                [email protected] " "
-                [email protected] "$"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ","
-                  [email protected] ")"
-                [email protected] "*"
-                [email protected] "]"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "["
-                [email protected] "$"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "$"
-                  [email protected] "output"
-                  [email protected] ":"
-                  [email protected] "expr"
-                  [email protected] ")"
-                [email protected] ","
-                [email protected] "*"
-                [email protected] " "
-                [email protected] "$"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ","
-                  [email protected] ")"
-                [email protected] "*"
-                [email protected] "]"
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected] "assert_eq"
-              [email protected] "!"
-              [email protected]
-                [email protected] "("
-                [email protected] "\n            "
-                [email protected] "merge_use_trees"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "parse_use_trees"
-                  [email protected] "!"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "$"
-                    [email protected]
-                      [email protected] "("
-                      [email protected] "$"
-                      [email protected] "input"
-                      [email protected] ","
-                      [email protected] ")"
-                    [email protected] "*"
-                    [email protected] ")"
-                  [email protected] ")"
-                [email protected] ","
-                [email protected] "\n            "
-                [email protected] "parse_use_trees"
-                [email protected] "!"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "$"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "$"
-                    [email protected] "output"
-                    [email protected] ","
-                    [email protected] ")"
-                  [email protected] "*"
-                  [email protected] ")"
-                [email protected] ","
-                [email protected] "\n        "
-                [email protected] ")"
-              [email protected] ";"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "macro"
+        [email protected] " "
+        [email protected]
+          [email protected] "test_merge"
+        [email protected]
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "["
+              [email protected] "$"
+              [email protected]
+                [email protected] "("
+                [email protected] "$"
+                [email protected] "input"
+                [email protected] ":"
+                [email protected] "expr"
+                [email protected] ")"
+              [email protected] ","
+              [email protected] "*"
+              [email protected] " "
+              [email protected] "$"
+              [email protected]
+                [email protected] "("
+                [email protected] ","
+                [email protected] ")"
+              [email protected] "*"
+              [email protected] "]"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "["
+              [email protected] "$"
+              [email protected]
+                [email protected] "("
+                [email protected] "$"
+                [email protected] "output"
+                [email protected] ":"
+                [email protected] "expr"
+                [email protected] ")"
+              [email protected] ","
+              [email protected] "*"
+              [email protected] " "
+              [email protected] "$"
+              [email protected]
+                [email protected] "("
+                [email protected] ","
+                [email protected] ")"
+              [email protected] "*"
+              [email protected] "]"
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected] "assert_eq"
+            [email protected] "!"
+            [email protected]
+              [email protected] "("
+              [email protected] "\n            "
+              [email protected] "merge_use_trees"
+              [email protected]
+                [email protected] "("
+                [email protected] "parse_use_trees"
+                [email protected] "!"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "$"
+                  [email protected]
+                    [email protected] "("
+                    [email protected] "$"
+                    [email protected] "input"
+                    [email protected] ","
+                    [email protected] ")"
+                  [email protected] "*"
+                  [email protected] ")"
+                [email protected] ")"
+              [email protected] ","
+              [email protected] "\n            "
+              [email protected] "parse_use_trees"
+              [email protected] "!"
+              [email protected]
+                [email protected] "("
+                [email protected] "$"
+                [email protected]
+                  [email protected] "("
+                  [email protected] "$"
+                  [email protected] "output"
+                  [email protected] ","
+                  [email protected] ")"
+                [email protected] "*"
+                [email protected] ")"
+              [email protected] ","
+              [email protected] "\n        "
+              [email protected] ")"
+            [email protected] ";"
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
index 1cd77aa14..886b211d0 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
@@ -47,9 +47,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -90,9 +89,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -122,9 +120,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -155,9 +152,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
index 4f9a14066..a0423806c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
@@ -50,9 +50,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -93,9 +92,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -125,9 +123,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected] "fn"
@@ -158,9 +155,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n"
       [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
index 3294f4901..d1fffdd63 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
@@ -11,7 +11,6 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
index 633b14000..eb2f8eb3c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
@@ -55,7 +55,6 @@ [email protected]
                     [email protected] "Send"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index cee0248b6..8c94f430a 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -20,13 +20,13 @@ globset = "0.4.4"
 itertools = "0.9.0"
 jod-thread = "0.1.0"
 log = "0.4.8"
-lsp-types = { version = "0.73.0", features = ["proposed"] }
+lsp-types = { version = "0.74.0", features = ["proposed"] }
 parking_lot = "0.10.0"
 pico-args = "0.3.1"
 rand = { version = "0.7.3", features = ["small_rng"] }
 relative-path = "1.0.0"
 rustc-hash = "1.1.0"
-serde = { version = "1.0.104", features = ["derive"] }
+serde = { version = "1.0.106", features = ["derive"] }
 serde_json = "1.0.48"
 threadpool = "1.7.1"
 
@@ -39,7 +39,7 @@ ra_prof = { path = "../ra_prof" }
 ra_project_model = { path = "../ra_project_model" }
 ra_syntax = { path = "../ra_syntax" }
 ra_text_edit = { path = "../ra_text_edit" }
-ra_vfs = "0.5.2"
+ra_vfs = "0.6.0"
 
 # This should only be used in CLI
 ra_db = { path = "../ra_db" }
diff --git a/crates/rust-analyzer/src/caps.rs b/crates/rust-analyzer/src/caps.rs
index 45b60768a..44222d8bd 100644
--- a/crates/rust-analyzer/src/caps.rs
+++ b/crates/rust-analyzer/src/caps.rs
@@ -3,20 +3,20 @@
 use crate::semantic_tokens;
 
 use lsp_types::{
-    CallHierarchyServerCapability, CodeActionProviderCapability, CodeLensOptions,
-    CompletionOptions, DocumentOnTypeFormattingOptions, FoldingRangeProviderCapability,
-    ImplementationProviderCapability, RenameOptions, RenameProviderCapability, SaveOptions,
-    SelectionRangeProviderCapability, SemanticTokensDocumentProvider, SemanticTokensLegend,
-    SemanticTokensOptions, ServerCapabilities, SignatureHelpOptions, TextDocumentSyncCapability,
-    TextDocumentSyncKind, TextDocumentSyncOptions, TypeDefinitionProviderCapability,
-    WorkDoneProgressOptions,
+    CallHierarchyServerCapability, CodeActionOptions, CodeActionProviderCapability,
+    CodeLensOptions, CompletionOptions, DocumentOnTypeFormattingOptions,
+    FoldingRangeProviderCapability, ImplementationProviderCapability, RenameOptions,
+    RenameProviderCapability, SaveOptions, SelectionRangeProviderCapability,
+    SemanticTokensDocumentProvider, SemanticTokensLegend, SemanticTokensOptions,
+    ServerCapabilities, SignatureHelpOptions, TextDocumentSyncCapability, TextDocumentSyncKind,
+    TextDocumentSyncOptions, TypeDefinitionProviderCapability, WorkDoneProgressOptions,
 };
 
 pub fn server_capabilities() -> ServerCapabilities {
     ServerCapabilities {
         text_document_sync: Some(TextDocumentSyncCapability::Options(TextDocumentSyncOptions {
             open_close: Some(true),
-            change: Some(TextDocumentSyncKind::Full),
+            change: Some(TextDocumentSyncKind::Incremental),
             will_save: None,
             will_save_wait_until: None,
             save: Some(SaveOptions::default()),
@@ -40,7 +40,20 @@ pub fn server_capabilities() -> ServerCapabilities {
         document_highlight_provider: Some(true),
         document_symbol_provider: Some(true),
         workspace_symbol_provider: Some(true),
-        code_action_provider: Some(CodeActionProviderCapability::Simple(true)),
+        code_action_provider: Some(CodeActionProviderCapability::Options(CodeActionOptions {
+            // Advertise support for all built-in CodeActionKinds
+            code_action_kinds: Some(vec![
+                lsp_types::code_action_kind::EMPTY.to_string(),
+                lsp_types::code_action_kind::QUICKFIX.to_string(),
+                lsp_types::code_action_kind::REFACTOR.to_string(),
+                lsp_types::code_action_kind::REFACTOR_EXTRACT.to_string(),
+                lsp_types::code_action_kind::REFACTOR_INLINE.to_string(),
+                lsp_types::code_action_kind::REFACTOR_REWRITE.to_string(),
+                lsp_types::code_action_kind::SOURCE.to_string(),
+                lsp_types::code_action_kind::SOURCE_ORGANIZE_IMPORTS.to_string(),
+            ]),
+            work_done_progress_options: Default::default(),
+        })),
         code_lens_provider: Some(CodeLensOptions { resolve_provider: Some(true) }),
         document_formatting_provider: Some(true),
         document_range_formatting_provider: None,
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 74a63e32a..15b7c6912 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -49,7 +49,6 @@ pub enum FilesWatcher {
 
 #[derive(Debug, Clone)]
 pub struct NotificationsConfig {
-    pub workspace_loaded: bool,
     pub cargo_toml_not_found: bool,
 }
 
@@ -70,6 +69,7 @@ pub struct ClientCapsConfig {
     pub location_link: bool,
     pub line_folding_only: bool,
     pub hierarchical_symbols: bool,
+    pub code_action_literals: bool,
 }
 
 impl Default for Config {
@@ -82,10 +82,7 @@ impl Default for Config {
             lru_capacity: None,
             proc_macro_srv: None,
             files: FilesConfig { watcher: FilesWatcher::Notify, exclude: Vec::new() },
-            notifications: NotificationsConfig {
-                workspace_loaded: true,
-                cargo_toml_not_found: true,
-            },
+            notifications: NotificationsConfig { cargo_toml_not_found: true },
 
             cargo: CargoConfig::default(),
             rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() },
@@ -128,7 +125,6 @@ impl Config {
             Some("client") => FilesWatcher::Client,
             Some("notify") | _ => FilesWatcher::Notify
         };
-        set(value, "/notifications/workspaceLoaded", &mut self.notifications.workspace_loaded);
         set(value, "/notifications/cargoTomlNotFound", &mut self.notifications.cargo_toml_not_found);
 
         set(value, "/cargo/noDefaultFeatures", &mut self.cargo.no_default_features);
@@ -221,6 +217,11 @@ impl Config {
         {
             self.client_caps.hierarchical_symbols = value
         }
+        if let Some(value) =
+            caps.code_action.as_ref().and_then(|it| Some(it.code_action_literal_support.is_some()))
+        {
+            self.client_caps.code_action_literals = value;
+        }
         self.completion.allow_snippets(false);
         if let Some(completion) = &caps.completion {
             if let Some(completion_item) = &completion.completion_item {
diff --git a/crates/rust-analyzer/src/conv.rs b/crates/rust-analyzer/src/conv.rs
index ffe3ea84d..7be5ebcdb 100644
--- a/crates/rust-analyzer/src/conv.rs
+++ b/crates/rust-analyzer/src/conv.rs
@@ -150,7 +150,7 @@ impl ConvWith<(&LineIndex, LineEndings)> for CompletionItem {
             detail: self.detail().map(|it| it.to_string()),
             filter_text: Some(self.lookup().to_string()),
             kind: self.kind().map(|it| it.conv()),
-            text_edit: Some(text_edit),
+            text_edit: Some(text_edit.into()),
             additional_text_edits: Some(additional_text_edits),
             documentation: self.documentation().map(|it| it.conv()),
             deprecated: Some(self.deprecated()),
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index f3aef3f0f..3bc2e0a46 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -6,9 +6,12 @@ mod subscriptions;
 pub(crate) mod pending_requests;
 
 use std::{
+    borrow::Cow,
     env,
     error::Error,
-    fmt, panic,
+    fmt,
+    ops::Range,
+    panic,
     path::PathBuf,
     sync::Arc,
     time::{Duration, Instant},
@@ -18,11 +21,12 @@ use crossbeam_channel::{never, select, unbounded, RecvError, Sender};
 use itertools::Itertools;
 use lsp_server::{Connection, ErrorCode, Message, Notification, Request, RequestId, Response};
 use lsp_types::{
-    NumberOrString, WorkDoneProgress, WorkDoneProgressBegin, WorkDoneProgressCreateParams,
-    WorkDoneProgressEnd, WorkDoneProgressReport,
+    DidChangeTextDocumentParams, NumberOrString, TextDocumentContentChangeEvent, WorkDoneProgress,
+    WorkDoneProgressBegin, WorkDoneProgressCreateParams, WorkDoneProgressEnd,
+    WorkDoneProgressReport,
 };
 use ra_flycheck::{url_from_path_with_drive_lowercasing, CheckTask};
-use ra_ide::{Canceled, FileId, LibraryData, SourceRootId};
+use ra_ide::{Canceled, FileId, LibraryData, LineIndex, SourceRootId};
 use ra_prof::profile;
 use ra_project_model::{PackageRoot, ProjectWorkspace};
 use ra_vfs::{VfsFile, VfsTask, Watch};
@@ -33,6 +37,7 @@ use threadpool::ThreadPool;
 
 use crate::{
     config::{Config, FilesWatcher},
+    conv::{ConvWith, TryConvWith},
     diagnostics::DiagnosticTask,
     main_loop::{
         pending_requests::{PendingRequest, PendingRequests},
@@ -410,8 +415,7 @@ fn loop_turn(
         });
     }
 
-    let show_progress =
-        !loop_state.workspace_loaded && world_state.config.notifications.workspace_loaded;
+    let show_progress = !loop_state.workspace_loaded;
 
     if !loop_state.workspace_loaded
         && loop_state.roots_scanned == loop_state.roots_total
@@ -579,12 +583,16 @@ fn on_notification(
         Err(not) => not,
     };
     let not = match notification_cast::<req::DidChangeTextDocument>(not) {
-        Ok(mut params) => {
-            let uri = params.text_document.uri;
+        Ok(params) => {
+            let DidChangeTextDocumentParams { text_document, content_changes } = params;
+            let world = state.snapshot();
+            let file_id = text_document.try_conv_with(&world)?;
+            let line_index = world.analysis().file_line_index(file_id)?;
+            let uri = text_document.uri;
             let path = uri.to_file_path().map_err(|()| format!("invalid uri: {}", uri))?;
-            let text =
-                params.content_changes.pop().ok_or_else(|| "empty changes".to_string())?.text;
-            state.vfs.write().change_file_overlay(path.as_path(), text);
+            state.vfs.write().change_file_overlay(&path, |old_text| {
+                apply_document_changes(old_text, Cow::Borrowed(&line_index), content_changes);
+            });
             return Ok(());
         }
         Err(not) => not,
@@ -653,6 +661,48 @@ fn on_notification(
     Ok(())
 }
 
+fn apply_document_changes(
+    old_text: &mut String,
+    mut line_index: Cow<'_, LineIndex>,
+    content_changes: Vec<TextDocumentContentChangeEvent>,
+) {
+    // The changes we got must be applied sequentially, but can cross lines so we
+    // have to keep our line index updated.
+    // Some clients (e.g. Code) sort the ranges in reverse. As an optimization, we
+    // remember the last valid line in the index and only rebuild it if needed.
+    enum IndexValid {
+        All,
+        UpToLine(u64),
+    }
+
+    impl IndexValid {
+        fn covers(&self, line: u64) -> bool {
+            match *self {
+                IndexValid::UpToLine(to) => to >= line,
+                _ => true,
+            }
+        }
+    }
+
+    let mut index_valid = IndexValid::All;
+    for change in content_changes {
+        match change.range {
+            Some(range) => {
+                if !index_valid.covers(range.start.line) {
+                    line_index = Cow::Owned(LineIndex::new(&old_text));
+                }
+                index_valid = IndexValid::UpToLine(range.start.line);
+                let range = range.conv_with(&line_index);
+                old_text.replace_range(Range::<usize>::from(range), &change.text);
+            }
+            None => {
+                *old_text = change.text;
+                index_valid = IndexValid::UpToLine(0);
+            }
+        }
+    }
+}
+
 fn on_check_task(
     task: CheckTask,
     world_state: &mut WorldState,
@@ -958,3 +1008,64 @@ where
 {
     Request::new(id, R::METHOD.to_string(), params)
 }
+
+#[cfg(test)]
+mod tests {
+    use std::borrow::Cow;
+
+    use lsp_types::{Position, Range, TextDocumentContentChangeEvent};
+    use ra_ide::LineIndex;
+
+    #[test]
+    fn apply_document_changes() {
+        fn run(text: &mut String, changes: Vec<TextDocumentContentChangeEvent>) {
+            let line_index = Cow::Owned(LineIndex::new(&text));
+            super::apply_document_changes(text, line_index, changes);
+        }
+
+        macro_rules! c {
+            [$($sl:expr, $sc:expr; $el:expr, $ec:expr => $text:expr),+] => {
+                vec![$(TextDocumentContentChangeEvent {
+                    range: Some(Range {
+                        start: Position { line: $sl, character: $sc },
+                        end: Position { line: $el, character: $ec },
+                    }),
+                    range_length: None,
+                    text: String::from($text),
+                }),+]
+            };
+        }
+
+        let mut text = String::new();
+        run(&mut text, vec![]);
+        assert_eq!(text, "");
+        run(
+            &mut text,
+            vec![TextDocumentContentChangeEvent {
+                range: None,
+                range_length: None,
+                text: String::from("the"),
+            }],
+        );
+        assert_eq!(text, "the");
+        run(&mut text, c![0, 3; 0, 3 => " quick"]);
+        assert_eq!(text, "the quick");
+        run(&mut text, c![0, 0; 0, 4 => "", 0, 5; 0, 5 => " foxes"]);
+        assert_eq!(text, "quick foxes");
+        run(&mut text, c![0, 11; 0, 11 => "\ndream"]);
+        assert_eq!(text, "quick foxes\ndream");
+        run(&mut text, c![1, 0; 1, 0 => "have "]);
+        assert_eq!(text, "quick foxes\nhave dream");
+        run(&mut text, c![0, 0; 0, 0 => "the ", 1, 4; 1, 4 => " quiet", 1, 16; 1, 16 => "s\n"]);
+        assert_eq!(text, "the quick foxes\nhave quiet dreams\n");
+        run(&mut text, c![0, 15; 0, 15 => "\n", 2, 17; 2, 17 => "\n"]);
+        assert_eq!(text, "the quick foxes\n\nhave quiet dreams\n\n");
+        run(
+            &mut text,
+            c![1, 0; 1, 0 => "DREAM", 2, 0; 2, 0 => "they ", 3, 0; 3, 0 => "DON'T THEY?"],
+        );
+        assert_eq!(text, "the quick foxes\nDREAM\nthey have quiet dreams\nDON'T THEY?\n");
+        run(&mut text, c![0, 10; 1, 5 => "", 2, 0; 2, 12 => ""]);
+        assert_eq!(text, "the quick \nthey have quiet dreams\n");
+    }
+}
diff --git a/crates/rust-analyzer/src/main_loop/handlers.rs b/crates/rust-analyzer/src/main_loop/handlers.rs
index 6caaf5f88..c7a96ba93 100644
--- a/crates/rust-analyzer/src/main_loop/handlers.rs
+++ b/crates/rust-analyzer/src/main_loop/handlers.rs
@@ -19,8 +19,7 @@ use lsp_types::{
     TextEdit, Url, WorkspaceEdit,
 };
 use ra_ide::{
-    Assist, AssistId, FileId, FilePosition, FileRange, Query, RangeInfo, Runnable, RunnableKind,
-    SearchScope,
+    Assist, FileId, FilePosition, FileRange, Query, RangeInfo, Runnable, RunnableKind, SearchScope,
 };
 use ra_prof::profile;
 use ra_syntax::{AstNode, SyntaxKind, TextRange, TextSize};
@@ -47,11 +46,11 @@ use crate::{
 pub fn handle_analyzer_status(world: WorldSnapshot, _: ()) -> Result<String> {
     let _p = profile("handle_analyzer_status");
     let mut buf = world.status();
-    format_to!(buf, "\n\nrequests:");
+    format_to!(buf, "\n\nrequests:\n");
     let requests = world.latest_requests.read();
     for (is_last, r) in requests.iter() {
         let mark = if is_last { "*" } else { " " };
-        format_to!(buf, "{}{:4} {:<36}{}ms", mark, r.id, r.method, r.duration.as_millis());
+        format_to!(buf, "{}{:4} {:<36}{}ms\n", mark, r.id, r.method, r.duration.as_millis());
     }
     Ok(buf)
 }
@@ -326,10 +325,10 @@ pub fn handle_workspace_symbol(
 
 pub fn handle_goto_definition(
     world: WorldSnapshot,
-    params: req::TextDocumentPositionParams,
+    params: req::GotoDefinitionParams,
 ) -> Result<Option<req::GotoDefinitionResponse>> {
     let _p = profile("handle_goto_definition");
-    let position = params.try_conv_with(&world)?;
+    let position = params.text_document_position_params.try_conv_with(&world)?;
     let nav_info = match world.analysis().goto_definition(position)? {
         None => return Ok(None),
         Some(it) => it,
@@ -340,10 +339,10 @@ pub fn handle_goto_definition(
 
 pub fn handle_goto_implementation(
     world: WorldSnapshot,
-    params: req::TextDocumentPositionParams,
+    params: req::GotoImplementationParams,
 ) -> Result<Option<req::GotoImplementationResponse>> {
     let _p = profile("handle_goto_implementation");
-    let position = params.try_conv_with(&world)?;
+    let position = params.text_document_position_params.try_conv_with(&world)?;
     let nav_info = match world.analysis().goto_implementation(position)? {
         None => return Ok(None),
         Some(it) => it,
@@ -354,10 +353,10 @@ pub fn handle_goto_implementation(
 
 pub fn handle_goto_type_definition(
     world: WorldSnapshot,
-    params: req::TextDocumentPositionParams,
+    params: req::GotoTypeDefinitionParams,
 ) -> Result<Option<req::GotoTypeDefinitionResponse>> {
     let _p = profile("handle_goto_type_definition");
-    let position = params.try_conv_with(&world)?;
+    let position = params.text_document_position_params.try_conv_with(&world)?;
     let nav_info = match world.analysis().goto_type_definition(position)? {
         None => return Ok(None),
         Some(it) => it,
@@ -401,11 +400,7 @@ pub fn handle_runnables(
                     range: Default::default(),
                     label: format!("cargo {} -p {}", cmd, spec.package),
                     bin: "cargo".to_string(),
-                    args: {
-                        let mut args = vec![cmd.to_string()];
-                        spec.clone().push_to(&mut args);
-                        args
-                    },
+                    args: vec![cmd.to_string(), "--package".to_string(), spec.package.clone()],
                     extra_args: Vec::new(),
                     env: FxHashMap::default(),
                     cwd: workspace_root.map(|root| root.to_owned()),
@@ -487,10 +482,10 @@ pub fn handle_folding_range(
 
 pub fn handle_signature_help(
     world: WorldSnapshot,
-    params: req::TextDocumentPositionParams,
+    params: req::SignatureHelpParams,
 ) -> Result<Option<req::SignatureHelp>> {
     let _p = profile("handle_signature_help");
-    let position = params.try_conv_with(&world)?;
+    let position = params.text_document_position_params.try_conv_with(&world)?;
     if let Some(call_info) = world.analysis().call_info(position)? {
         let concise = !world.config.call_info_full;
         let mut active_parameter = call_info.active_parameter.map(|it| it as i64);
@@ -509,12 +504,9 @@ pub fn handle_signature_help(
     }
 }
 
-pub fn handle_hover(
-    world: WorldSnapshot,
-    params: req::TextDocumentPositionParams,
-) -> Result<Option<Hover>> {
+pub fn handle_hover(world: WorldSnapshot, params: req::HoverParams) -> Result<Option<Hover>> {
     let _p = profile("handle_hover");
-    let position = params.try_conv_with(&world)?;
+    let position = params.text_document_position_params.try_conv_with(&world)?;
     let info = match world.analysis().hover(position)? {
         None => return Ok(None),
         Some(info) => info,
@@ -705,15 +697,9 @@ fn create_single_code_action(assist: Assist, world: &WorldSnapshot) -> Result<Co
         arguments: Some(vec![arg]),
     };
 
-    let kind = match assist.id {
-        AssistId("introduce_variable") => Some("refactor.extract.variable".to_string()),
-        AssistId("add_custom_impl") => Some("refactor.rewrite.add_custom_impl".to_string()),
-        _ => None,
-    };
-
     Ok(CodeAction {
         title,
-        kind,
+        kind: Some(String::new()),
         diagnostics: None,
         edit: None,
         command: Some(command),
@@ -815,6 +801,23 @@ pub fn handle_code_action(
         }
     }
 
+    // If the client only supports commands then filter the list
+    // and remove and actions that depend on edits.
+    if !world.config.client_caps.code_action_literals {
+        // FIXME: use drain_filter once it hits stable.
+        res = res
+            .into_iter()
+            .filter_map(|it| match it {
+                cmd @ lsp_types::CodeActionOrCommand::Command(_) => Some(cmd),
+                lsp_types::CodeActionOrCommand::CodeAction(action) => match action.command {
+                    Some(cmd) if action.edit.is_none() => {
+                        Some(lsp_types::CodeActionOrCommand::Command(cmd))
+                    }
+                    _ => None,
+                },
+            })
+            .collect();
+    }
     Ok(Some(res))
 }
 
@@ -878,8 +881,14 @@ pub fn handle_code_lens(
             .map(|it| {
                 let range = it.node_range.conv_with(&line_index);
                 let pos = range.start;
-                let lens_params =
-                    req::TextDocumentPositionParams::new(params.text_document.clone(), pos);
+                let lens_params = req::GotoImplementationParams {
+                    text_document_position_params: req::TextDocumentPositionParams::new(
+                        params.text_document.clone(),
+                        pos,
+                    ),
+                    work_done_progress_params: Default::default(),
+                    partial_result_params: Default::default(),
+                };
                 CodeLens {
                     range,
                     command: None,
@@ -894,7 +903,7 @@ pub fn handle_code_lens(
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 enum CodeLensResolveData {
-    Impls(req::TextDocumentPositionParams),
+    Impls(req::GotoImplementationParams),
 }
 
 pub fn handle_code_lens_resolve(world: WorldSnapshot, code_lens: CodeLens) -> Result<CodeLens> {
@@ -927,7 +936,7 @@ pub fn handle_code_lens_resolve(world: WorldSnapshot, code_lens: CodeLens) -> Re
                 title,
                 command: "rust-analyzer.showReferences".into(),
                 arguments: Some(vec![
-                    to_value(&lens_params.text_document.uri).unwrap(),
+                    to_value(&lens_params.text_document_position_params.text_document.uri).unwrap(),
                     to_value(code_lens.range.start).unwrap(),
                     to_value(locations).unwrap(),
                 ]),
@@ -944,16 +953,16 @@ pub fn handle_code_lens_resolve(world: WorldSnapshot, code_lens: CodeLens) -> Re
 
 pub fn handle_document_highlight(
     world: WorldSnapshot,
-    params: req::TextDocumentPositionParams,
+    params: req::DocumentHighlightParams,
 ) -> Result<Option<Vec<DocumentHighlight>>> {
     let _p = profile("handle_document_highlight");
-    let file_id = params.text_document.try_conv_with(&world)?;
+    let file_id = params.text_document_position_params.text_document.try_conv_with(&world)?;
     let line_index = world.analysis().file_line_index(file_id)?;
 
-    let refs = match world
-        .analysis()
-        .find_all_refs(params.try_conv_with(&world)?, Some(SearchScope::single_file(file_id)))?
-    {
+    let refs = match world.analysis().find_all_refs(
+        params.text_document_position_params.try_conv_with(&world)?,
+        Some(SearchScope::single_file(file_id)),
+    )? {
         None => return Ok(None),
         Some(refs) => refs,
     };
diff --git a/crates/rust-analyzer/src/req.rs b/crates/rust-analyzer/src/req.rs
index ae3448892..0dae6bad4 100644
--- a/crates/rust-analyzer/src/req.rs
+++ b/crates/rust-analyzer/src/req.rs
@@ -8,14 +8,15 @@ pub use lsp_types::{
     notification::*, request::*, ApplyWorkspaceEditParams, CodeActionParams, CodeLens,
     CodeLensParams, CompletionParams, CompletionResponse, ConfigurationItem, ConfigurationParams,
     DiagnosticTag, DidChangeConfigurationParams, DidChangeWatchedFilesParams,
-    DidChangeWatchedFilesRegistrationOptions, DocumentOnTypeFormattingParams, DocumentSymbolParams,
-    DocumentSymbolResponse, FileSystemWatcher, Hover, InitializeResult, MessageType,
-    PartialResultParams, ProgressParams, ProgressParamsValue, ProgressToken,
-    PublishDiagnosticsParams, ReferenceParams, Registration, RegistrationParams, SelectionRange,
-    SelectionRangeParams, SemanticTokensParams, SemanticTokensRangeParams,
+    DidChangeWatchedFilesRegistrationOptions, DocumentHighlightParams,
+    DocumentOnTypeFormattingParams, DocumentSymbolParams, DocumentSymbolResponse,
+    FileSystemWatcher, GotoDefinitionParams, GotoDefinitionResponse, Hover, HoverParams,
+    InitializeResult, MessageType, PartialResultParams, ProgressParams, ProgressParamsValue,
+    ProgressToken, PublishDiagnosticsParams, ReferenceParams, Registration, RegistrationParams,
+    SelectionRange, SelectionRangeParams, SemanticTokensParams, SemanticTokensRangeParams,
     SemanticTokensRangeResult, SemanticTokensResult, ServerCapabilities, ShowMessageParams,
-    SignatureHelp, SymbolKind, TextDocumentEdit, TextDocumentPositionParams, TextEdit,
-    WorkDoneProgressParams, WorkspaceEdit, WorkspaceSymbolParams,
+    SignatureHelp, SignatureHelpParams, SymbolKind, TextDocumentEdit, TextDocumentPositionParams,
+    TextEdit, WorkDoneProgressParams, WorkspaceEdit, WorkspaceSymbolParams,
 };
 use std::path::PathBuf;
 
diff --git a/crates/rust-analyzer/src/semantic_tokens.rs b/crates/rust-analyzer/src/semantic_tokens.rs
index 71f4f58a3..2dc5cb119 100644
--- a/crates/rust-analyzer/src/semantic_tokens.rs
+++ b/crates/rust-analyzer/src/semantic_tokens.rs
@@ -4,64 +4,69 @@ use std::ops;
 
 use lsp_types::{Range, SemanticToken, SemanticTokenModifier, SemanticTokenType, SemanticTokens};
 
-pub(crate) const ATTRIBUTE: SemanticTokenType = SemanticTokenType::new("attribute");
-pub(crate) const BUILTIN_TYPE: SemanticTokenType = SemanticTokenType::new("builtinType");
-pub(crate) const ENUM_MEMBER: SemanticTokenType = SemanticTokenType::new("enumMember");
-pub(crate) const LIFETIME: SemanticTokenType = SemanticTokenType::new("lifetime");
-pub(crate) const TYPE_ALIAS: SemanticTokenType = SemanticTokenType::new("typeAlias");
-pub(crate) const UNION: SemanticTokenType = SemanticTokenType::new("union");
-pub(crate) const UNRESOLVED_REFERENCE: SemanticTokenType =
-    SemanticTokenType::new("unresolvedReference");
-pub(crate) const FORMAT_SPECIFIER: SemanticTokenType = SemanticTokenType::new("formatSpecifier");
-
-pub(crate) const CONSTANT: SemanticTokenModifier = SemanticTokenModifier::new("constant");
-pub(crate) const CONTROL_FLOW: SemanticTokenModifier = SemanticTokenModifier::new("controlFlow");
-pub(crate) const MUTABLE: SemanticTokenModifier = SemanticTokenModifier::new("mutable");
-pub(crate) const UNSAFE: SemanticTokenModifier = SemanticTokenModifier::new("unsafe");
-
-pub(crate) const SUPPORTED_TYPES: &[SemanticTokenType] = &[
-    SemanticTokenType::COMMENT,
-    SemanticTokenType::KEYWORD,
-    SemanticTokenType::STRING,
-    SemanticTokenType::NUMBER,
-    SemanticTokenType::REGEXP,
-    SemanticTokenType::OPERATOR,
-    SemanticTokenType::NAMESPACE,
-    SemanticTokenType::TYPE,
-    SemanticTokenType::STRUCT,
-    SemanticTokenType::CLASS,
-    SemanticTokenType::INTERFACE,
-    SemanticTokenType::ENUM,
-    SemanticTokenType::TYPE_PARAMETER,
-    SemanticTokenType::FUNCTION,
-    SemanticTokenType::MEMBER,
-    SemanticTokenType::PROPERTY,
-    SemanticTokenType::MACRO,
-    SemanticTokenType::VARIABLE,
-    SemanticTokenType::PARAMETER,
-    SemanticTokenType::LABEL,
-    ATTRIBUTE,
-    BUILTIN_TYPE,
-    ENUM_MEMBER,
-    LIFETIME,
-    TYPE_ALIAS,
-    UNION,
-    UNRESOLVED_REFERENCE,
-    FORMAT_SPECIFIER,
+macro_rules! define_semantic_token_types {
+    ($(($ident:ident, $string:literal)),*$(,)?) => {
+        $(pub(crate) const $ident: SemanticTokenType = SemanticTokenType::new($string);)*
+
+        pub(crate) const SUPPORTED_TYPES: &[SemanticTokenType] = &[
+            SemanticTokenType::COMMENT,
+            SemanticTokenType::KEYWORD,
+            SemanticTokenType::STRING,
+            SemanticTokenType::NUMBER,
+            SemanticTokenType::REGEXP,
+            SemanticTokenType::OPERATOR,
+            SemanticTokenType::NAMESPACE,
+            SemanticTokenType::TYPE,
+            SemanticTokenType::STRUCT,
+            SemanticTokenType::CLASS,
+            SemanticTokenType::INTERFACE,
+            SemanticTokenType::ENUM,
+            SemanticTokenType::TYPE_PARAMETER,
+            SemanticTokenType::FUNCTION,
+            SemanticTokenType::MEMBER,
+            SemanticTokenType::PROPERTY,
+            SemanticTokenType::MACRO,
+            SemanticTokenType::VARIABLE,
+            SemanticTokenType::PARAMETER,
+            SemanticTokenType::LABEL,
+            $($ident),*
+        ];
+    };
+}
+
+define_semantic_token_types![
+    (ATTRIBUTE, "attribute"),
+    (BUILTIN_TYPE, "builtinType"),
+    (ENUM_MEMBER, "enumMember"),
+    (LIFETIME, "lifetime"),
+    (TYPE_ALIAS, "typeAlias"),
+    (UNION, "union"),
+    (UNRESOLVED_REFERENCE, "unresolvedReference"),
+    (FORMAT_SPECIFIER, "formatSpecifier"),
 ];
 
-pub(crate) const SUPPORTED_MODIFIERS: &[SemanticTokenModifier] = &[
-    SemanticTokenModifier::DOCUMENTATION,
-    SemanticTokenModifier::DECLARATION,
-    SemanticTokenModifier::DEFINITION,
-    SemanticTokenModifier::STATIC,
-    SemanticTokenModifier::ABSTRACT,
-    SemanticTokenModifier::DEPRECATED,
-    SemanticTokenModifier::READONLY,
-    CONSTANT,
-    MUTABLE,
-    UNSAFE,
-    CONTROL_FLOW,
+macro_rules! define_semantic_token_modifiers {
+    ($(($ident:ident, $string:literal)),*$(,)?) => {
+        $(pub(crate) const $ident: SemanticTokenModifier = SemanticTokenModifier::new($string);)*
+
+        pub(crate) const SUPPORTED_MODIFIERS: &[SemanticTokenModifier] = &[
+            SemanticTokenModifier::DOCUMENTATION,
+            SemanticTokenModifier::DECLARATION,
+            SemanticTokenModifier::DEFINITION,
+            SemanticTokenModifier::STATIC,
+            SemanticTokenModifier::ABSTRACT,
+            SemanticTokenModifier::DEPRECATED,
+            SemanticTokenModifier::READONLY,
+            $($ident),*
+        ];
+    };
+}
+
+define_semantic_token_modifiers![
+    (CONSTANT, "constant"),
+    (CONTROL_FLOW, "controlFlow"),
+    (MUTABLE, "mutable"),
+    (UNSAFE, "unsafe"),
 ];
 
 #[derive(Default)]
diff --git a/crates/rust-analyzer/tests/heavy_tests/main.rs b/crates/rust-analyzer/tests/heavy_tests/main.rs
index f6245ddd4..a218da76d 100644
--- a/crates/rust-analyzer/tests/heavy_tests/main.rs
+++ b/crates/rust-analyzer/tests/heavy_tests/main.rs
@@ -4,8 +4,8 @@ use std::{collections::HashMap, path::PathBuf, time::Instant};
 
 use lsp_types::{
     CodeActionContext, DidOpenTextDocumentParams, DocumentFormattingParams, FormattingOptions,
-    PartialResultParams, Position, Range, TextDocumentItem, TextDocumentPositionParams,
-    WorkDoneProgressParams,
+    GotoDefinitionParams, HoverParams, PartialResultParams, Position, Range, TextDocumentItem,
+    TextDocumentPositionParams, WorkDoneProgressParams,
 };
 use rust_analyzer::req::{
     CodeActionParams, CodeActionRequest, Completion, CompletionParams, DidOpenTextDocument,
@@ -149,7 +149,7 @@ fn main() {}
               "cwd": server.path().join("foo")
             },
             {
-              "args": [ "check", "--package", "foo", "--test", "spam" ],
+              "args": [ "check", "--package", "foo" ],
               "extraArgs": [],
               "bin": "cargo",
               "env": {},
@@ -161,7 +161,7 @@ fn main() {}
               "cwd": server.path().join("foo")
             },
             {
-              "args": [ "test", "--package", "foo", "--test", "spam" ],
+              "args": [ "test", "--package", "foo" ],
               "extraArgs": [],
               "bin": "cargo",
               "env": {},
@@ -610,10 +610,14 @@ fn main() { message(); }
     })
     .server();
     server.wait_until_workspace_is_loaded();
-    let res = server.send_request::<GotoDefinition>(TextDocumentPositionParams::new(
-        server.doc_id("src/main.rs"),
-        Position::new(2, 15),
-    ));
+    let res = server.send_request::<GotoDefinition>(GotoDefinitionParams {
+        text_document_position_params: TextDocumentPositionParams::new(
+            server.doc_id("src/main.rs"),
+            Position::new(2, 15),
+        ),
+        work_done_progress_params: Default::default(),
+        partial_result_params: Default::default(),
+    });
     assert!(format!("{}", res).contains("hello.rs"));
 }
 
@@ -692,10 +696,13 @@ pub fn foo(_input: TokenStream) -> TokenStream {
     .root("bar")
     .server();
     server.wait_until_workspace_is_loaded();
-    let res = server.send_request::<HoverRequest>(TextDocumentPositionParams::new(
-        server.doc_id("foo/src/main.rs"),
-        Position::new(7, 9),
-    ));
+    let res = server.send_request::<HoverRequest>(HoverParams {
+        text_document_position_params: TextDocumentPositionParams::new(
+            server.doc_id("foo/src/main.rs"),
+            Position::new(7, 9),
+        ),
+        work_done_progress_params: Default::default(),
+    });
 
     let value = res.get("contents").unwrap().get("value").unwrap().to_string();
     assert_eq!(value, r#""```rust\nfoo::Bar\nfn bar()\n```""#)
diff --git a/crates/rust-analyzer/tests/heavy_tests/support.rs b/crates/rust-analyzer/tests/heavy_tests/support.rs
index e4fe3411a..8d47ee4f6 100644
--- a/crates/rust-analyzer/tests/heavy_tests/support.rs
+++ b/crates/rust-analyzer/tests/heavy_tests/support.rs
@@ -77,7 +77,11 @@ impl<'a> Project<'a> {
         let roots = self.roots.into_iter().map(|root| tmp_dir.path().join(root)).collect();
 
         let mut config = Config {
-            client_caps: ClientCapsConfig { location_link: true, ..Default::default() },
+            client_caps: ClientCapsConfig {
+                location_link: true,
+                code_action_literals: true,
+                ..Default::default()
+            },
             with_sysroot: self.with_sysroot,
             ..Config::default()
         };
diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md
index 3a337c574..cee916c09 100644
--- a/docs/dev/architecture.md
+++ b/docs/dev/architecture.md
@@ -46,7 +46,7 @@ can be quickly updated for small modifications.
 
 Some of the components of this repository are generated through automatic
 processes. `cargo xtask codegen` runs all generation tasks. Generated code is
-commited to the git repository.
+committed to the git repository.
 
 In particular, `cargo xtask codegen` generates:
 
@@ -114,7 +114,7 @@ is responsible for guessing a HIR for a particular source position.
 Underneath, HIR works on top of salsa, using a `HirDatabase` trait.
 
 `ra_hir_xxx` crates have a strong ECS flavor, in that they work with raw ids and
-directly query the databse.
+directly query the database.
 
 The top-level `ra_hir` façade crate wraps ids into a more OO-flavored API.
 
diff --git a/docs/dev/guide.md b/docs/dev/guide.md
index abbe4c154..c3252f1f6 100644
--- a/docs/dev/guide.md
+++ b/docs/dev/guide.md
@@ -26,7 +26,7 @@ properties hold:
 
 ## IDE API
 
-To see the bigger picture of how the IDE features works, let's take a look at the [`AnalysisHost`] and
+To see the bigger picture of how the IDE features work, let's take a look at the [`AnalysisHost`] and
 [`Analysis`] pair of types. `AnalysisHost` has three methods:
 
 * `default()` for creating an empty analysis instance
@@ -131,7 +131,7 @@ mapping between `SourceRoot` IDs (which are assigned by the client) and actual
 analyzer.
 
 Note that `mod`, `#[path]` and `include!()` can only reference files from the
-same source root. It is of course is possible to explicitly add extra files to
+same source root. It is of course possible to explicitly add extra files to
 the source root, even `/dev/random`.
 
 ## Language Server Protocol
@@ -192,7 +192,7 @@ task will be canceled as soon as the main loop calls `apply_change` on the
 [`schedule`]: https://github.com/rust-analyzer/rust-analyzer/blob/guide-2019-01/crates/ra_lsp_server/src/main_loop.rs#L426-L455
 [The task]: https://github.com/rust-analyzer/rust-analyzer/blob/guide-2019-01/crates/ra_lsp_server/src/main_loop/handlers.rs#L205-L223
 
-This concludes the overview of the analyzer's programing *interface*. Next, lets
+This concludes the overview of the analyzer's programing *interface*. Next, let's
 dig into the implementation!
 
 ## Salsa
@@ -480,7 +480,7 @@ throughout the analyzer:
 ## Source Map pattern
 
 Due to an obscure edge case in completion, IDE needs to know the syntax node of
-an use statement which imported the given completion candidate. We can't just
+a use statement which imported the given completion candidate. We can't just
 store the syntax node as a part of name resolution: this will break
 incrementality, due to the fact that syntax changes after every file
 modification.
diff --git a/docs/dev/syntax.md b/docs/dev/syntax.md
index 4dd1de659..33973ffec 100644
--- a/docs/dev/syntax.md
+++ b/docs/dev/syntax.md
@@ -35,7 +35,7 @@ The syntax tree consists of three layers:
 * AST
 
 Of these, only GreenNodes store the actual data, the other two layers are (non-trivial) views into green tree.
-Red-green terminology comes from Roslyn ([link](https://docs.microsoft.com/en-ie/archive/blogs/ericlippert/persistence-facades-and-roslyns-red-green-trees)) and gives the name to the `rowan` library. Green and syntax nodes are defined in rowan, ast is defined in rust-analyzer.
+Red-green terminology comes from Roslyn ([link](https://ericlippert.com/2012/06/08/red-green-trees/)) and gives the name to the `rowan` library. Green and syntax nodes are defined in rowan, ast is defined in rust-analyzer.
 
 Syntax trees are a semi-transient data structure.
 In general, frontend does not keep syntax trees for all files in memory.
diff --git a/docs/user/assists.md b/docs/user/assists.md
index 6c6943622..ee515949e 100644
--- a/docs/user/assists.md
+++ b/docs/user/assists.md
@@ -175,7 +175,9 @@ trait Trait<T> {
 }
 
 impl Trait<u32> for () {
-    fn foo(&self) -> u32 { todo!() }
+    fn foo(&self) -> u32 {
+        todo!()
+    }
 
 }
 ```
@@ -695,3 +697,21 @@ use std::┃collections::HashMap;
 // AFTER
 use std::{collections::HashMap};
 ```
+
+## `unwrap_block`
+
+This assist removes if...else, for, while and loop control statements to just keep the body.
+
+```rust
+// BEFORE
+fn foo() {
+    if true {┃
+        println!("foo");
+    }
+}
+
+// AFTER
+fn foo() {
+    println!("foo");
+}
+```
diff --git a/docs/user/features.md b/docs/user/features.md
index 56d2969fd..b9a365fc1 100644
--- a/docs/user/features.md
+++ b/docs/user/features.md
@@ -140,8 +140,8 @@ space or `;` depending on the return type of the function.
 When completing a function call, `()` are automatically inserted. If a function
 takes arguments, the cursor is positioned inside the parenthesis.
 
-There are postifx completions, which can be triggerd by typing something like
-`foo().if`. The word after `.` determines postifx completion. Possible variants are:
+There are postfix completions, which can be triggered by typing something like
+`foo().if`. The word after `.` determines postfix completion. Possible variants are:
 
 - `expr.if` -> `if expr {}`
 - `expr.match` -> `match expr {}`
diff --git a/docs/user/readme.adoc b/docs/user/readme.adoc
index 76d065d35..b1af72ce6 100644
--- a/docs/user/readme.adoc
+++ b/docs/user/readme.adoc
@@ -111,7 +111,7 @@ Here are some useful self-diagnostic commands:
 === rust-analyzer Language Server Binary
 
 Other editors generally require the `rust-analyzer` binary to be in `$PATH`.
-You can download the pre-built binary from the https://github.com/rust-analyzer/rust-analyzer/releases[releases] page. Typically, you then need to rename the binary for your platform, e.g. `rust-analyzer-mac` if you're on Mac OS, to `rust-analzyer` and make it executable in addition to moving it into a directory in your `$PATH`.
+You can download the pre-built binary from the https://github.com/rust-analyzer/rust-analyzer/releases[releases] page. Typically, you then need to rename the binary for your platform, e.g. `rust-analyzer-mac` if you're on Mac OS, to `rust-analyzer` and make it executable in addition to moving it into a directory in your `$PATH`.
 
 On Linux to install the `rust-analyzer` binary into `~/.local/bin`, this commands could be used
 
@@ -169,13 +169,15 @@ The are several LSP client implementations for vim:
 
 1. Install coc.nvim by following the instructions at
    https://github.com/neoclide/coc.nvim[coc.nvim]
-   (nodejs required)
+   (Node.js required)
 2. Run `:CocInstall coc-rust-analyzer` to install
    https://github.com/fannheyward/coc-rust-analyzer[coc-rust-analyzer],
    this extension implements _most_ of the features supported in the VSCode extension:
+   * automatically install and upgrade stable/nightly releases
    * same configurations as VSCode extension, `rust-analyzer.serverPath`, `rust-analyzer.cargo.features` etc.
    * same commands too, `rust-analyzer.analyzerStatus`, `rust-analyzer.ssr` etc.
-   * highlighting and inlay_hints are not implemented yet
+   * inlay hints for method chaining support, _Neovim Only_
+   * semantic highlighting is not implemented yet
 
 ==== LanguageClient-neovim
 
@@ -195,11 +197,11 @@ let g:LanguageClient_serverCommands = {
 ==== YouCompleteMe
 
 1. Install YouCompleteMe by following the instructions
-  https://ycm-core.github.io/YouCompleteMe/#rust-semantic-completion[here]
+  https://github.com/ycm-core/lsp-examples#rust-rust-analyzer[here]
 
 2. Configure by adding this to your vim/neovim config file (replacing the existing Rust-specific line if it exists):
 +
-[source,vim]   
+[source,vim]
 ----
 let g:ycm_language_server =
 \ [
@@ -212,6 +214,21 @@ let g:ycm_language_server =
 \ ]
 ----
 
+==== ALE
+
+To add the LSP server to https://github.com/dense-analysis/ale[ale]:
+
+[source,vim]
+----
+call ale#linter#Define('rust', {
+\   'name': 'rust-analyzer',
+\   'lsp': 'stdio',
+\   'executable': 'rust-analyzer',
+\   'command': '%e',
+\   'project_root': '.',
+\})
+----
+
 ==== nvim-lsp
 
 NeoVim 0.5 (not yet released) has built-in language server support.
@@ -229,12 +246,21 @@ You also need the `LSP` package. To install it:
    * Type `Install Package Control`, press enter
 2. In the command palette, run `Package control: Install package`, and in the list that pops up, type `LSP` and press enter.
 
-Finally, with your Rust project open, in the command palette, run `LSP: Enable Language Server In Project` or `LSP: Enable Language Server Globally`, then select `rust-analyzer` in the list that pops up to enable the rust-analyzer LSP. The latter means that rust-analzyer is enabled by default in Rust projects.
+Finally, with your Rust project open, in the command palette, run `LSP: Enable Language Server In Project` or `LSP: Enable Language Server Globally`, then select `rust-analyzer` in the list that pops up to enable the rust-analyzer LSP. The latter means that rust-analyzer is enabled by default in Rust projects.
 
-If it worked, you should see "rust-analzyer, Line X, Column Y" on the left side of the bottom bar, and after waiting a bit, functionality like tooltips on hovering over variables should become available.
+If it worked, you should see "rust-analyzer, Line X, Column Y" on the left side of the bottom bar, and after waiting a bit, functionality like tooltips on hovering over variables should become available.
 
 If you get an error saying `No such file or directory: 'rust-analyzer'`, see the <<rust-analyzer-language-server-binary,`rust-analyzer` binary>> section on installing the language server binary.
 
+=== Gnome Builder
+
+Prerequisites: You have installed the <<rust-analyzer-language-server-binary,`rust-analyzer` binary>>.
+
+Gnome Builder currently has support for RLS, and there's no way to configure the language server executable. A future version might support `rust-analyzer` out of the box.
+
+1. Rename, symlink or copy the `rust-analyzer` binary to `rls` and place it somewhere Builder can find (in `PATH`, or under `~/.cargo/bin`).
+2. Enable the Rust Builder plugin.
+
 == Usage
 
 See https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/features.md[features.md].
diff --git a/editors/code/package.json b/editors/code/package.json
index b8aaa07d8..7ef727b9d 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -27,6 +27,7 @@
     "scripts": {
         "vscode:prepublish": "tsc && rollup -c",
         "package": "vsce package -o rust-analyzer.vsix",
+        "build": "tsc",
         "watch": "tsc --watch",
         "lint": "tsfmt --verify && eslint -c .eslintrc.js --ext ts ./src",
         "fix": " tsfmt -r       && eslint -c .eslintrc.js --ext ts ./src --fix"
@@ -204,11 +205,6 @@
                     "default": [],
                     "description": "Paths to exclude from analysis."
                 },
-                "rust-analyzer.notifications.workspaceLoaded": {
-                    "type": "boolean",
-                    "default": true,
-                    "markdownDescription": "Whether to show `workspace loaded` message."
-                },
                 "rust-analyzer.notifications.cargoTomlNotFound": {
                     "type": "boolean",
                     "default": true,
@@ -388,6 +384,28 @@
                     "description": "Enable Proc macro support, cargo.loadOutDirsFromCheck must be enabled.",
                     "type": "boolean",
                     "default": false
+                },
+                "rust-analyzer.debug.engine": {
+                    "type": "string",
+                    "enum": [
+                        "auto",
+                        "vadimcn.vscode-lldb",
+                        "ms-vscode.cpptools"
+                    ],
+                    "default": "auto",
+                    "description": "Preffered debug engine.",
+                    "markdownEnumDescriptions": [
+                        "First try to use [CodeLLDB](https://marketplace.visualstudio.com/items?itemName=vadimcn.vscode-lldb), if it's not installed try to use [MS C++ tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools).",
+                        "Use [CodeLLDB](https://marketplace.visualstudio.com/items?itemName=vadimcn.vscode-lldb)",
+                        "Use [MS C++ tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools)"
+                    ]
+                },
+                "rust-analyzer.debug.sourceFileMap": {
+                    "type": "object",
+                    "description": "Optional source file mappings passed to the debug engine.",
+                    "default": {
+                        "/rustc/<id>": "${env:USERPROFILE}/.rustup/toolchains/<toolchain-id>/lib/rustlib/src/rust"
+                    }
                 }
             }
         },
diff --git a/editors/code/src/cargo.ts b/editors/code/src/cargo.ts
new file mode 100644
index 000000000..a328ba9bd
--- /dev/null
+++ b/editors/code/src/cargo.ts
@@ -0,0 +1,106 @@
+import * as cp from 'child_process';
+import * as readline from 'readline';
+import { OutputChannel } from 'vscode';
+
+interface CompilationArtifact {
+    fileName: string;
+    name: string;
+    kind: string;
+    isTest: boolean;
+}
+
+export class Cargo {
+    rootFolder: string;
+    env?: Record<string, string>;
+    output: OutputChannel;
+
+    public constructor(cargoTomlFolder: string, output: OutputChannel, env: Record<string, string> | undefined = undefined) {
+        this.rootFolder = cargoTomlFolder;
+        this.output = output;
+        this.env = env;
+    }
+
+    public async artifactsFromArgs(cargoArgs: string[]): Promise<CompilationArtifact[]> {
+        const artifacts: CompilationArtifact[] = [];
+
+        try {
+            await this.runCargo(cargoArgs,
+                message => {
+                    if (message.reason === 'compiler-artifact' && message.executable) {
+                        const isBinary = message.target.crate_types.includes('bin');
+                        const isBuildScript = message.target.kind.includes('custom-build');
+                        if ((isBinary && !isBuildScript) || message.profile.test) {
+                            artifacts.push({
+                                fileName: message.executable,
+                                name: message.target.name,
+                                kind: message.target.kind[0],
+                                isTest: message.profile.test
+                            });
+                        }
+                    }
+                    else if (message.reason === 'compiler-message') {
+                        this.output.append(message.message.rendered);
+                    }
+                },
+                stderr => {
+                    this.output.append(stderr);
+                }
+            );
+        }
+        catch (err) {
+            this.output.show(true);
+            throw new Error(`Cargo invocation has failed: ${err}`);
+        }
+
+        return artifacts;
+    }
+
+    public async executableFromArgs(args: string[]): Promise<string> {
+        const cargoArgs = [...args]; // to remain  args unchanged
+        cargoArgs.push("--message-format=json");
+
+        const artifacts = await this.artifactsFromArgs(cargoArgs);
+
+        if (artifacts.length === 0) {
+            throw new Error('No compilation artifacts');
+        } else if (artifacts.length > 1) {
+            throw new Error('Multiple compilation artifacts are not supported.');
+        }
+
+        return artifacts[0].fileName;
+    }
+
+    runCargo(
+        cargoArgs: string[],
+        onStdoutJson: (obj: any) => void,
+        onStderrString: (data: string) => void
+    ): Promise<number> {
+        return new Promise<number>((resolve, reject) => {
+            const cargo = cp.spawn('cargo', cargoArgs, {
+                stdio: ['ignore', 'pipe', 'pipe'],
+                cwd: this.rootFolder,
+                env: this.env,
+            });
+
+            cargo.on('error', err => {
+                reject(new Error(`could not launch cargo: ${err}`));
+            });
+            cargo.stderr.on('data', chunk => {
+                onStderrString(chunk.toString());
+            });
+
+            const rl = readline.createInterface({ input: cargo.stdout });
+            rl.on('line', line => {
+                const message = JSON.parse(line);
+                onStdoutJson(message);
+            });
+
+            cargo.on('exit', (exitCode, _) => {
+                if (exitCode === 0)
+                    resolve(exitCode);
+                else
+                    reject(new Error(`exit code: ${exitCode}.`));
+            });
+        });
+    }
+}
\ No newline at end of file
diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts
index 2635a1440..d77e8188c 100644
--- a/editors/code/src/commands/runnables.ts
+++ b/editors/code/src/commands/runnables.ts
@@ -1,8 +1,10 @@
 import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
 import * as ra from '../rust-analyzer-api';
+import * as os from "os";
 
 import { Ctx, Cmd } from '../ctx';
+import { Cargo } from '../cargo';
 
 export function run(ctx: Ctx): Cmd {
     let prevRunnable: RunnableQuickPick | undefined;
@@ -62,25 +64,69 @@ export function runSingle(ctx: Ctx): Cmd {
     };
 }
 
+function getLldbDebugConfig(config: ra.Runnable, sourceFileMap: Record<string, string>): vscode.DebugConfiguration {
+    return {
+        type: "lldb",
+        request: "launch",
+        name: config.label,
+        cargo: {
+            args: config.args,
+        },
+        args: config.extraArgs,
+        cwd: config.cwd,
+        sourceMap: sourceFileMap
+    };
+}
+
+const debugOutput = vscode.window.createOutputChannel("Debug");
+
+async function getCppvsDebugConfig(config: ra.Runnable, sourceFileMap: Record<string, string>): Promise<vscode.DebugConfiguration> {
+    debugOutput.clear();
+
+    const cargo = new Cargo(config.cwd || '.', debugOutput);
+    const executable = await cargo.executableFromArgs(config.args);
+
+    // if we are here, there were no compilation errors.
+    return {
+        type: (os.platform() === "win32") ? "cppvsdbg" : 'cppdbg',
+        request: "launch",
+        name: config.label,
+        program: executable,
+        args: config.extraArgs,
+        cwd: config.cwd,
+        sourceFileMap: sourceFileMap,
+    };
+}
+
 export function debugSingle(ctx: Ctx): Cmd {
     return async (config: ra.Runnable) => {
         const editor = ctx.activeRustEditor;
         if (!editor) return;
-        if (!vscode.extensions.getExtension("vadimcn.vscode-lldb")) {
-            vscode.window.showErrorMessage("Install `vadimcn.vscode-lldb` extension for debugging");
+
+        const lldbId = "vadimcn.vscode-lldb";
+        const cpptoolsId = "ms-vscode.cpptools";
+
+        const debugEngineId = ctx.config.debug.engine;
+        let debugEngine = null;
+        if (debugEngineId === "auto") {
+            debugEngine = vscode.extensions.getExtension(lldbId);
+            if (!debugEngine) {
+                debugEngine = vscode.extensions.getExtension(cpptoolsId);
+            }
+        }
+        else {
+            debugEngine = vscode.extensions.getExtension(debugEngineId);
+        }
+
+        if (!debugEngine) {
+            vscode.window.showErrorMessage(`Install [CodeLLDB](https://marketplace.visualstudio.com/items?itemName=${lldbId})`
+                + ` or [MS C++ tools](https://marketplace.visualstudio.com/items?itemName=${cpptoolsId}) extension for debugging.`);
             return;
         }
 
-        const debugConfig = {
-            type: "lldb",
-            request: "launch",
-            name: config.label,
-            cargo: {
-                args: config.args,
-            },
-            args: config.extraArgs,
-            cwd: config.cwd
-        };
+        const debugConfig = lldbId === debugEngine.id
+            ? getLldbDebugConfig(config, ctx.config.debug.sourceFileMap)
+            : await getCppvsDebugConfig(config, ctx.config.debug.sourceFileMap);
 
         return vscode.debug.startDebugging(undefined, debugConfig);
     };
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 3b2eec8ba..110e54180 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -92,7 +92,6 @@ export class Config {
     get askBeforeDownload() { return this.get<boolean>("updates.askBeforeDownload"); }
     get traceExtension() { return this.get<boolean>("trace.extension"); }
 
-
     get inlayHints() {
         return {
             typeHints: this.get<boolean>("inlayHints.typeHints"),
@@ -107,4 +106,12 @@ export class Config {
             command: this.get<string>("checkOnSave.command"),
         };
     }
+
+    get debug() {
+        return {
+            engine: this.get<string>("debug.engine"),
+            sourceFileMap: this.get<Record<string, string>>("debug.sourceFileMap"),
+        };
+    }
+
 }
diff --git a/xtask/src/ast_src.rs b/xtask/src/ast_src.rs
index 9c02f7c6f..028f7cbe1 100644
--- a/xtask/src/ast_src.rs
+++ b/xtask/src/ast_src.rs
@@ -162,7 +162,7 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "RECORD_LIT",
         "RECORD_FIELD_LIST",
         "RECORD_FIELD",
-        "TRY_BLOCK_EXPR",
+        "EFFECT_EXPR",
         "BOX_EXPR",
         // postfix
         "CALL_EXPR",
@@ -177,7 +177,6 @@ pub(crate) const KINDS_SRC: KindsSrc = KindsSrc {
         "PREFIX_EXPR",
         "RANGE_EXPR", // just weird
         "BIN_EXPR",
-        "BLOCK",
         "EXTERN_BLOCK",
         "EXTERN_ITEM_LIST",
         "ENUM_VARIANT",
@@ -440,7 +439,7 @@ pub(crate) const AST_SRC: AstSrc = AstSrc {
         }
         struct IfExpr: AttrsOwner { T![if], Condition }
         struct LoopExpr: AttrsOwner, LoopBodyOwner { T![loop] }
-        struct TryBlockExpr: AttrsOwner { T![try], body: BlockExpr }
+        struct EffectExpr: AttrsOwner { Label, T![try], T![unsafe], T![async], BlockExpr }
         struct ForExpr: AttrsOwner, LoopBodyOwner {
             T![for],
             Pat,
@@ -451,7 +450,9 @@ pub(crate) const AST_SRC: AstSrc = AstSrc {
         struct ContinueExpr: AttrsOwner { T![continue], T![lifetime] }
         struct BreakExpr: AttrsOwner { T![break], T![lifetime], Expr }
         struct Label { T![lifetime] }
-        struct BlockExpr: AttrsOwner { Label, T![unsafe], Block  }
+        struct BlockExpr: AttrsOwner, ModuleItemOwner {
+            T!['{'], statements: [Stmt], Expr, T!['}'],
+        }
         struct ReturnExpr: AttrsOwner { Expr }
         struct CallExpr: ArgListOwner { Expr }
         struct MethodCallExpr: AttrsOwner, ArgListOwner {
@@ -460,7 +461,7 @@ pub(crate) const AST_SRC: AstSrc = AstSrc {
         struct IndexExpr: AttrsOwner { T!['['], T![']'] }
         struct FieldExpr: AttrsOwner { Expr, T![.], NameRef }
         struct AwaitExpr: AttrsOwner { Expr, T![.], T![await] }
-        struct TryExpr: AttrsOwner { T![try], Expr }
+        struct TryExpr: AttrsOwner { Expr, T![?] }
         struct CastExpr: AttrsOwner { Expr, T![as], TypeRef }
         struct RefExpr: AttrsOwner { T![&], T![raw], T![mut], Expr }
         struct PrefixExpr: AttrsOwner { /*PrefixOp,*/ Expr }
@@ -556,12 +557,6 @@ pub(crate) const AST_SRC: AstSrc = AstSrc {
             T![;],
         }
         struct Condition { T![let], Pat, T![=], Expr }
-        struct Block: AttrsOwner, ModuleItemOwner {
-            T!['{'],
-            statements: [Stmt],
-            Expr,
-            T!['}'],
-        }
         struct ParamList {
             T!['('],
             SelfParam,
@@ -595,7 +590,7 @@ pub(crate) const AST_SRC: AstSrc = AstSrc {
             qualifier: Path,
         }
         struct PathSegment {
-            T![::], T![<], NameRef, TypeArgList, ParamList, RetType, PathType, T![>]
+            T![::], T![crate], T![self], T![super], T![<], NameRef, TypeArgList, ParamList, RetType, PathType, T![>]
         }
         struct TypeArgList {
             T![::],
@@ -722,7 +717,7 @@ pub(crate) const AST_SRC: AstSrc = AstSrc {
             FieldExpr,
             AwaitExpr,
             TryExpr,
-            TryBlockExpr,
+            EffectExpr,
             CastExpr,
             RefExpr,
             PrefixExpr,
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs
index e9dc09552..8028575c5 100644
--- a/xtask/src/codegen/gen_syntax.rs
+++ b/xtask/src/codegen/gen_syntax.rs
@@ -432,6 +432,7 @@ impl Field<'_> {
                     ":" => "colon",
                     "::" => "coloncolon",
                     "#" => "pound",
+                    "?" => "question_mark",
                     _ => name,
                 };
                 format_ident!("{}_token", name)
diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs
index a56eeef8d..aef68089e 100644
--- a/xtask/src/dist.rs
+++ b/xtask/src/dist.rs
@@ -50,21 +50,19 @@ fn dist_server(nightly: bool) -> Result<()> {
     if cfg!(target_os = "linux") {
         std::env::set_var("CC", "clang");
         run!(
-            "cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release
-             --target x86_64-unknown-linux-musl
-            "
+            "cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release"
             // We'd want to add, but that requires setting the right linker somehow
             // --features=jemalloc
         )?;
         if !nightly {
-            run!("strip ./target/x86_64-unknown-linux-musl/release/rust-analyzer")?;
+            run!("strip ./target/release/rust-analyzer")?;
         }
     } else {
         run!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release")?;
     }
 
     let (src, dst) = if cfg!(target_os = "linux") {
-        ("./target/x86_64-unknown-linux-musl/release/rust-analyzer", "./dist/rust-analyzer-linux")
+        ("./target/release/rust-analyzer", "./dist/rust-analyzer-linux")
     } else if cfg!(target_os = "windows") {
         ("./target/release/rust-analyzer.exe", "./dist/rust-analyzer-windows.exe")
     } else if cfg!(target_os = "macos") {
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index ec824a518..2b7a461e5 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -10,23 +10,19 @@ pub mod pre_commit;
 pub mod codegen;
 mod ast_src;
 
-use anyhow::Context;
 use std::{
     env,
-    io::Write,
     path::{Path, PathBuf},
-    process::{Command, Stdio},
 };
+
 use walkdir::{DirEntry, WalkDir};
 
 use crate::{
     codegen::Mode,
-    not_bash::{date_iso, fs2, pushd, rm_rf, run},
+    not_bash::{date_iso, fs2, pushd, pushenv, rm_rf, run},
 };
 
-pub use anyhow::Result;
-
-const TOOLCHAIN: &str = "stable";
+pub use anyhow::{bail, Context as _, Result};
 
 pub fn project_root() -> PathBuf {
     Path::new(
@@ -55,54 +51,44 @@ pub fn rust_files(path: &Path) -> impl Iterator<Item = PathBuf> {
 
 pub fn run_rustfmt(mode: Mode) -> Result<()> {
     let _dir = pushd(project_root());
+    let _e = pushenv("RUSTUP_TOOLCHAIN", "stable");
     ensure_rustfmt()?;
-
-    let check = if mode == Mode::Verify { "--check" } else { "" };
-    run!("rustup run {} -- cargo fmt -- {}", TOOLCHAIN, check)?;
+    match mode {
+        Mode::Overwrite => run!("cargo fmt"),
+        Mode::Verify => run!("cargo fmt -- --check"),
+    }?;
     Ok(())
 }
 
 fn reformat(text: impl std::fmt::Display) -> Result<String> {
+    let _e = pushenv("RUSTUP_TOOLCHAIN", "stable");
     ensure_rustfmt()?;
-    let mut rustfmt = Command::new("rustup")
-        .args(&["run", TOOLCHAIN, "--", "rustfmt", "--config-path"])
-        .arg(project_root().join("rustfmt.toml"))
-        .args(&["--config", "fn_single_line=true"])
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .spawn()?;
-    write!(rustfmt.stdin.take().unwrap(), "{}", text)?;
-    let output = rustfmt.wait_with_output()?;
-    let stdout = String::from_utf8(output.stdout)?;
+    let stdout = run!(
+        "rustfmt --config-path {} --config fn_single_line=true", project_root().join("rustfmt.toml").display();
+        <text.to_string().as_bytes()
+    )?;
     let preamble = "Generated file, do not edit by hand, see `xtask/src/codegen`";
-    Ok(format!("//! {}\n\n{}", preamble, stdout))
+    Ok(format!("//! {}\n\n{}\n", preamble, stdout))
 }
 
 fn ensure_rustfmt() -> Result<()> {
-    match Command::new("rustup")
-        .args(&["run", TOOLCHAIN, "--", "cargo", "fmt", "--version"])
-        .stderr(Stdio::null())
-        .stdout(Stdio::null())
-        .status()
-    {
-        Ok(status) if status.success() => return Ok(()),
-        _ => (),
-    };
-    run!("rustup toolchain install {}", TOOLCHAIN)?;
-    run!("rustup component add rustfmt --toolchain {}", TOOLCHAIN)?;
+    let out = run!("rustfmt --version")?;
+    if !out.contains("stable") {
+        bail!(
+            "Failed to run rustfmt from toolchain 'stable'. \
+             Please run `rustup component add rustfmt --toolchain stable` to install it.",
+        )
+    }
     Ok(())
 }
 
 pub fn run_clippy() -> Result<()> {
-    match Command::new("rustup")
-        .args(&["run", TOOLCHAIN, "--", "cargo", "clippy", "--version"])
-        .stderr(Stdio::null())
-        .stdout(Stdio::null())
-        .status()
-    {
-        Ok(status) if status.success() => (),
-        _ => install_clippy().context("install clippy")?,
-    };
+    if run!("cargo clippy --version").is_err() {
+        bail!(
+            "Failed run cargo clippy. \
+            Please run `rustup component add clippy` to install it.",
+        )
+    }
 
     let allowed_lints = [
         "clippy::collapsible_if",
@@ -110,27 +96,24 @@ pub fn run_clippy() -> Result<()> {
         "clippy::nonminimal_bool",
         "clippy::redundant_pattern_matching",
     ];
-    run!(
-        "rustup run {} -- cargo clippy --all-features --all-targets -- -A {}",
-        TOOLCHAIN,
-        allowed_lints.join(" -A ")
-    )?;
-    Ok(())
-}
-
-fn install_clippy() -> Result<()> {
-    run!("rustup toolchain install {}", TOOLCHAIN)?;
-    run!("rustup component add clippy --toolchain {}", TOOLCHAIN)?;
+    run!("cargo clippy --all-features --all-targets -- -A {}", allowed_lints.join(" -A "))?;
     Ok(())
 }
 
 pub fn run_fuzzer() -> Result<()> {
     let _d = pushd("./crates/ra_syntax");
+    let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly");
     if run!("cargo fuzz --help").is_err() {
         run!("cargo install cargo-fuzz")?;
     };
 
-    run!("rustup run nightly -- cargo fuzz run parser")?;
+    // Expecting nightly rustc
+    let out = run!("rustc --version")?;
+    if !out.contains("nightly") {
+        bail!("fuzz tests require nightly rustc")
+    }
+
+    run!("cargo fuzz run parser")?;
     Ok(())
 }
 
diff --git a/xtask/src/not_bash.rs b/xtask/src/not_bash.rs
index ef1699934..a6431e586 100644
--- a/xtask/src/not_bash.rs
+++ b/xtask/src/not_bash.rs
@@ -3,6 +3,8 @@
 use std::{
     cell::RefCell,
     env,
+    ffi::OsString,
+    io::Write,
     path::{Path, PathBuf},
     process::{Command, Stdio},
 };
@@ -57,7 +59,10 @@ macro_rules! _run {
         run!($($expr),*; echo = true)
     };
     ($($expr:expr),* ; echo = $echo:expr) => {
-        $crate::not_bash::run_process(format!($($expr),*), $echo)
+        $crate::not_bash::run_process(format!($($expr),*), $echo, None)
+    };
+    ($($expr:expr),* ;  <$stdin:expr) => {
+        $crate::not_bash::run_process(format!($($expr),*), false, Some($stdin))
     };
 }
 pub(crate) use _run as run;
@@ -77,6 +82,21 @@ impl Drop for Pushd {
     }
 }
 
+pub struct Pushenv {
+    _p: (),
+}
+
+pub fn pushenv(var: &str, value: &str) -> Pushenv {
+    Env::with(|env| env.pushenv(var.into(), value.into()));
+    Pushenv { _p: () }
+}
+
+impl Drop for Pushenv {
+    fn drop(&mut self) {
+        Env::with(|env| env.popenv())
+    }
+}
+
 pub fn rm_rf(path: impl AsRef<Path>) -> Result<()> {
     let path = path.as_ref();
     if !path.exists() {
@@ -90,15 +110,15 @@ pub fn rm_rf(path: impl AsRef<Path>) -> Result<()> {
 }
 
 #[doc(hidden)]
-pub fn run_process(cmd: String, echo: bool) -> Result<String> {
-    run_process_inner(&cmd, echo).with_context(|| format!("process `{}` failed", cmd))
+pub fn run_process(cmd: String, echo: bool, stdin: Option<&[u8]>) -> Result<String> {
+    run_process_inner(&cmd, echo, stdin).with_context(|| format!("process `{}` failed", cmd))
 }
 
 pub fn date_iso() -> Result<String> {
     run!("date --iso --utc")
 }
 
-fn run_process_inner(cmd: &str, echo: bool) -> Result<String> {
+fn run_process_inner(cmd: &str, echo: bool, stdin: Option<&[u8]>) -> Result<String> {
     let mut args = shelx(cmd);
     let binary = args.remove(0);
     let current_dir = Env::with(|it| it.cwd().to_path_buf());
@@ -107,12 +127,17 @@ fn run_process_inner(cmd: &str, echo: bool) -> Result<String> {
         println!("> {}", cmd)
     }
 
-    let output = Command::new(binary)
-        .args(args)
-        .current_dir(current_dir)
-        .stdin(Stdio::null())
-        .stderr(Stdio::inherit())
-        .output()?;
+    let mut command = Command::new(binary);
+    command.args(args).current_dir(current_dir).stderr(Stdio::inherit());
+    let output = match stdin {
+        None => command.stdin(Stdio::null()).output(),
+        Some(stdin) => {
+            command.stdin(Stdio::piped()).stdout(Stdio::piped());
+            let mut process = command.spawn()?;
+            process.stdin.take().unwrap().write_all(stdin)?;
+            process.wait_with_output()
+        }
+    }?;
     let stdout = String::from_utf8(output.stdout)?;
 
     if echo {
@@ -133,13 +158,15 @@ fn shelx(cmd: &str) -> Vec<String> {
 
 struct Env {
     pushd_stack: Vec<PathBuf>,
+    pushenv_stack: Vec<(OsString, Option<OsString>)>,
 }
 
 impl Env {
     fn with<F: FnOnce(&mut Env) -> T, T>(f: F) -> T {
         thread_local! {
             static ENV: RefCell<Env> = RefCell::new(Env {
-                pushd_stack: vec![env::current_dir().unwrap()]
+                pushd_stack: vec![env::current_dir().unwrap()],
+                pushenv_stack: vec![],
             });
         }
         ENV.with(|it| f(&mut *it.borrow_mut()))
@@ -154,6 +181,17 @@ impl Env {
         self.pushd_stack.pop().unwrap();
         env::set_current_dir(self.cwd()).unwrap();
     }
+    fn pushenv(&mut self, var: OsString, value: OsString) {
+        self.pushenv_stack.push((var.clone(), env::var_os(&var)));
+        env::set_var(var, value)
+    }
+    fn popenv(&mut self) {
+        let (var, value) = self.pushenv_stack.pop().unwrap();
+        match value {
+            None => env::remove_var(var),
+            Some(value) => env::set_var(var, value),
+        }
+    }
     fn cwd(&self) -> &Path {
         self.pushd_stack.last().unwrap()
     }