Merge branch 'master' of github.com:rust-analyzer/rust-analyzer

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",
@@ -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",
 ]
@@ -315,6 +316,15 @@ dependencies = [
  "log",
 ]
 
+[[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"
@@ -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.74.0"
+version = "0.74.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "820f746e5716ab9a2d664794636188bd003023b72e55404ee27105dc22869922"
+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",
@@ -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",
@@ -1606,6 +1616,16 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[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"

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 {

crates/ra_assists/src/doc_tests/generated.rs

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

crates/ra_assists/src/handlers/add_missing_impl_members.rs

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

crates/ra_assists/src/handlers/early_return.rs

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

crates/ra_assists/src/handlers/inline_local_variable.rs

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

crates/ra_assists/src/handlers/introduce_variable.rs

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

crates/ra_assists/src/handlers/move_guard.rs

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

crates/ra_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;

crates/ra_fmt/src/lib.rs

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

crates/ra_hir/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};

crates/ra_hir/src/semantics.rs

@@ -8,7 +8,7 @@ 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};
@@ -246,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)
     }

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)
     }
 

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,
+    body::{CfgExpander, LowerCtx},
-    type_ref::TypeRef, visibility::RawVisibility, EnumId, HasModule, LocalEnumVariantId,
+    db::DefDatabase,
-    LocalFieldId, Lookup, ModuleId, StructId, UnionId, VariantId,
+    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())),
                     },
                 );

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,

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,6 +203,16 @@ impl ExprCollector<'_> {
 
                 self.alloc_expr(Expr::If { condition, then_branch, else_branch }, 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());
@@ -237,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,
@@ -343,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) => {
@@ -365,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)
             }
@@ -464,19 +500,15 @@ impl ExprCollector<'_> {
         }
     }
 
-    fn collect_block(&mut self, expr: ast::BlockExpr) -> ExprId {
+    fn collect_block(&mut self, block: ast::BlockExpr) -> ExprId {
-        let syntax_node_ptr = AstPtr::new(&expr.clone().into());
+        let syntax_node_ptr = AstPtr::new(&block.clone().into());
-        let block = match expr.block() {
-            Some(block) => block,
-            None => return self.alloc_expr(Expr::Missing, syntax_node_ptr),
-        };
         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 }
                 }
@@ -487,7 +519,7 @@ impl ExprCollector<'_> {
         self.alloc_expr(Expr::Block { statements, tail }, syntax_node_ptr)
     }
 
-    fn collect_block_items(&mut self, block: &ast::Block) {
+    fn collect_block_items(&mut self, block: &ast::BlockExpr) {
         let container = ContainerId::DefWithBodyId(self.def);
         for item in block.items() {
             let (def, name): (ModuleDefId, Option<ast::Name>) = match item {

crates/ra_hir_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_trait = src.value.target_trait().map(|it| TypeRef::from_ast(&lower_ctx, it));
-        let target_type = TypeRef::from_ast_opt(src.value.target_type());
+        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 }

crates/ra_hir_def/src/expr.rs

@@ -101,6 +101,9 @@ pub enum Expr {
     Try {
         expr: ExprId,
     },
+    TryBlock {
+        body: ExprId,
+    },
     Cast {
         expr: ExprId,
         type_ref: TypeRef,
@@ -236,6 +239,7 @@ impl Expr {
                     f(*expr);
                 }
             }
+            Expr::TryBlock { body } => f(*body),
             Expr::Loop { body } => f(*body),
             Expr::While { condition, body } => {
                 f(*condition);

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 });
     }

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> {
+    pub(crate) fn from_ast(lower_ctx: &LowerCtx, node: ast::TypeArgList) -> Option<GenericArgs> {
-        lower::lower_generic_args(node)
+        lower::lower_generic_args(lower_ctx, node)
     }
 
     pub(crate) fn empty() -> GenericArgs {

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
@@ -128,10 +131,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 +146,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 +165,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 +174,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),

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,
                 };

crates/ra_hir_expand/src/db.rs

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

crates/ra_hir_expand/src/hygiene.rs

@@ -12,7 +12,7 @@ use crate::{
     HirFileId, HirFileIdRepr, MacroCallId, MacroDefKind,
 };
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct Hygiene {
     // This is what `$crate` expands to
     def_crate: Option<CrateId>,

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"
 

crates/ra_hir_ty/src/infer/expr.rs

@@ -73,6 +73,11 @@ impl<'a> InferenceContext<'a> {
                 self.coerce_merge_branch(&then_ty, &else_ty)
             }
             Expr::Block { statements, tail } => self.infer_block(statements, *tail, expected),
+            Expr::TryBlock { body } => {
+                let _inner = self.infer_expr(*body, expected);
+                // FIXME should be std::result::Result<{inner}, _>
+                Ty::Unknown
+            }
             Expr::Loop { body } => {
                 self.infer_expr(*body, &Expectation::has_type(Ty::unit()));
                 // FIXME handle break with value

crates/ra_hir_ty/src/tests/macros.rs

@@ -338,6 +338,46 @@ pub fn baz() -> usize { 31usize }
     assert_eq!("(i32, usize)", type_at_pos(&db, pos));
 }
 
+#[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!(

crates/ra_hir_ty/src/tests/simple.rs

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

crates/ra_ide/src/completion/completion_context.rs

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

crates/ra_ide/src/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 ")
+        }
     }
 }
 

