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

210 files changed, 10797 insertions, 10735 deletions

diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 7ffe46c69..c07ff488e 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
 [dependencies]
 itertools = "0.9.0"
 rowan = "0.10.0"
-rustc_lexer = { version = "652.0.0", package = "rustc-ap-rustc_lexer" }
+rustc_lexer = { version = "656.0.0", package = "rustc-ap-rustc_lexer" }
 rustc-hash = "1.1.0"
 arrayvec = "0.5.1"
 once_cell = "1.3.1"
@@ -27,7 +27,7 @@ ra_parser = { path = "../ra_parser" }
 # ideally, `serde` should be enabled by `rust-analyzer`, but we enable it here
 # to reduce number of compilations
 smol_str = { version = "0.1.15", features = ["serde"] }
-serde = { version = "1.0.104", features = ["derive"] }
+serde = { version = "1.0.106", features = ["derive"] }
 
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs
index 7fca5661e..1876afe95 100644
--- a/crates/ra_syntax/src/ast.rs
+++ b/crates/ra_syntax/src/ast.rs
@@ -16,7 +16,7 @@ use crate::{
 };
 
 pub use self::{
-    expr_extensions::{ArrayExprKind, BinOp, ElseBranch, LiteralKind, PrefixOp, RangeOp},
+    expr_extensions::{ArrayExprKind, BinOp, Effect, ElseBranch, LiteralKind, PrefixOp, RangeOp},
     extensions::{
         AttrKind, FieldKind, NameOrNameRef, PathSegmentKind, SelfParamKind, SlicePatComponents,
         StructKind, TypeBoundKind, VisibilityKind,
@@ -243,6 +243,21 @@ fn test_comments_preserve_trailing_whitespace() {
 }
 
 #[test]
+fn test_four_slash_line_comment() {
+    let file = SourceFile::parse(
+        r#"
+        //// too many slashes to be a doc comment
+        /// doc comment
+        mod foo {}
+        "#,
+    )
+    .ok()
+    .unwrap();
+    let module = file.syntax().descendants().find_map(Module::cast).unwrap();
+    assert_eq!("doc comment", module.doc_comment_text().unwrap());
+}
+
+#[test]
 fn test_where_predicates() {
     fn assert_bound(text: &str, bound: Option<TypeBound>) {
         assert_eq!(text, bound.unwrap().syntax().text().to_string());
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/ra_syntax/src/ast/edit.rs
index 26e4576ff..c507dc683 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/crates/ra_syntax/src/ast/edit.rs
@@ -28,7 +28,7 @@ impl ast::BinExpr {
 
 impl ast::FnDef {
     #[must_use]
-    pub fn with_body(&self, body: ast::Block) -> ast::FnDef {
+    pub fn with_body(&self, body: ast::BlockExpr) -> ast::FnDef {
         let mut to_insert: ArrayVec<[SyntaxElement; 2]> = ArrayVec::new();
         let old_body_or_semi: SyntaxElement = if let Some(old_body) = self.body() {
             old_body.syntax().clone().into()
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs
index 93aa3d45f..7771d6759 100644
--- a/crates/ra_syntax/src/ast/expr_extensions.rs
+++ b/crates/ra_syntax/src/ast/expr_extensions.rs
@@ -16,7 +16,7 @@ impl ast::Expr {
             | ast::Expr::WhileExpr(_)
             | ast::Expr::BlockExpr(_)
             | ast::Expr::MatchExpr(_)
-            | ast::Expr::TryBlockExpr(_) => true,
+            | ast::Expr::EffectExpr(_) => true,
             _ => false,
         }
     }
@@ -43,7 +43,7 @@ impl ast::IfExpr {
         Some(res)
     }
 
-    fn blocks(&self) -> AstChildren<ast::BlockExpr> {
+    pub fn blocks(&self) -> AstChildren<ast::BlockExpr> {
         support::children(self.syntax())
     }
 }
@@ -359,6 +359,33 @@ impl ast::Literal {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Effect {
+    Async(SyntaxToken),
+    Unsafe(SyntaxToken),
+    Try(SyntaxToken),
+    // Very much not an effect, but we stuff it into this node anyway
+    Label(ast::Label),
+}
+
+impl ast::EffectExpr {
+    pub fn effect(&self) -> Effect {
+        if let Some(token) = self.async_token() {
+            return Effect::Async(token);
+        }
+        if let Some(token) = self.unsafe_token() {
+            return Effect::Unsafe(token);
+        }
+        if let Some(token) = self.try_token() {
+            return Effect::Try(token);
+        }
+        if let Some(label) = self.label() {
+            return Effect::Label(label);
+        }
+        unreachable!("ast::EffectExpr without Effect")
+    }
+}
+
 impl ast::BlockExpr {
     /// false if the block is an intrinsic part of the syntax and can't be
     /// replaced with arbitrary expression.
@@ -368,12 +395,12 @@ impl ast::BlockExpr {
     /// const FOO: () = { stand_alone };
     /// ```
     pub fn is_standalone(&self) -> bool {
-        let kind = match self.syntax().parent() {
+        let parent = match self.syntax().parent() {
+            Some(it) => it,
             None => return true,
-            Some(it) => it.kind(),
         };
-        match kind {
-            FN_DEF | MATCH_ARM | IF_EXPR | WHILE_EXPR | LOOP_EXPR | TRY_BLOCK_EXPR => false,
+        match parent.kind() {
+            FN_DEF | IF_EXPR | WHILE_EXPR | LOOP_EXPR | EFFECT_EXPR => false,
             _ => true,
         }
     }
diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/extensions.rs
index f2ea5088e..528c873e0 100644
--- a/crates/ra_syntax/src/ast/extensions.rs
+++ b/crates/ra_syntax/src/ast/extensions.rs
@@ -407,7 +407,7 @@ impl ast::Visibility {
         } else if self.super_token().is_some() {
             VisibilityKind::PubSuper
         } else if self.self_token().is_some() {
-            VisibilityKind::PubSuper
+            VisibilityKind::PubSelf
         } else {
             VisibilityKind::Pub
         }
@@ -423,6 +423,10 @@ impl ast::MacroCall {
             None
         }
     }
+
+    pub fn is_bang(&self) -> bool {
+        self.is_macro_rules().is_none()
+    }
 }
 
 impl ast::LifetimeParam {
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs
index 2cb3ad011..5e844d5ae 100644
--- a/crates/ra_syntax/src/ast/generated/nodes.rs
+++ b/crates/ra_syntax/src/ast/generated/nodes.rs
@@ -476,13 +476,16 @@ impl LoopExpr {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct TryBlockExpr {
+pub struct EffectExpr {
     pub(crate) syntax: SyntaxNode,
 }
-impl ast::AttrsOwner for TryBlockExpr {}
-impl TryBlockExpr {
+impl ast::AttrsOwner for EffectExpr {}
+impl EffectExpr {
+    pub fn label(&self) -> Option<Label> { support::child(&self.syntax) }
     pub fn try_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![try]) }
-    pub fn body(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
+    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
+    pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
+    pub fn block_expr(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -551,10 +554,12 @@ pub struct BlockExpr {
     pub(crate) syntax: SyntaxNode,
 }
 impl ast::AttrsOwner for BlockExpr {}
+impl ast::ModuleItemOwner for BlockExpr {}
 impl BlockExpr {
-    pub fn label(&self) -> Option<Label> { support::child(&self.syntax) }
-    pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
-    pub fn block(&self) -> Option<Block> { support::child(&self.syntax) }
+    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
+    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
+    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -626,8 +631,8 @@ pub struct TryExpr {
 }
 impl ast::AttrsOwner for TryExpr {}
 impl TryExpr {
-    pub fn try_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![try]) }
     pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
+    pub fn question_mark_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![?]) }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1121,19 +1126,6 @@ impl Condition {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Block {
-    pub(crate) syntax: SyntaxNode,
-}
-impl ast::AttrsOwner for Block {}
-impl ast::ModuleItemOwner for Block {}
-impl Block {
-    pub fn l_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['{']) }
-    pub fn statements(&self) -> AstChildren<Stmt> { support::children(&self.syntax) }
-    pub fn expr(&self) -> Option<Expr> { support::child(&self.syntax) }
-    pub fn r_curly_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T!['}']) }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ParamList {
     pub(crate) syntax: SyntaxNode,
 }
@@ -1249,6 +1241,9 @@ pub struct PathSegment {
 }
 impl PathSegment {
     pub fn coloncolon_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![::]) }
+    pub fn crate_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![crate]) }
+    pub fn self_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![self]) }
+    pub fn super_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![super]) }
     pub fn l_angle_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![<]) }
     pub fn name_ref(&self) -> Option<NameRef> { support::child(&self.syntax) }
     pub fn type_arg_list(&self) -> Option<TypeArgList> { support::child(&self.syntax) }
@@ -1473,7 +1468,7 @@ pub enum Expr {
     FieldExpr(FieldExpr),
     AwaitExpr(AwaitExpr),
     TryExpr(TryExpr),
-    TryBlockExpr(TryBlockExpr),
+    EffectExpr(EffectExpr),
     CastExpr(CastExpr),
     RefExpr(RefExpr),
     PrefixExpr(PrefixExpr),
@@ -1956,8 +1951,8 @@ impl AstNode for LoopExpr {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for TryBlockExpr {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == TRY_BLOCK_EXPR }
+impl AstNode for EffectExpr {
+    fn can_cast(kind: SyntaxKind) -> bool { kind == EFFECT_EXPR }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
         if Self::can_cast(syntax.kind()) {
             Some(Self { syntax })
@@ -2649,17 +2644,6 @@ impl AstNode for Condition {
     }
     fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Block {
-    fn can_cast(kind: SyntaxKind) -> bool { kind == BLOCK }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
 impl AstNode for ParamList {
     fn can_cast(kind: SyntaxKind) -> bool { kind == PARAM_LIST }
     fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -3308,8 +3292,8 @@ impl From<AwaitExpr> for Expr {
 impl From<TryExpr> for Expr {
     fn from(node: TryExpr) -> Expr { Expr::TryExpr(node) }
 }
-impl From<TryBlockExpr> for Expr {
-    fn from(node: TryBlockExpr) -> Expr { Expr::TryBlockExpr(node) }
+impl From<EffectExpr> for Expr {
+    fn from(node: EffectExpr) -> Expr { Expr::EffectExpr(node) }
 }
 impl From<CastExpr> for Expr {
     fn from(node: CastExpr) -> Expr { Expr::CastExpr(node) }
@@ -3341,9 +3325,10 @@ impl AstNode for Expr {
             TUPLE_EXPR | ARRAY_EXPR | PAREN_EXPR | PATH_EXPR | LAMBDA_EXPR | IF_EXPR
             | LOOP_EXPR | FOR_EXPR | WHILE_EXPR | CONTINUE_EXPR | BREAK_EXPR | LABEL
             | BLOCK_EXPR | RETURN_EXPR | MATCH_EXPR | RECORD_LIT | CALL_EXPR | INDEX_EXPR
-            | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | TRY_BLOCK_EXPR
-            | CAST_EXPR | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL
-            | BOX_EXPR => true,
+            | METHOD_CALL_EXPR | FIELD_EXPR | AWAIT_EXPR | TRY_EXPR | EFFECT_EXPR | CAST_EXPR
+            | REF_EXPR | PREFIX_EXPR | RANGE_EXPR | BIN_EXPR | LITERAL | MACRO_CALL | BOX_EXPR => {
+                true
+            }
             _ => false,
         }
     }
@@ -3371,7 +3356,7 @@ impl AstNode for Expr {
             FIELD_EXPR => Expr::FieldExpr(FieldExpr { syntax }),
             AWAIT_EXPR => Expr::AwaitExpr(AwaitExpr { syntax }),
             TRY_EXPR => Expr::TryExpr(TryExpr { syntax }),
-            TRY_BLOCK_EXPR => Expr::TryBlockExpr(TryBlockExpr { syntax }),
+            EFFECT_EXPR => Expr::EffectExpr(EffectExpr { syntax }),
             CAST_EXPR => Expr::CastExpr(CastExpr { syntax }),
             REF_EXPR => Expr::RefExpr(RefExpr { syntax }),
             PREFIX_EXPR => Expr::PrefixExpr(PrefixExpr { syntax }),
@@ -3408,7 +3393,7 @@ impl AstNode for Expr {
             Expr::FieldExpr(it) => &it.syntax,
             Expr::AwaitExpr(it) => &it.syntax,
             Expr::TryExpr(it) => &it.syntax,
-            Expr::TryBlockExpr(it) => &it.syntax,
+            Expr::EffectExpr(it) => &it.syntax,
             Expr::CastExpr(it) => &it.syntax,
             Expr::RefExpr(it) => &it.syntax,
             Expr::PrefixExpr(it) => &it.syntax,
@@ -3889,7 +3874,7 @@ impl std::fmt::Display for LoopExpr {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for TryBlockExpr {
+impl std::fmt::Display for EffectExpr {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
     }
@@ -4204,11 +4189,6 @@ impl std::fmt::Display for Condition {
         std::fmt::Display::fmt(self.syntax(), f)
     }
 }
-impl std::fmt::Display for Block {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        std::fmt::Display::fmt(self.syntax(), f)
-    }
-}
 impl std::fmt::Display for ParamList {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         std::fmt::Display::fmt(self.syntax(), f)
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/ra_syntax/src/ast/make.rs
index ee0f5cc40..7b17fef49 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/ra_syntax/src/ast/make.rs
@@ -22,8 +22,7 @@ pub fn path_unqualified(segment: ast::PathSegment) -> ast::Path {
 pub fn path_qualified(qual: ast::Path, segment: ast::PathSegment) -> ast::Path {
     path_from_text(&format!("{}::{}", qual, segment))
 }
-
-pub fn path_from_text(text: &str) -> ast::Path {
+fn path_from_text(text: &str) -> ast::Path {
     ast_from_text(text)
 }
 
@@ -83,14 +82,6 @@ pub fn block_expr(
     ast_from_text(&format!("fn f() {}", buf))
 }
 
-pub fn block_from_expr(e: ast::Expr) -> ast::Block {
-    return from_text(&format!("{{ {} }}", e));
-
-    fn from_text(text: &str) -> ast::Block {
-        ast_from_text(&format!("fn f() {}", text))
-    }
-}
-
 pub fn expr_unit() -> ast::Expr {
     expr_from_text("()")
 }
diff --git a/crates/ra_syntax/src/ast/tokens.rs b/crates/ra_syntax/src/ast/tokens.rs
index 3865729b8..74906d8a6 100644
--- a/crates/ra_syntax/src/ast/tokens.rs
+++ b/crates/ra_syntax/src/ast/tokens.rs
@@ -13,7 +13,12 @@ impl Comment {
     }
 
     pub fn prefix(&self) -> &'static str {
-        prefix_by_kind(self.kind())
+        for (prefix, k) in COMMENT_PREFIX_TO_KIND.iter() {
+            if *k == self.kind() && self.text().starts_with(prefix) {
+                return prefix;
+            }
+        }
+        unreachable!()
     }
 }
 
@@ -48,6 +53,7 @@ pub enum CommentPlacement {
 const COMMENT_PREFIX_TO_KIND: &[(&str, CommentKind)] = {
     use {CommentPlacement::*, CommentShape::*};
     &[
+        ("////", CommentKind { shape: Line, doc: None }),
         ("///", CommentKind { shape: Line, doc: Some(Outer) }),
         ("//!", CommentKind { shape: Line, doc: Some(Inner) }),
         ("/**", CommentKind { shape: Block, doc: Some(Outer) }),
@@ -69,15 +75,6 @@ fn kind_by_prefix(text: &str) -> CommentKind {
     panic!("bad comment text: {:?}", text)
 }
 
-fn prefix_by_kind(kind: CommentKind) -> &'static str {
-    for (prefix, k) in COMMENT_PREFIX_TO_KIND.iter() {
-        if *k == kind {
-            return prefix;
-        }
-    }
-    unreachable!()
-}
-
 impl Whitespace {
     pub fn spans_multiple_lines(&self) -> bool {
         let text = self.text();
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index ceeb2bde9..d0234cada 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -237,8 +237,7 @@ fn api_walkthrough() {
 
     // Let's get the `1 + 1` expression!
     let body: ast::BlockExpr = func.body().unwrap();
-    let block = body.block().unwrap();
-    let expr: ast::Expr = block.expr().unwrap();
+    let expr: ast::Expr = body.expr().unwrap();
 
     // Enums are used to group related ast nodes together, and can be used for
     // matching. However, because there are no public fields, it's possible to
@@ -274,8 +273,8 @@ fn api_walkthrough() {
     assert_eq!(text.to_string(), "1 + 1");
 
     // There's a bunch of traversal methods on `SyntaxNode`:
-    assert_eq!(expr_syntax.parent().as_ref(), Some(block.syntax()));
-    assert_eq!(block.syntax().first_child_or_token().map(|it| it.kind()), Some(T!['{']));
+    assert_eq!(expr_syntax.parent().as_ref(), Some(body.syntax()));
+    assert_eq!(body.syntax().first_child_or_token().map(|it| it.kind()), Some(T!['{']));
     assert_eq!(
         expr_syntax.next_sibling_or_token().map(|it| it.kind()),
         Some(SyntaxKind::WHITESPACE)
diff --git a/crates/ra_syntax/src/parsing/lexer.rs b/crates/ra_syntax/src/parsing/lexer.rs
index f450ef4a2..1a5a6dc06 100644
--- a/crates/ra_syntax/src/parsing/lexer.rs
+++ b/crates/ra_syntax/src/parsing/lexer.rs
@@ -180,7 +180,7 @@ fn rustc_token_kind_to_syntax_kind(
     return (syntax_kind, None);
 
     fn match_literal_kind(kind: &rustc_lexer::LiteralKind) -> (SyntaxKind, Option<&'static str>) {
-        use rustc_lexer::LiteralKind as LK;
+        use rustc_lexer::{LexRawStrError, LiteralKind as LK};
 
         #[rustfmt::skip]
         let syntax_kind = match *kind {
@@ -215,21 +215,28 @@ fn rustc_token_kind_to_syntax_kind(
                 return (BYTE_STRING, Some("Missing trailing `\"` symbol to terminate the byte string literal"))
             }
 
-            LK::RawStr { started: true, terminated: true, .. } => RAW_STRING,
-            LK::RawStr { started: true, terminated: false, .. } => {
-                return (RAW_STRING, Some("Missing trailing `\"` with `#` symbols to terminate the raw string literal"))
-            }
-            LK::RawStr { started: false, .. } => {
-                return (RAW_STRING, Some("Missing `\"` symbol after `#` symbols to begin the raw string literal"))
-            }
+            LK::RawStr(str) => match str.validate() {
+                Ok(_) => RAW_STRING,
+                Err(LexRawStrError::InvalidStarter) => return (RAW_STRING, Some("Missing `\"` symbol after `#` symbols to begin the raw string literal")),
+                Err(LexRawStrError::NoTerminator { expected, found, .. }) => if expected == found {
+                    return (RAW_STRING, Some("Missing trailing `\"` to terminate the raw string literal"))
+                } else {
+                    return (RAW_STRING, Some("Missing trailing `\"` with `#` symbols to terminate the raw string literal"))
+
+                },
+                Err(LexRawStrError::TooManyDelimiters { .. }) => return (RAW_STRING, Some("Too many `#` symbols: raw strings may be delimited by up to 65535 `#` symbols")),
+            },
+            LK::RawByteStr(str) => match str.validate() {
+                Ok(_) => RAW_BYTE_STRING,
+                Err(LexRawStrError::InvalidStarter) => return (RAW_BYTE_STRING, Some("Missing `\"` symbol after `#` symbols to begin the raw byte string literal")),
+                Err(LexRawStrError::NoTerminator { expected, found, .. }) => if expected == found {
+                    return (RAW_BYTE_STRING, Some("Missing trailing `\"` to terminate the raw byte string literal"))
+                } else {
+                    return (RAW_BYTE_STRING, Some("Missing trailing `\"` with `#` symbols to terminate the raw byte string literal"))
 
-            LK::RawByteStr { started: true, terminated: true, .. } => RAW_BYTE_STRING,
-            LK::RawByteStr { started: true, terminated: false, .. } => {
-                return (RAW_BYTE_STRING, Some("Missing trailing `\"` with `#` symbols to terminate the raw byte string literal"))
-            }
-            LK::RawByteStr { started: false, .. } => {
-                return (RAW_BYTE_STRING, Some("Missing `\"` symbol after `#` symbols to begin the raw byte string literal"))
-            }
+                },
+                Err(LexRawStrError::TooManyDelimiters { .. }) => return (RAW_BYTE_STRING, Some("Too many `#` symbols: raw byte strings may be delimited by up to 65535 `#` symbols")),
+            },
         };
 
         (syntax_kind, None)
diff --git a/crates/ra_syntax/src/validation.rs b/crates/ra_syntax/src/validation.rs
index 5e93895ec..e075cd801 100644
--- a/crates/ra_syntax/src/validation.rs
+++ b/crates/ra_syntax/src/validation.rs
@@ -96,6 +96,7 @@ pub(crate) fn validate(root: &SyntaxNode) -> Vec<SyntaxError> {
                 ast::RecordField(it) => validate_numeric_name(it.name_ref(), &mut errors),
                 ast::Visibility(it) => validate_visibility(it, &mut errors),
                 ast::RangeExpr(it) => validate_range_expr(it, &mut errors),
+                ast::PathSegment(it) => validate_path_keywords(it, &mut errors),
                 _ => (),
             }
         }
@@ -222,3 +223,83 @@ fn validate_range_expr(expr: ast::RangeExpr, errors: &mut Vec<SyntaxError>) {
         ));
     }
 }
+
+fn validate_path_keywords(segment: ast::PathSegment, errors: &mut Vec<SyntaxError>) {
+    use ast::PathSegmentKind;
+
+    let path = segment.parent_path();
+    let is_path_start = segment.coloncolon_token().is_none() && path.qualifier().is_none();
+
+    if let Some(token) = segment.self_token() {
+        if !is_path_start {
+            errors.push(SyntaxError::new(
+                "The `self` keyword is only allowed as the first segment of a path",
+                token.text_range(),
+            ));
+        }
+    } else if let Some(token) = segment.crate_token() {
+        if !is_path_start || use_prefix(path).is_some() {
+            errors.push(SyntaxError::new(
+                "The `crate` keyword is only allowed as the first segment of a path",
+                token.text_range(),
+            ));
+        }
+    } else if let Some(token) = segment.super_token() {
+        if !all_supers(&path) {
+            errors.push(SyntaxError::new(
+                "The `super` keyword may only be preceded by other `super`s",
+                token.text_range(),
+            ));
+            return;
+        }
+
+        let mut curr_path = path;
+        while let Some(prefix) = use_prefix(curr_path) {
+            if !all_supers(&prefix) {
+                errors.push(SyntaxError::new(
+                    "The `super` keyword may only be preceded by other `super`s",
+                    token.text_range(),
+                ));
+                return;
+            }
+            curr_path = prefix;
+        }
+    }
+
+    fn use_prefix(mut path: ast::Path) -> Option<ast::Path> {
+        for node in path.syntax().ancestors().skip(1) {
+            match_ast! {
+                match node {
+                    ast::UseTree(it) => if let Some(tree_path) = it.path() {
+                        // Even a top-level path exists within a `UseTree` so we must explicitly
+                        // allow our path but disallow anything else
+                        if tree_path != path {
+                            return Some(tree_path);
+                        }
+                    },
+                    ast::UseTreeList(_it) => continue,
+                    ast::Path(parent) => path = parent,
+                    _ => return None,
+                }
+            };
+        }
+        return None;
+    }
+
+    fn all_supers(path: &ast::Path) -> bool {
+        let segment = match path.segment() {
+            Some(it) => it,
+            None => return false,
+        };
+
+        if segment.kind() != Some(PathSegmentKind::SuperKw) {
+            return false;
+        }
+
+        if let Some(ref subpath) = path.qualifier() {
+            return all_supers(subpath);
+        }
+
+        return true;
+    }
+}
diff --git a/crates/ra_syntax/src/validation/block.rs b/crates/ra_syntax/src/validation/block.rs
index 8e962ab5b..2c08f7e6e 100644
--- a/crates/ra_syntax/src/validation/block.rs
+++ b/crates/ra_syntax/src/validation/block.rs
@@ -6,19 +6,17 @@ use crate::{
     SyntaxKind::*,
 };
 
-pub(crate) fn validate_block_expr(expr: ast::BlockExpr, errors: &mut Vec<SyntaxError>) {
-    if let Some(parent) = expr.syntax().parent() {
+pub(crate) fn validate_block_expr(block: ast::BlockExpr, errors: &mut Vec<SyntaxError>) {
+    if let Some(parent) = block.syntax().parent() {
         match parent.kind() {
-            FN_DEF | EXPR_STMT | BLOCK => return,
+            FN_DEF | EXPR_STMT | BLOCK_EXPR => return,
             _ => {}
         }
     }
-    if let Some(block) = expr.block() {
-        errors.extend(block.attrs().map(|attr| {
-            SyntaxError::new(
-                "A block in this position cannot accept inner attributes",
-                attr.syntax().text_range(),
-            )
-        }))
-    }
+    errors.extend(block.attrs().map(|attr| {
+        SyntaxError::new(
+            "A block in this position cannot accept inner attributes",
+            attr.syntax().text_range(),
+        )
+    }))
 }
diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
index 95cc83caa..375ed45e0 100644
--- a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
@@ -28,10 +28,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n\n"
   [email protected]
     [email protected] "#"
diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
index dc3e12091..b72c92c33 100644
--- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
+++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
@@ -21,9 +21,8 @@ [email protected]
       [email protected] "("
       [email protected] ")"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "}"
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
index 97539fcf2..33953d8d7 100644
--- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
@@ -9,10 +9,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected]
@@ -34,30 +33,28 @@ [email protected]
           [email protected] "true"
       [email protected] " "
       [email protected]
-        [email protected]
-          [email protected] "{"
-          [email protected] "\n        "
-          [email protected]
-            [email protected] "1"
-          [email protected] "\n    "
-          [email protected] "}"
+        [email protected] "{"
+        [email protected] "\n        "
+        [email protected]
+          [email protected] "1"
+        [email protected] "\n    "
+        [email protected] "}"
       [email protected] " "
       [email protected] "else"
       [email protected] " "
       [email protected]
-        [email protected]
-          [email protected] "{"
-          [email protected] "\n        "
-          [email protected]
-            [email protected]
-              [email protected] "2"
-            [email protected] " "
-            [email protected] "+"
-            [email protected] " "
-            [email protected]
-              [email protected] "3"
-          [email protected] "\n    "
-          [email protected] "}"
+        [email protected] "{"
+        [email protected] "\n        "
+        [email protected]
+          [email protected]
+            [email protected] "2"
+          [email protected] " "
+          [email protected] "+"
+          [email protected] " "
+          [email protected]
+            [email protected] "3"
+        [email protected] "\n    "
+        [email protected] "}"
     [email protected] "\n"
     [email protected] "}"
   [email protected] "\n\n"
@@ -71,10 +68,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 17..17: expected BANG
 error 19..19: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
index e10bb8174..3bf57eacc 100644
--- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
+++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
@@ -9,37 +9,36 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "|"
-              [email protected] "|"
-            [email protected] " "
-            [email protected]
-              [email protected] "->"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "unsafe"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "|"
+            [email protected] "|"
+          [email protected] " "
+          [email protected]
+            [email protected] "->"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "unsafe"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
-error 24..24: expected `{`
+error 24..24: expected a block
 error 24..24: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
index 61c361833..9323b7890 100644
--- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
+++ b/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
@@ -25,8 +25,7 @@ [email protected]
                 [email protected] "T"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 19..19: expected colon
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
index 92bb47316..93434f34f 100644
--- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
+++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
@@ -9,36 +9,35 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] "\n    "
-              [email protected] ")"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "return"
-            [email protected] " "
-            [email protected]
-              [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] "\n    "
+            [email protected] ")"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "return"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 38..38: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
index 7bc718302..628315c78 100644
--- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
+++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
@@ -20,28 +20,27 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "bar"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "1"
-          [email protected] " "
-          [email protected] "+"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "bar"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "1"
+        [email protected] " "
+        [email protected] "+"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 44..44: expected expression
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
index 63194f974..31cc4e551 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
@@ -33,89 +33,88 @@ [email protected]
                   [email protected] "ScopeId"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected] "let"
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected] "res"
-              [email protected] " "
-              [email protected] "="
-              [email protected] " "
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "self"
-                  [email protected] "."
-                  [email protected]
-                    [email protected] "scopes"
-                [email protected] "."
-                [email protected]
-                  [email protected] "len"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ";"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "self"
-                [email protected] "."
-                [email protected]
-                  [email protected] "scopes"
-              [email protected] "."
-              [email protected]
-                [email protected] "push"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "ScopeData"
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "parent"
-                      [email protected] ":"
-                      [email protected] " "
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "None"
-                    [email protected] ","
-                    [email protected] " "
-                    [email protected]
-                      [email protected]
-                        [email protected] "entries"
-                      [email protected] ":"
-                      [email protected] " "
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "vec"
-                        [email protected] "!"
-                        [email protected]
-                          [email protected] "["
-                          [email protected] "]"
-                    [email protected] " "
-                    [email protected] "}"
-                [email protected] ")"
-            [email protected] "\n    "
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "let"
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected] "res"
+            [email protected] " "
+            [email protected] "="
+            [email protected] " "
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "self"
+                [email protected] "."
+                [email protected]
+                  [email protected] "scopes"
+              [email protected] "."
+              [email protected]
+                [email protected] "len"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ";"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "self"
+              [email protected] "."
+              [email protected]
+                [email protected] "scopes"
+            [email protected] "."
+            [email protected]
+              [email protected] "push"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "ScopeData"
+                [email protected] " "
+                [email protected]
+                  [email protected] "{"
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected] "parent"
+                    [email protected] ":"
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "None"
+                  [email protected] ","
+                  [email protected] " "
+                  [email protected]
+                    [email protected]
+                      [email protected] "entries"
+                    [email protected] ":"
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "vec"
+                      [email protected] "!"
+                      [email protected]
+                        [email protected] "["
+                        [email protected] "]"
+                  [email protected] " "
+                  [email protected] "}"
+              [email protected] ")"
+          [email protected] "\n    "
+          [email protected] "}"
       [email protected] "\n\n    "
       [email protected]
         [email protected] "fn"
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
index d20bb60f1..4ff27f5c8 100644
--- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
@@ -9,91 +9,87 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "foo"
-          [email protected] " "
-          [email protected] "="
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "bar"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "baz"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "92"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "while"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "loop"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "foo"
+        [email protected] " "
+        [email protected] "="
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "bar"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "baz"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "while"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "loop"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 24..24: expected expression
 error 24..24: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
index 1185f44f9..5f3a31473 100644
--- a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
@@ -12,9 +12,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 2..2: expected a name
 error 2..2: expected function arguments
diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
index c7bf4caa0..1746bd3c1 100644
--- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
+++ b/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
@@ -26,10 +26,9 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 16..16: expected COLON
 error 16..16: expected type
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
index cc0d75cc8..28146f44e 100644
--- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
@@ -9,37 +9,36 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "["
-            [email protected]
-              [email protected] "1"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] "2"
-            [email protected] ","
-            [email protected] " "
-            [email protected]
-              [email protected] "@"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "struct"
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-          [email protected]
-            [email protected] "]"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "["
+          [email protected]
+            [email protected] "1"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] "2"
+          [email protected] ","
+          [email protected] " "
+          [email protected]
+            [email protected] "@"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "struct"
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+        [email protected]
+          [email protected] "]"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -51,44 +50,43 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "@"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "impl"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-        [email protected]
-          [email protected] ")"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "@"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "impl"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+      [email protected]
+        [email protected] ")"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
   [email protected]
     [email protected] "fn"
@@ -100,53 +98,52 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "foo"
-            [email protected] "."
-            [email protected]
-              [email protected] "bar"
-            [email protected]
-              [email protected] "("
-              [email protected]
-                [email protected] "1"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "2"
-              [email protected] ","
-              [email protected] " "
-              [email protected]
-                [email protected] "@"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "]"
-        [email protected]
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "trait"
-          [email protected]
-            [email protected] ","
-        [email protected] " "
-        [email protected]
-          [email protected] "let"
-        [email protected]
-          [email protected] ")"
-        [email protected] " "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "foo"
+          [email protected] "."
+          [email protected]
+            [email protected] "bar"
+          [email protected]
+            [email protected] "("
+            [email protected]
+              [email protected] "1"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "2"
+            [email protected] ","
+            [email protected] " "
+            [email protected]
+              [email protected] "@"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "]"
+      [email protected]
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "trait"
+        [email protected]
+          [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected] "let"
+      [email protected]
+        [email protected] ")"
+      [email protected] " "
+      [email protected] "}"
   [email protected] "\n"
 error 16..16: expected expression
 error 17..17: expected R_BRACK
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
index c37594146..9ea9d715e 100644
--- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
+++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
@@ -9,31 +9,30 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "foo"
-          [email protected] "!"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] "\n        "
-            [email protected] "bar"
-            [email protected] ","
-            [email protected] " "
-            [email protected] "\"baz\""
-            [email protected] ","
-            [email protected] " "
-            [email protected] "1"
-            [email protected] ","
-            [email protected] " "
-            [email protected] "2.0"
-        [email protected] "\n    "
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "foo"
+        [email protected] "!"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] "\n        "
+          [email protected] "bar"
+          [email protected] ","
+          [email protected] " "
+          [email protected] "\"baz\""
+          [email protected] ","
+          [email protected] " "
+          [email protected] "1"
+          [email protected] ","
+          [email protected] " "
+          [email protected] "2.0"
+      [email protected] "\n    "
+      [email protected] "}"
   [email protected] " "
   [email protected] "//~ ERROR incorrect c ..."
   [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
index 4296355f2..7c957fdde 100644
--- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
+++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
@@ -62,9 +62,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n\n"
   [email protected]
     [email protected] "fn"
@@ -76,219 +75,218 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Box"
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected]
-                            [email protected] "("
-                            [email protected]
-                              [email protected]
-                                [email protected]
-                                  [email protected]
-                                    [email protected] "Copy"
-                            [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] "?"
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Sized"
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected] "for"
-                  [email protected]
-                    [email protected] "<"
-                    [email protected]
-                      [email protected] "\'a"
-                    [email protected] ">"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Trait"
-                        [email protected]
-                          [email protected] "<"
-                          [email protected]
-                            [email protected] "\'a"
-                          [email protected] ">"
-                [email protected] ")"
-        [email protected]
-          [email protected]
-            [email protected] ">"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Box"
-                [email protected]
-                  [email protected] "<"
-                  [email protected]
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "?"
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "Sized"
-        [email protected]
-          [email protected]
-            [email protected] ")"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "+"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected] "("
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "for"
-                        [email protected]
-                          [email protected] "<"
-                        [email protected]
-                          [email protected] "\'a"
-                      [email protected] ">"
-                      [email protected] " "
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected] "Trait"
-                    [email protected] "<"
-                    [email protected]
-                      [email protected] "\'a"
-                  [email protected] ">"
-                  [email protected]
-                    [email protected] ")"
-                [email protected] " "
-                [email protected] "+"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "Copy"
-                  [email protected] ")"
-              [email protected] ">"
-              [email protected]
-                [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ":"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Box"
-                      [email protected]
-                        [email protected] "<"
-                        [email protected]
-                          [email protected]
-                            [email protected] "("
-                            [email protected]
-                              [email protected] "for"
-                              [email protected]
-                                [email protected] "<"
-                                [email protected]
-                                  [email protected] "\'a"
-                                [email protected] ">"
-                              [email protected] " "
-                              [email protected]
-                                [email protected]
-                                  [email protected]
-                                    [email protected]
-                                      [email protected] "Trait"
-                                    [email protected]
-                                      [email protected] "<"
-                                      [email protected]
-                                        [email protected] "\'a"
-                                      [email protected] ">"
-                            [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Copy"
-                [email protected] ")"
-              [email protected] " "
-              [email protected] "+"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] "?"
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "Sized"
-                [email protected] ")"
-        [email protected]
-          [email protected]
-            [email protected] ">"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Box"
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected]
+                          [email protected] "("
+                          [email protected]
+                            [email protected]
+                              [email protected]
+                                [email protected]
+                                  [email protected] "Copy"
+                          [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] "?"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Sized"
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected] "for"
+                [email protected]
+                  [email protected] "<"
+                  [email protected]
+                    [email protected] "\'a"
+                  [email protected] ">"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Trait"
+                      [email protected]
+                        [email protected] "<"
+                        [email protected]
+                          [email protected] "\'a"
+                        [email protected] ">"
+              [email protected] ")"
+      [email protected]
+        [email protected]
+          [email protected] ">"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Box"
+              [email protected]
+                [email protected] "<"
+                [email protected]
+                  [email protected]
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "?"
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "Sized"
+      [email protected]
+        [email protected]
+          [email protected] ")"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "+"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "("
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "for"
+                      [email protected]
+                        [email protected] "<"
+                      [email protected]
+                        [email protected] "\'a"
+                    [email protected] ">"
+                    [email protected] " "
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "Trait"
+                  [email protected] "<"
+                  [email protected]
+                    [email protected] "\'a"
+                [email protected] ">"
+                [email protected]
+                  [email protected] ")"
+              [email protected] " "
+              [email protected] "+"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "Copy"
+                [email protected] ")"
+            [email protected] ">"
+            [email protected]
+              [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Box"
+                    [email protected]
+                      [email protected] "<"
+                      [email protected]
+                        [email protected]
+                          [email protected] "("
+                          [email protected]
+                            [email protected] "for"
+                            [email protected]
+                              [email protected] "<"
+                              [email protected]
+                                [email protected] "\'a"
+                              [email protected] ">"
+                            [email protected] " "
+                            [email protected]
+                              [email protected]
+                                [email protected]
+                                  [email protected]
+                                    [email protected] "Trait"
+                                  [email protected]
+                                    [email protected] "<"
+                                    [email protected]
+                                      [email protected] "\'a"
+                                    [email protected] ">"
+                          [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Copy"
+              [email protected] ")"
+            [email protected] " "
+            [email protected] "+"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] "?"
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "Sized"
+              [email protected] ")"
+      [email protected]
+        [email protected]
+          [email protected] ">"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 88..88: expected COMMA
 error 88..88: expected R_ANGLE
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
index 195c08bd9..88b086daf 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast
+++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast
@@ -9,187 +9,185 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "enum"
-          [email protected] " "
-          [email protected]
-            [email protected] "Test"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Var1"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Var2"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "String"
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Var3"
-              [email protected] " "
-              [email protected]
-                [email protected] "{"
-                [email protected] "\n            "
-                [email protected]
-                  [email protected]
-                    [email protected] "abc"
-                  [email protected] ":"
-                [email protected] " "
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "}"
-                [email protected]
-                  [email protected] ","
-                [email protected] " "
-                [email protected] "//~ ERROR: expected t ..."
-                [email protected] "\n        "
-                [email protected] "}"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected] "// recover..."
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "a"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "1"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "enum"
-          [email protected] " "
-          [email protected]
-            [email protected] "Test2"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "Fine"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected] "enum"
-          [email protected] " "
-          [email protected]
-            [email protected] "Test3"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "StillFine"
-              [email protected] " "
-              [email protected]
-                [email protected] "{"
-                [email protected] "\n            "
-                [email protected]
-                  [email protected]
-                    [email protected] "def"
-                  [email protected] ":"
-                  [email protected] " "
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "i32"
-                [email protected] ","
-                [email protected] "\n        "
-                [email protected] "}"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "// fail again"
-                [email protected] "\n        "
-                [email protected] "enum"
-                [email protected] " "
-                [email protected]
-                  [email protected] "Test4"
-                [email protected] " "
-                [email protected]
-                  [email protected] "{"
-                  [email protected] "\n            "
-                  [email protected]
-                    [email protected]
-                      [email protected] "Nope"
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected]
-                              [email protected]
-                                [email protected] "i32"
-                      [email protected] " "
-                      [email protected]
-                  [email protected]
-                    [email protected] "{"
-                    [email protected] "}"
-                  [email protected]
-                    [email protected] ")"
-                  [email protected] " "
-                  [email protected] "//~ ERROR: found `{`"
-                  [email protected] "\n                     ..."
-                  [email protected] "//~^ ERROR: found `{`"
-                  [email protected] "\n        "
-                  [email protected] "}"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n    "
-        [email protected] "// still recover later"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "bad_syntax"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected] "_"
-          [email protected] ";"
-        [email protected] " "
-        [email protected] "//~ ERROR: expected e ..."
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "enum"
+        [email protected] " "
+        [email protected]
+          [email protected] "Test"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Var1"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Var2"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "String"
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Var3"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "\n            "
+              [email protected]
+                [email protected]
+                  [email protected] "abc"
+                [email protected] ":"
+              [email protected] " "
+              [email protected]
+                [email protected] "{"
+                [email protected] "}"
+              [email protected]
+                [email protected] ","
+              [email protected] " "
+              [email protected] "//~ ERROR: expected t ..."
+              [email protected] "\n        "
+              [email protected] "}"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected] "// recover..."
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "a"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "1"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "enum"
+        [email protected] " "
+        [email protected]
+          [email protected] "Test2"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "Fine"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected] "enum"
+        [email protected] " "
+        [email protected]
+          [email protected] "Test3"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "StillFine"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "\n            "
+              [email protected]
+                [email protected]
+                  [email protected] "def"
+                [email protected] ":"
+                [email protected] " "
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "i32"
+              [email protected] ","
+              [email protected] "\n        "
+              [email protected] "}"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "// fail again"
+            [email protected] "\n        "
+            [email protected] "enum"
+            [email protected] " "
+            [email protected]
+              [email protected] "Test4"
+            [email protected] " "
+            [email protected]
+              [email protected] "{"
+              [email protected] "\n            "
+              [email protected]
+                [email protected]
+                  [email protected] "Nope"
+                [email protected]
+                  [email protected] "("
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected]
+                            [email protected] "i32"
+                  [email protected] " "
+                  [email protected]
+              [email protected]
+                [email protected] "{"
+                [email protected] "}"
+              [email protected]
+                [email protected] ")"
+              [email protected] " "
+              [email protected] "//~ ERROR: found `{`"
+              [email protected] "\n                     ..."
+              [email protected] "//~^ ERROR: found `{`"
+              [email protected] "\n        "
+              [email protected] "}"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected] "// still recover later"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "bad_syntax"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "_"
+        [email protected] ";"
+      [email protected] " "
+      [email protected] "//~ ERROR: expected e ..."
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 95..95: expected type
 error 95..95: expected COMMA
diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
index f2fada510..568a4cc02 100644
--- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
+++ b/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
@@ -21,9 +21,8 @@ [email protected]
             [email protected] ">"
     [email protected] "\n"
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 26..26: expected a path
 error 26..26: expected colon
diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
index 56682f966..0da8f59f0 100644
--- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
+++ b/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
@@ -20,17 +20,16 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "a"
-          [email protected] "."
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "a"
+        [email protected] "."
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 21..21: expected field name or number
diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
index aac476430..515819e42 100644
--- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
@@ -9,115 +9,111 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "inner"
-          [email protected] " "
-          [email protected] "="
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "!"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "doc"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "\"Inner attributes not ..."
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected] "//! Nor are ModuleDoc ..."
-              [email protected] "\n    "
-              [email protected] "}"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "if"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "true"
-            [email protected] " "
-            [email protected]
-              [email protected]
-                [email protected] "{"
-                [email protected] "\n        "
-                [email protected]
-                  [email protected] "#"
-                  [email protected] "!"
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "doc"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "\"Nor here\""
-                    [email protected] ")"
-                  [email protected] "]"
-                [email protected] "\n        "
-                [email protected]
-                  [email protected] "#"
-                  [email protected] "!"
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "doc"
-                  [email protected]
-                    [email protected] "("
-                    [email protected] "\"We error on each attr\""
-                    [email protected] ")"
-                  [email protected] "]"
-                [email protected] "\n        "
-                [email protected] "//! Nor are ModuleDoc ..."
-                [email protected] "\n    "
-                [email protected] "}"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "while"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "true"
-          [email protected] " "
-          [email protected]
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-                [email protected] "!"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "doc"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "\"Nor here\""
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected] "//! Nor are ModuleDoc ..."
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "inner"
+        [email protected] " "
+        [email protected] "="
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Inner attributes not ..."
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected] "//! Nor are ModuleDoc ..."
+          [email protected] "\n    "
+          [email protected] "}"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "if"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "true"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+              [email protected] "!"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"Nor here\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+              [email protected] "!"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "doc"
+              [email protected]
+                [email protected] "("
+                [email protected] "\"We error on each attr\""
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected] "//! Nor are ModuleDoc ..."
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "while"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected] "true"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected] "#"
+            [email protected] "!"
+            [email protected] "["
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "doc"
+            [email protected]
+              [email protected] "("
+              [email protected] "\"Nor here\""
+              [email protected] ")"
+            [email protected] "]"
+          [email protected] "\n        "
+          [email protected] "//! Nor are ModuleDoc ..."
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 39..83: A block in this position cannot accept inner attributes
 error 152..171: A block in this position cannot accept inner attributes
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
index f98de7f15..c6859eca8 100644
--- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
@@ -9,187 +9,186 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "#"
-                [email protected]
-                  [email protected] "!"
-                [email protected]
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "doc"
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "\"Not allowed here\""
-                      [email protected] ")"
-                  [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected]
-            [email protected] "match"
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-            [email protected] " "
-            [email protected]
-              [email protected] "{"
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "_"
-                [email protected] " "
-                [email protected] "=>"
-                [email protected] " "
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] ","
-              [email protected] "\n        "
-              [email protected]
-                [email protected]
-                  [email protected] "#"
-                [email protected]
-                  [email protected] "!"
-                [email protected]
-                  [email protected] "["
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected]
-                            [email protected] "doc"
-                    [email protected]
-                      [email protected] "("
-                      [email protected]
-                        [email protected] "\"Nor here\""
-                      [email protected] ")"
-                  [email protected] "]"
-              [email protected] "\n    "
-              [email protected] "}"
-        [email protected] "\n\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "test"
-                  [email protected] ")"
-                [email protected] "]"
-              [email protected] "\n        "
-              [email protected]
-                [email protected] "#"
-              [email protected]
-                [email protected] "!"
-              [email protected]
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "doc"
-                  [email protected]
-                    [email protected] "("
-                    [email protected]
-                      [email protected] "\"Nor here\""
-                    [email protected] ")"
-                [email protected] "]"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "#"
+              [email protected]
+                [email protected] "!"
+              [email protected]
+                [email protected] "["
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "doc"
+                  [email protected]
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "\"Not allowed here\""
+                    [email protected] ")"
+                [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected]
+          [email protected] "match"
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+          [email protected] " "
+          [email protected]
+            [email protected] "{"
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "_"
+              [email protected] " "
+              [email protected] "=>"
+              [email protected] " "
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] ","
+            [email protected] "\n        "
+            [email protected]
+              [email protected]
+                [email protected] "#"
+              [email protected]
+                [email protected] "!"
+              [email protected]
+                [email protected] "["
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected]
+                          [email protected] "doc"
+                  [email protected]
+                    [email protected] "("
+                    [email protected]
+                      [email protected] "\"Nor here\""
+                    [email protected] ")"
+                [email protected] "]"
+            [email protected] "\n    "
+            [email protected] "}"
+      [email protected] "\n\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "test"
+                [email protected] ")"
+              [email protected] "]"
+            [email protected] "\n        "
+            [email protected]
+              [email protected] "#"
+            [email protected]
+              [email protected] "!"
+            [email protected]
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "doc"
+                [email protected]
+                  [email protected] "("
+                  [email protected]
+                    [email protected] "\"Nor here\""
+                  [email protected] ")"
+              [email protected] "]"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 52..52: expected `[`
 error 52..52: expected pattern
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
index d0017c883..53e445459 100644
--- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
+++ b/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
@@ -9,58 +9,57 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "match"
-          [email protected] " "
-          [email protected]
-            [email protected] "("
-            [email protected] ")"
-          [email protected] " "
-          [email protected]
-            [email protected] "{"
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "_"
-              [email protected] " "
-              [email protected] "=>"
-              [email protected] " "
-              [email protected]
-                [email protected] "("
-                [email protected] ")"
-            [email protected] ","
-            [email protected] "\n        "
-            [email protected]
-              [email protected]
-                [email protected] "#"
-                [email protected] "["
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected] "cfg"
-                [email protected]
-                  [email protected] "("
-                  [email protected] "test"
-                  [email protected] ")"
-                [email protected] "]"
-            [email protected] "\n    "
-            [email protected] "}"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "match"
+        [email protected] " "
+        [email protected]
+          [email protected] "("
+          [email protected] ")"
+        [email protected] " "
+        [email protected]
+          [email protected] "{"
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "_"
+            [email protected] " "
+            [email protected] "=>"
+            [email protected] " "
+            [email protected]
+              [email protected] "("
+              [email protected] ")"
+          [email protected] ","
+          [email protected] "\n        "
+          [email protected]
+            [email protected]
+              [email protected] "#"
+              [email protected] "["
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected] "cfg"
+              [email protected]
+                [email protected] "("
+                [email protected] "test"
+                [email protected] ")"
+              [email protected] "]"
+          [email protected] "\n    "
+          [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 80..80: expected pattern
 error 80..80: expected FAT_ARROW
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
index 2c0bddec8..1b2ac5011 100644
--- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
+++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
@@ -9,84 +9,83 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected]
-              [email protected] "box"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "i"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "box"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "i"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected] "let"
-          [email protected] " "
-          [email protected]
-            [email protected] "ref"
-            [email protected] " "
-            [email protected] "mut"
-            [email protected] " "
-            [email protected]
-              [email protected] "box"
-        [email protected] " "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected] "i"
-            [email protected] " "
-            [email protected] "="
-            [email protected] " "
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected]
+            [email protected] "box"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "i"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "box"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "i"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "let"
+        [email protected] " "
+        [email protected]
+          [email protected] "ref"
+          [email protected] " "
+          [email protected] "mut"
+          [email protected] " "
+          [email protected]
+            [email protected] "box"
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected] "i"
+          [email protected] " "
+          [email protected] "="
+          [email protected] " "
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n\n"
 error 24..24: expected a name
 error 27..27: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