crates/ra_ide/src/folding_ranges.rs

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

crates/ra_ide/src/hover.rs

@@ -869,4 +869,15 @@ fn func(foo: i32) { if true { <|>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"],
+        );
+    }
 }

crates/ra_ide/src/join_lines.rs

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

crates/ra_ide/src/syntax_tree.rs

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

crates/ra_mbe/src/tests.rs

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

crates/ra_parser/src/grammar.rs

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

crates/ra_parser/src/grammar/expressions.rs

@@ -59,16 +59,7 @@ pub(crate) fn block(p: &mut Parser) {
         p.error("expected a block");
         return;
     }
-    atom::block_expr(p, None);
+    atom::block_expr(p);
-}
-
-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 {
@@ -197,7 +188,7 @@ pub(super) fn stmt(p: &mut Parser, with_semi: StmtWithSemi) {
     }
 }
 
-pub(crate) fn expr_block_contents(p: &mut Parser) {
+pub(super) fn expr_block_contents(p: &mut Parser) {
     // This is checked by a validator
     attributes::inner_attributes(p);
 

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

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

crates/ra_parser/src/syntax_kind/generated.rs

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

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"

crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt

@@ -1,5 +1,10 @@
 SUBTREE $
   PUNCH   # [alone] 4294967295
+  SUBTREE [] 4294967295
+    IDENT   doc 4294967295
+    SUBTREE () 4294967295
+      IDENT   hidden 4294967295
+  PUNCH   # [alone] 4294967295
   SUBTREE [] 4294967295
     IDENT   allow 4294967295
     SUBTREE () 4294967295
@@ -184,4 +189,4 @@ SUBTREE $
         IDENT   end 4294967295
         SUBTREE () 4294967295
           IDENT   __serde_state 4294967295
-  PUNCH   ; [alone] 4294967295
+  PUNCH   ; [alone] 4294967295

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,

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"

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" }

crates/ra_syntax/src/ast.rs

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

crates/ra_syntax/src/ast/edit.rs

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

crates/ra_syntax/src/ast/expr_extensions.rs

@@ -16,7 +16,7 @@ impl ast::Expr {
             | ast::Expr::WhileExpr(_)
             | ast::Expr::BlockExpr(_)
             | ast::Expr::MatchExpr(_)
-            | ast::Expr::TryExpr(_) => true,
+            | ast::Expr::EffectExpr(_) => true,
             _ => false,
         }
     }
@@ -359,22 +359,34 @@ impl ast::Literal {
     }
 }
 