index 83851f5d2..9588cf3b3 100644
--- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
+++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
@@ -44,9 +44,8 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "}"
   [email protected] "\n"
 error 17..17: expected one of `*`, `::`, `{`, `self`, `super` or an identifier
 error 17..17: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
index a328222aa..e3cda7c43 100644
--- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
+++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
@@ -27,9 +27,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected]
@@ -44,9 +43,8 @@ [email protected]
           [email protected] ")"
         [email protected] " "
         [email protected]
-          [email protected]
-            [email protected] "{"
-            [email protected] "}"
+          [email protected] "{"
+          [email protected] "}"
       [email protected] "\n    "
       [email protected]
         [email protected]
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
index bcd1fad69..21db9ee85 100644
--- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
+++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
@@ -9,22 +9,21 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected] "0"
-            [email protected] "..="
-          [email protected] ";"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected] "..="
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "0"
+          [email protected] "..="
+        [email protected] ";"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "..="
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 16..20: An inclusive range must have an end expression
 error 26..29: An inclusive range must have an end expression
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
index 433ea7bad..ec950381b 100644
--- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
+++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
@@ -18,66 +18,65 @@ [email protected]
               [email protected] "i32"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected]
-                  [email protected] "["
-                  [email protected]
-                    [email protected] "1"
-                  [email protected] ","
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "2"
-                  [email protected] ","
-                  [email protected] " "
-                  [email protected]
-                    [email protected] "3"
-                  [email protected] "]"
-                [email protected] "."
-                [email protected]
-                  [email protected] "iter"
-                [email protected]
-                  [email protected] "("
-                  [email protected] ")"
-              [email protected] "\n        "
-              [email protected] "."
-              [email protected]
-                [email protected] "map"
-              [email protected]
-                [email protected] "("
-                [email protected]
-                  [email protected]
-                    [email protected] "|"
-                    [email protected]
-                      [email protected]
-                        [email protected]
-                          [email protected] "it"
-                    [email protected] "|"
-                [email protected] ")"
-            [email protected] "\n        "
-            [email protected] "."
-            [email protected]
-              [email protected] "max"
-            [email protected]
-              [email protected] "::"
-              [email protected] "<"
-              [email protected]
-                [email protected]
-                  [email protected]
-                    [email protected]
-                      [email protected]
-                        [email protected] "i32"
-              [email protected] ">"
-            [email protected]
-              [email protected] "("
-              [email protected] ")"
-          [email protected] ";"
-        [email protected] "\n"
-        [email protected] "}"
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "["
+                [email protected]
+                  [email protected] "1"
+                [email protected] ","
+                [email protected] " "
+                [email protected]
+                  [email protected] "2"
+                [email protected] ","
+                [email protected] " "
+                [email protected]
+                  [email protected] "3"
+                [email protected] "]"
+              [email protected] "."
+              [email protected]
+                [email protected] "iter"
+              [email protected]
+                [email protected] "("
+                [email protected] ")"
+            [email protected] "\n        "
+            [email protected] "."
+            [email protected]
+              [email protected] "map"
+            [email protected]
+              [email protected] "("
+              [email protected]
+                [email protected]
+                  [email protected] "|"
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "it"
+                  [email protected] "|"
+              [email protected] ")"
+          [email protected] "\n        "
+          [email protected] "."
+          [email protected]
+            [email protected] "max"
+          [email protected]
+            [email protected] "::"
+            [email protected] "<"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected] "i32"
+            [email protected] ">"
+          [email protected]
+            [email protected] "("
+            [email protected] ")"
+        [email protected] ";"
+      [email protected] "\n"
+      [email protected] "}"
   [email protected] "\n"
 error 56..56: expected expression
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
new file mode 100644
index 000000000..d2a549273
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
@@ -0,0 +1,91 @@
+[email protected]
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "::"
+          [email protected] "crate"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected] "{"
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "crate"
+        [email protected] ","
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "foo"
+          [email protected] "::"
+          [email protected]
+            [email protected] "{"
+            [email protected]
+              [email protected]
+                [email protected]
+                  [email protected]
+                    [email protected]
+                      [email protected]
+                        [email protected] "crate"
+                    [email protected] "::"
+                    [email protected]
+                      [email protected]
+                        [email protected] "foo"
+                  [email protected] "::"
+                  [email protected]
+                    [email protected]
+                      [email protected] "bar"
+                [email protected] "::"
+                [email protected]
+                  [email protected]
+                    [email protected] "baz"
+            [email protected] "}"
+        [email protected] "}"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "hello"
+        [email protected] "::"
+        [email protected]
+          [email protected] "crate"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "hello"
+          [email protected] "::"
+          [email protected]
+            [email protected] "crate"
+        [email protected] "::"
+        [email protected]
+          [email protected]
+            [email protected] "there"
+    [email protected] ";"
+  [email protected] "\n"
+error 6..11: The `crate` keyword is only allowed as the first segment of a path
+error 31..36: The `crate` keyword is only allowed as the first segment of a path
+error 66..71: The `crate` keyword is only allowed as the first segment of a path
+error 84..89: The `crate` keyword is only allowed as the first segment of a path
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs
new file mode 100644
index 000000000..508def2c7
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs
@@ -0,0 +1,4 @@
+use ::crate;
+use {crate, foo::{crate::foo::bar::baz}};
+use hello::crate;
+use hello::crate::there;
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
new file mode 100644
index 000000000..d0360c467
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
@@ -0,0 +1,70 @@
+[email protected]
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "::"
+          [email protected] "super"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "a"
+        [email protected] "::"
+        [email protected]
+          [email protected] "super"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "super"
+          [email protected] "::"
+          [email protected]
+            [email protected]
+              [email protected] "a"
+        [email protected] "::"
+        [email protected]
+          [email protected] "super"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "a"
+      [email protected] "::"
+      [email protected]
+        [email protected] "{"
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "super"
+            [email protected] "::"
+            [email protected]
+              [email protected]
+                [email protected] "b"
+        [email protected] "}"
+    [email protected] ";"
+  [email protected] "\n"
+error 6..11: The `super` keyword may only be preceded by other `super`s
+error 20..25: The `super` keyword may only be preceded by other `super`s
+error 41..46: The `super` keyword may only be preceded by other `super`s
+error 56..61: The `super` keyword may only be preceded by other `super`s
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs
new file mode 100644
index 000000000..bd4d58042
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs
@@ -0,0 +1,4 @@
+use ::super;
+use a::super;
+use super::a::super;
+use a::{super::b};
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
new file mode 100644
index 000000000..4f382b06c
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
@@ -0,0 +1,27 @@
+[email protected]
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "::"
+          [email protected] "self"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "a"
+        [email protected] "::"
+        [email protected]
+          [email protected] "self"
+    [email protected] ";"
+  [email protected] "\n"
+error 6..10: The `self` keyword is only allowed as the first segment of a path
+error 19..23: The `self` keyword is only allowed as the first segment of a path
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs
new file mode 100644
index 000000000..b9e1d7d8b
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs
@@ -0,0 +1,2 @@
+use ::self;
+use a::self;
diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
new file mode 100644
index 000000000..e46456384
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rast
@@ -0,0 +1,71 @@
+[email protected]
+  [email protected]
+    [email protected] "fn"
+    [email protected] " "
+    [email protected]
+      [email protected] "main"
+    [email protected]
+      [email protected] "("
+      [email protected] ")"
+    [email protected] " "
+    [email protected]
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected] "unsafe"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected] "async"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected] "{"
+          [email protected] " "
+          [email protected]
+            [email protected]
+              [email protected] "try"
+          [email protected] " "
+          [email protected]
+            [email protected] "92"
+          [email protected] " "
+          [email protected] "}"
+      [email protected] "\n    "
+      [email protected]
+        [email protected] "{"
+        [email protected] " "
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "\'label"
+              [email protected] ":"
+        [email protected] " "
+        [email protected]
+          [email protected] "92"
+        [email protected] " "
+        [email protected] "}"
+      [email protected] "\n"
+      [email protected] "}"
+  [email protected] "\n"
+error 24..24: expected existential, fn, trait or impl
+error 41..41: expected existential, fn, trait or impl
+error 56..56: expected a block
+error 75..75: expected a loop
+error 75..75: expected SEMICOLON
diff --git a/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs
new file mode 100644
index 000000000..8fa324c1a
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0163_weird_blocks.rs
@@ -0,0 +1,6 @@
+fn main() {
+    { unsafe 92 }
+    { async 92 }
+    { try 92 }
+    { 'label: 92 }
+}
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
index 85bf276a0..75668c818 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
@@ -9,19 +9,18 @@ [email protected]
       [email protected] ")"
     [email protected] " "
     [email protected]
-      [email protected]
-        [email protected] "{"
-        [email protected] "\n    "
-        [email protected]
-          [email protected]
+      [email protected] "{"
+      [email protected] "\n    "
+      [email protected]
+        [email protected]
+          [email protected]