-pub enum BlockModifier {
+#[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 {
-    pub fn modifier(&self) -> Option<BlockModifier> {
-        if let Some(token) = self.async_token() {
-            return Some(BlockModifier::Async(token));
-        }
-        if let Some(token) = self.unsafe_token() {
-            return Some(BlockModifier::Unsafe(token));
-        }
-        None
-    }
-
     /// false if the block is an intrinsic part of the syntax and can't be
     /// replaced with arbitrary expression.
     ///
@@ -383,15 +395,12 @@ impl ast::BlockExpr {
     /// const FOO: () = { stand_alone };
     /// ```
     pub fn is_standalone(&self) -> bool {
-        if self.modifier().is_some() {
-            return false;
-        }
         let parent = match self.syntax().parent() {
             Some(it) => it,
             None => return true,
         };
         match parent.kind() {
-            FN_DEF | IF_EXPR | WHILE_EXPR | LOOP_EXPR => false,
+            FN_DEF | IF_EXPR | WHILE_EXPR | LOOP_EXPR | EFFECT_EXPR => false,
             _ => true,
         }
     }

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
         }

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

@@ -475,6 +475,19 @@ impl LoopExpr {
     pub fn loop_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![loop]) }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct EffectExpr {
+    pub(crate) syntax: SyntaxNode,
+}
+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 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)]
 pub struct ForExpr {
     pub(crate) syntax: SyntaxNode,
@@ -541,11 +554,12 @@ pub struct BlockExpr {
     pub(crate) syntax: SyntaxNode,
 }
 impl ast::AttrsOwner for BlockExpr {}
+impl ast::ModuleItemOwner for BlockExpr {}
 impl BlockExpr {
-    pub fn label(&self) -> Option<Label> { support::child(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
-    pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
+    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn block(&self) -> Option<Block> { support::child(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -617,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)]
@@ -1111,19 +1125,6 @@ impl Condition {
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Block {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::AttrsOwner for Block {}
-impl ast::ModuleItemOwner for Block {}
-impl Block {
-    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
-    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ParamList {
     pub(crate) syntax: SyntaxNode,
@@ -1241,6 +1242,8 @@ 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) }
@@ -1465,6 +1468,7 @@ pub enum Expr {
     FieldExpr(FieldExpr),
     AwaitExpr(AwaitExpr),
     TryExpr(TryExpr),
+    EffectExpr(EffectExpr),
     CastExpr(CastExpr),
     RefExpr(RefExpr),
     PrefixExpr(PrefixExpr),
@@ -1947,6 +1951,17 @@ impl AstNode for LoopExpr {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
+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 })
+        } else {
+            None
+        }
+    }
+    fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
 impl AstNode for ForExpr {
     fn can_cast(kind: SyntaxKind) -> bool { kind == FOR_EXPR }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -2629,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> {
@@ -3288,6 +3292,9 @@ impl From<AwaitExpr> for Expr {
 impl From<TryExpr> for Expr {
     fn from(node: TryExpr) -> Expr { Expr::TryExpr(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) }
 }
@@ -3318,8 +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 | CAST_EXPR | REF_EXPR
+            | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | EFFECT_EXPR | CAST_EXPR
-            | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL | BOX_EXPR => true,
+            | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL | BOX_EXPR => {
+                true
+            }
             _ => false,
         }
     }
@@ -3347,6 +3356,7 @@ impl AstNode for Expr {
             FIELD_EXPR => Expr::FieldExpr(FieldExpr { syntax }),
             AWAIT_EXPR => Expr::AwaitExpr(AwaitExpr { syntax }),
             TRY_EXPR => Expr::TryExpr(TryExpr { 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 }),
@@ -3383,6 +3393,7 @@ impl AstNode for Expr {
             Expr::FieldExpr(it) => &it.syntax,
             Expr::AwaitExpr(it) => &it.syntax,
             Expr::TryExpr(it) => &it.syntax,
+            Expr::EffectExpr(it) => &it.syntax,
             Expr::CastExpr(it) => &it.syntax,
             Expr::RefExpr(it) => &it.syntax,
             Expr::PrefixExpr(it) => &it.syntax,
@@ -3863,6 +3874,11 @@ impl std::fmt::Display for LoopExpr {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
+impl std::fmt::Display for EffectExpr {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        std::fmt::Display::fmt(self.syntax(), f)
+    }
+}
 impl std::fmt::Display for ForExpr {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
@@ -4173,11 +4189,6 @@ impl std::fmt::Display for Condition {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for Block {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
 impl std::fmt::Display for ParamList {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)

crates/ra_syntax/src/ast/make.rs

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

crates/ra_syntax/src/lib.rs

@@ -237,8 +237,7 @@ fn api_walkthrough() {
 
     // Let's get the `1 + 1` expression!
     let body: ast::BlockExpr = func.body().unwrap();
-    let block = body.block().unwrap();
+    let expr: ast::Expr = body.expr().unwrap();
-    let expr: ast::Expr = block.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!(expr_syntax.parent().as_ref(), Some(body.syntax()));
-    assert_eq!(block.syntax().first_child_or_token().map(|it| it.kind()), Some(T!['{']));
+    assert_eq!(body.syntax().first_child_or_token().map(|it| it.kind()), Some(T!['{']));
     assert_eq!(
         expr_syntax.next_sibling_or_token().map(|it| it.kind()),
         Some(SyntaxKind::WHITESPACE)

crates/ra_syntax/src/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(str) => match str.validate() {
-            LK::RawStr { started: true, terminated: false, .. } => {
+                Ok(_) => RAW_STRING,
-                return (RAW_STRING, Some("Missing trailing `\"` with `#` symbols to terminate the raw string literal"))
+                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 {
-            LK::RawStr { started: false, .. } => {
+                    return (RAW_STRING, Some("Missing trailing `\"` to terminate the raw string literal"))
-                return (RAW_STRING, Some("Missing `\"` symbol after `#` symbols to begin the raw string literal"))
+                } else {
-            }
+                    return (RAW_STRING, Some("Missing trailing `\"` with `#` symbols to terminate the raw string literal"))
 
-            LK::RawByteStr { started: true, terminated: true, .. } => RAW_BYTE_STRING,
+                },
-            LK::RawByteStr { started: true, terminated: false, .. } => {
+                Err(LexRawStrError::TooManyDelimiters { .. }) => return (RAW_STRING, Some("Too many `#` symbols: raw strings may be delimited by up to 65535 `#` symbols")),
-                return (RAW_BYTE_STRING, Some("Missing trailing `\"` with `#` symbols to terminate the raw byte string literal"))
+            },
-            }
+            LK::RawByteStr(str) => match str.validate() {
-            LK::RawByteStr { started: false, .. } => {
+                Ok(_) => RAW_BYTE_STRING,
-                return (RAW_BYTE_STRING, Some("Missing `\"` symbol after `#` symbols to begin the raw byte string literal"))
+                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"))
+
+                },
+                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)

crates/ra_syntax/src/validation.rs

@@ -96,7 +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_crate_keyword_in_path_segment(it, &mut errors),
+                ast::PathSegment(it) => validate_path_keywords(it, &mut errors),
                 _ => (),
             }
         }
@@ -224,59 +224,82 @@ fn validate_range_expr(expr: ast::RangeExpr, errors: &mut Vec<SyntaxError>) {
     }
 }
 
-fn validate_crate_keyword_in_path_segment(
+fn validate_path_keywords(segment: ast::PathSegment, errors: &mut Vec<SyntaxError>) {
-    segment: ast::PathSegment,
+    use ast::PathSegmentKind;
-    errors: &mut Vec<SyntaxError>,
-) {
-    const ERR_MSG: &str = "The `crate` keyword is only allowed as the first segment of a path";
 
-    let crate_token = match segment.crate_token() {
+    let path = segment.parent_path();
-        None => return,
+    let is_path_start = segment.coloncolon_token().is_none() && path.qualifier().is_none();
-        Some(it) => it,
-    };
 
-    // Disallow both ::crate and foo::crate
+    if let Some(token) = segment.self_token() {
-    let mut path = segment.parent_path();
+        if !is_path_start {
-    if segment.coloncolon_token().is_some() || path.qualifier().is_some() {
+            errors.push(SyntaxError::new(
-        errors.push(SyntaxError::new(ERR_MSG, crate_token.text_range()));
+                "The `self` keyword is only allowed as the first segment of a path",
-        return;
+                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;
+        }
 
-    // For expressions and types, validation is complete, but we still have
+        let mut curr_path = path;
-    // to handle invalid UseItems like this:
+        while let Some(prefix) = use_prefix(curr_path) {
-    //
+            if !all_supers(&prefix) {
-    //      use foo:{crate::bar::baz};
+                errors.push(SyntaxError::new(
-    //
+                    "The `super` keyword may only be preceded by other `super`s",
-    // To handle this we must inspect the parent `UseItem`s and `UseTree`s
+                    token.text_range(),
-    // but right now we're looking deep inside the nested `Path` nodes because
+                ));
-    // `Path`s are left-associative:
+                return;
-    //
-    //   ((crate)::bar)::baz)
-    //       ^ current value of path
-    //
-    // So we need to climb to the top
-    while let Some(parent) = path.parent_path() {
-        path = parent;
-    }
-
-    // Now that we've found the whole path we need to see if there's a prefix
-    // somewhere in the UseTree hierarchy. This check is arbitrarily deep
-    // because rust allows arbitrary nesting like so:
-    //
-    // use {foo::{{{{crate::bar::baz}}}}};
-    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 {
-                        errors.push(SyntaxError::new(ERR_MSG, crate_token.text_range()));
-                    }
-                },
-                ast::UseTreeList(_it) => continue,
-                _ => 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;
     }
 }

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>) {
+pub(crate) fn validate_block_expr(block: ast::BlockExpr, errors: &mut Vec<SyntaxError>) {
-    if let Some(parent) = expr.syntax().parent() {
+    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| {
-        errors.extend(block.attrs().map(|attr| {
+        SyntaxError::new(
-            SyntaxError::new(
+            "A block in this position cannot accept inner attributes",
-                "A block in this position cannot accept inner attributes",
+            attr.syntax().text_range(),
-                attr.syntax().text_range(),
+        )
-            )
+    }))
-        }))
-    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast

@@ -0,0 +1,70 @@
+SOURCE_FILE@0..67
+  USE_ITEM@0..12
+    USE_KW@0..3 "use"
+    WHITESPACE@3..4 " "
+    USE_TREE@4..11
+      PATH@4..11
+        PATH_SEGMENT@4..11
+          COLON2@4..6 "::"
+          SUPER_KW@6..11 "super"
+    SEMICOLON@11..12 ";"
+  WHITESPACE@12..13 "\n"
+  USE_ITEM@13..26
+    USE_KW@13..16 "use"
+    WHITESPACE@16..17 " "
+    USE_TREE@17..25
+      PATH@17..25
+        PATH@17..18
+          PATH_SEGMENT@17..18
+            NAME_REF@17..18
+              IDENT@17..18 "a"
+        COLON2@18..20 "::"
+        PATH_SEGMENT@20..25
+          SUPER_KW@20..25 "super"
+    SEMICOLON@25..26 ";"
+  WHITESPACE@26..27 "\n"
+  USE_ITEM@27..47
+    USE_KW@27..30 "use"
+    WHITESPACE@30..31 " "
+    USE_TREE@31..46
+      PATH@31..46
+        PATH@31..39
+          PATH@31..36
+            PATH_SEGMENT@31..36
+              SUPER_KW@31..36 "super"
+          COLON2@36..38 "::"
+          PATH_SEGMENT@38..39
+            NAME_REF@38..39
+              IDENT@38..39 "a"
+        COLON2@39..41 "::"
+        PATH_SEGMENT@41..46
+          SUPER_KW@41..46 "super"
+    SEMICOLON@46..47 ";"
+  WHITESPACE@47..48 "\n"
+  USE_ITEM@48..66
+    USE_KW@48..51 "use"
+    WHITESPACE@51..52 " "
+    USE_TREE@52..65
+      PATH@52..53
+        PATH_SEGMENT@52..53
+          NAME_REF@52..53
+            IDENT@52..53 "a"
+      COLON2@53..55 "::"
+      USE_TREE_LIST@55..65
+        L_CURLY@55..56 "{"
+        USE_TREE@56..64
+          PATH@56..64
+            PATH@56..61
+              PATH_SEGMENT@56..61
+                SUPER_KW@56..61 "super"
+            COLON2@61..63 "::"
+            PATH_SEGMENT@63..64
+              NAME_REF@63..64
+                IDENT@63..64 "b"
+        R_CURLY@64..65 "}"
+    SEMICOLON@65..66 ";"
+  WHITESPACE@66..67 "\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

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};

crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast

@@ -0,0 +1,27 @@
+SOURCE_FILE@0..25
+  USE_ITEM@0..11
+    USE_KW@0..3 "use"
+    WHITESPACE@3..4 " "
+    USE_TREE@4..10
+      PATH@4..10
+        PATH_SEGMENT@4..10
+          COLON2@4..6 "::"
+          SELF_KW@6..10 "self"
+    SEMICOLON@10..11 ";"
+  WHITESPACE@11..12 "\n"
+  USE_ITEM@12..24
+    USE_KW@12..15 "use"
+    WHITESPACE@15..16 " "
+    USE_TREE@16..23
+      PATH@16..23
+        PATH@16..17
+          PATH_SEGMENT@16..17
+            NAME_REF@16..17
+              IDENT@16..17 "a"
+        COLON2@17..19 "::"
+        PATH_SEGMENT@19..23
+          SELF_KW@19..23 "self"
+    SEMICOLON@23..24 ";"
+  WHITESPACE@24..25 "\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

crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs

@@ -0,0 +1,2 @@
+use ::self;
+use a::self;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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