Rename ra_syntax -> syntax

958 files changed, 353 insertions, 363 deletions

diff --git a/.gitattributes b/.gitattributes
index 4cd50e48109..7c2f752d69a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 * text=auto eol=lf
-crates/ra_syntax/test_data/** -text eof=LF
+crates/syntax/test_data/** -text eof=LF
 # Older git versions try to fix line endings on images, this prevents it.
 *.png binary
 *.jpg binary
diff --git a/Cargo.lock b/Cargo.lock
index 095127b99f2..c95ef002d3c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -933,9 +933,9 @@ dependencies = [
  "ra_fmt",
  "ra_hir",
  "ra_ide_db",
- "ra_syntax",
  "rustc-hash",
  "stdx",
+ "syntax",
  "test_utils",
  "text_edit",
 ]
@@ -945,8 +945,8 @@ name = "ra_cfg"
 version = "0.1.0"
 dependencies = [
  "ra_mbe",
- "ra_syntax",
  "rustc-hash",
+ "syntax",
  "tt",
 ]
 
@@ -956,10 +956,10 @@ version = "0.1.0"
 dependencies = [
  "profile",
  "ra_cfg",
- "ra_syntax",
  "rustc-hash",
  "salsa",
  "stdx",
+ "syntax",
  "test_utils",
  "tt",
  "vfs",
@@ -970,7 +970,7 @@ name = "ra_fmt"
 version = "0.1.0"
 dependencies = [
  "itertools",
- "ra_syntax",
+ "syntax",
 ]
 
 [[package]]
@@ -986,9 +986,9 @@ dependencies = [
  "ra_hir_def",
  "ra_hir_expand",
  "ra_hir_ty",
- "ra_syntax",
  "rustc-hash",
  "stdx",
+ "syntax",
 ]
 
 [[package]]
@@ -1010,10 +1010,10 @@ dependencies = [
  "ra_db",
  "ra_hir_expand",
  "ra_mbe",
- "ra_syntax",
  "rustc-hash",
  "smallvec",
  "stdx",
+ "syntax",
  "test_utils",
  "tt",
 ]
@@ -1029,8 +1029,8 @@ dependencies = [
  "profile",
  "ra_db",
  "ra_mbe",
- "ra_syntax",
  "rustc-hash",
+ "syntax",
  "test_utils",
  "tt",
 ]
@@ -1052,11 +1052,11 @@ dependencies = [
  "ra_db",
  "ra_hir_def",
  "ra_hir_expand",
- "ra_syntax",
  "rustc-hash",
  "scoped-tls",
  "smallvec",
  "stdx",
+ "syntax",
  "test_utils",
  "tracing",
  "tracing-subscriber",
@@ -1081,9 +1081,9 @@ dependencies = [
  "ra_hir",
  "ra_ide_db",
  "ra_ssr",
- "ra_syntax",
  "rustc-hash",
  "stdx",
+ "syntax",
  "test_utils",
  "text_edit",
 ]
@@ -1099,10 +1099,10 @@ dependencies = [
  "profile",
  "ra_db",
  "ra_hir",
- "ra_syntax",
  "rayon",
  "rustc-hash",
  "stdx",
+ "syntax",
  "test_utils",
  "text_edit",
 ]
@@ -1113,9 +1113,9 @@ version = "0.1.0"
 dependencies = [
  "log",
  "parser",
- "ra_syntax",
  "rustc-hash",
  "smallvec",
+ "syntax",
  "test_utils",
  "tt",
 ]
@@ -1176,34 +1176,13 @@ dependencies = [
  "ra_db",
  "ra_hir",
  "ra_ide_db",
- "ra_syntax",
  "rustc-hash",
+ "syntax",
  "test_utils",
  "text_edit",
 ]
 
 [[package]]
-name = "ra_syntax"
-version = "0.1.0"
-dependencies = [
- "arrayvec",
- "expect",
- "itertools",
- "once_cell",
- "parser",
- "rayon",
- "rowan",
- "rustc-ap-rustc_lexer",
- "rustc-hash",
- "serde",
- "smol_str",
- "stdx",
- "test_utils",
- "text_edit",
- "walkdir",
-]
-
-[[package]]
 name = "rayon"
 version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1304,12 +1283,12 @@ dependencies = [
  "ra_proc_macro_srv",
  "ra_project_model",
  "ra_ssr",
- "ra_syntax",
  "rayon",
  "rustc-hash",
  "serde",
  "serde_json",
  "stdx",
+ "syntax",
  "test_utils",
  "text_edit",
  "threadpool",
@@ -1533,6 +1512,27 @@ dependencies = [
 ]
 
 [[package]]
+name = "syntax"
+version = "0.0.0"
+dependencies = [
+ "arrayvec",
+ "expect",
+ "itertools",
+ "once_cell",
+ "parser",
+ "rayon",
+ "rowan",
+ "rustc-ap-rustc_lexer",
+ "rustc-hash",
+ "serde",
+ "smol_str",
+ "stdx",
+ "test_utils",
+ "text_edit",
+ "walkdir",
+]
+
+[[package]]
 name = "termcolor"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/crates/parser/src/grammar.rs b/crates/parser/src/grammar.rs
index 88468bc9716..9dbd2ebc445 100644
--- a/crates/parser/src/grammar.rs
+++ b/crates/parser/src/grammar.rs
@@ -20,7 +20,7 @@
 //!
 //! After adding a new inline-test, run `cargo xtask codegen` to
 //! extract it as a standalone text-fixture into
-//! `crates/ra_syntax/test_data/parser/`, and run `cargo test` once to
+//! `crates/syntax/test_data/parser/`, and run `cargo test` once to
 //! create the "gold" value.
 //!
 //! Coding convention: rules like `where_clause` always produce either a
diff --git a/crates/parser/src/lib.rs b/crates/parser/src/lib.rs
index eeb8ad66bd1..41e62116f88 100644
--- a/crates/parser/src/lib.rs
+++ b/crates/parser/src/lib.rs
@@ -10,7 +10,7 @@
 //!
 //! The actual parsing happens in the `grammar` module.
 //!
-//! Tests for this crate live in `ra_syntax` crate.
+//! Tests for this crate live in `syntax` crate.
 
 #[macro_use]
 mod token_set;
diff --git a/crates/ra_assists/Cargo.toml b/crates/ra_assists/Cargo.toml
index e4a5ee6c1c8..abc290463a4 100644
--- a/crates/ra_assists/Cargo.toml
+++ b/crates/ra_assists/Cargo.toml
@@ -15,7 +15,7 @@ either = "1.5.3"
 
 stdx = { path = "../stdx" }
 
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 text_edit = { path = "../text_edit" }
 ra_fmt = { path = "../ra_fmt" }
 profile = { path = "../profile" }
diff --git a/crates/ra_assists/src/assist_context.rs b/crates/ra_assists/src/assist_context.rs
index fcaa1aedcf3..217f692a4ed 100644
--- a/crates/ra_assists/src/assist_context.rs
+++ b/crates/ra_assists/src/assist_context.rs
@@ -10,7 +10,7 @@ use ra_ide_db::{
     source_change::{SourceChange, SourceFileEdit},
     RootDatabase,
 };
-use ra_syntax::{
+use syntax::{
     algo::{self, find_node_at_offset, SyntaxRewriter},
     AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize,
     TokenAtOffset,
@@ -271,7 +271,7 @@ impl AssistBuilder {
     }
     /// Replaces specified `node` of text with a given string, reindenting the
     /// string to maintain `node`'s existing indent.
-    // FIXME: remove in favor of ra_syntax::edit::IndentLevel::increase_indent
+    // FIXME: remove in favor of syntax::edit::IndentLevel::increase_indent
     pub(crate) fn replace_node_and_indent(
         &mut self,
         node: &SyntaxNode,
diff --git a/crates/ra_assists/src/ast_transform.rs b/crates/ra_assists/src/ast_transform.rs
index 07c978378a6..4c41c16d86c 100644
--- a/crates/ra_assists/src/ast_transform.rs
+++ b/crates/ra_assists/src/ast_transform.rs
@@ -2,13 +2,13 @@
 use rustc_hash::FxHashMap;
 
 use hir::{HirDisplay, PathResolution, SemanticsScope};
-use ra_syntax::{
+use syntax::{
     algo::SyntaxRewriter,
     ast::{self, AstNode},
 };
 
 pub trait AstTransform<'a> {
-    fn get_substitution(&self, node: &ra_syntax::SyntaxNode) -> Option<ra_syntax::SyntaxNode>;
+    fn get_substitution(&self, node: &syntax::SyntaxNode) -> Option<syntax::SyntaxNode>;
 
     fn chain_before(self, other: Box<dyn AstTransform<'a> + 'a>) -> Box<dyn AstTransform<'a> + 'a>;
     fn or<T: AstTransform<'a> + 'a>(self, other: T) -> Box<dyn AstTransform<'a> + 'a>
@@ -22,7 +22,7 @@ pub trait AstTransform<'a> {
 struct NullTransformer;
 
 impl<'a> AstTransform<'a> for NullTransformer {
-    fn get_substitution(&self, _node: &ra_syntax::SyntaxNode) -> Option<ra_syntax::SyntaxNode> {
+    fn get_substitution(&self, _node: &syntax::SyntaxNode) -> Option<syntax::SyntaxNode> {
         None
     }
     fn chain_before(self, other: Box<dyn AstTransform<'a> + 'a>) -> Box<dyn AstTransform<'a> + 'a> {
@@ -101,10 +101,7 @@ impl<'a> SubstituteTypeParams<'a> {
             Some(result)
         }
     }
-    fn get_substitution_inner(
-        &self,
-        node: &ra_syntax::SyntaxNode,
-    ) -> Option<ra_syntax::SyntaxNode> {
+    fn get_substitution_inner(&self, node: &syntax::SyntaxNode) -> Option<syntax::SyntaxNode> {
         let type_ref = ast::Type::cast(node.clone())?;
         let path = match &type_ref {
             ast::Type::PathType(path_type) => path_type.path()?,
@@ -122,7 +119,7 @@ impl<'a> SubstituteTypeParams<'a> {
 }
 
 impl<'a> AstTransform<'a> for SubstituteTypeParams<'a> {
-    fn get_substitution(&self, node: &ra_syntax::SyntaxNode) -> Option<ra_syntax::SyntaxNode> {
+    fn get_substitution(&self, node: &syntax::SyntaxNode) -> Option<syntax::SyntaxNode> {
         self.get_substitution_inner(node).or_else(|| self.previous.get_substitution(node))
     }
     fn chain_before(self, other: Box<dyn AstTransform<'a> + 'a>) -> Box<dyn AstTransform<'a> + 'a> {
@@ -141,10 +138,7 @@ impl<'a> QualifyPaths<'a> {
         Self { target_scope, source_scope, previous: Box::new(NullTransformer) }
     }
 
-    fn get_substitution_inner(
-        &self,
-        node: &ra_syntax::SyntaxNode,
-    ) -> Option<ra_syntax::SyntaxNode> {
+    fn get_substitution_inner(&self, node: &syntax::SyntaxNode) -> Option<syntax::SyntaxNode> {
         // FIXME handle value ns?
         let from = self.target_scope.module()?;
         let p = ast::Path::cast(node.clone())?;
@@ -183,7 +177,7 @@ impl<'a> QualifyPaths<'a> {
 
 pub fn apply<'a, N: AstNode>(transformer: &dyn AstTransform<'a>, node: N) -> N {
     SyntaxRewriter::from_fn(|element| match element {
-        ra_syntax::SyntaxElement::Node(n) => {
+        syntax::SyntaxElement::Node(n) => {
             let replacement = transformer.get_substitution(&n)?;
             Some(replacement.into())
         }
@@ -193,7 +187,7 @@ pub fn apply<'a, N: AstNode>(transformer: &dyn AstTransform<'a>, node: N) -> N {
 }
 
 impl<'a> AstTransform<'a> for QualifyPaths<'a> {
-    fn get_substitution(&self, node: &ra_syntax::SyntaxNode) -> Option<ra_syntax::SyntaxNode> {
+    fn get_substitution(&self, node: &syntax::SyntaxNode) -> Option<syntax::SyntaxNode> {
         self.get_substitution_inner(node).or_else(|| self.previous.get_substitution(node))
     }
     fn chain_before(self, other: Box<dyn AstTransform<'a> + 'a>) -> Box<dyn AstTransform<'a> + 'a> {
diff --git a/crates/ra_assists/src/handlers/add_custom_impl.rs b/crates/ra_assists/src/handlers/add_custom_impl.rs
index ebdf00e676c..8757fa33f26 100644
--- a/crates/ra_assists/src/handlers/add_custom_impl.rs
+++ b/crates/ra_assists/src/handlers/add_custom_impl.rs
@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode},
     Direction, SmolStr,
     SyntaxKind::{IDENT, WHITESPACE},
diff --git a/crates/ra_assists/src/handlers/add_explicit_type.rs b/crates/ra_assists/src/handlers/add_explicit_type.rs
index 135a2ac9c90..563cbf505f4 100644
--- a/crates/ra_assists/src/handlers/add_explicit_type.rs
+++ b/crates/ra_assists/src/handlers/add_explicit_type.rs
@@ -1,5 +1,5 @@
 use hir::HirDisplay;
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode, LetStmt, NameOwner},
     TextRange,
 };
diff --git a/crates/ra_assists/src/handlers/add_missing_impl_members.rs b/crates/ra_assists/src/handlers/add_missing_impl_members.rs
index dd1406228c6..81b61ebf8e4 100644
--- a/crates/ra_assists/src/handlers/add_missing_impl_members.rs
+++ b/crates/ra_assists/src/handlers/add_missing_impl_members.rs
@@ -1,5 +1,5 @@
 use hir::HasSource;
-use ra_syntax::{
+use syntax::{
     ast::{
         self,
         edit::{self, AstNodeEdit, IndentLevel},
diff --git a/crates/ra_assists/src/handlers/add_turbo_fish.rs b/crates/ra_assists/src/handlers/add_turbo_fish.rs
index 537322a72c3..8c7ffae3dde 100644
--- a/crates/ra_assists/src/handlers/add_turbo_fish.rs
+++ b/crates/ra_assists/src/handlers/add_turbo_fish.rs
@@ -1,5 +1,5 @@
 use ra_ide_db::defs::{classify_name_ref, Definition, NameRefClass};
-use ra_syntax::{ast, AstNode, SyntaxKind, T};
+use syntax::{ast, AstNode, SyntaxKind, T};
 use test_utils::mark;
 
 use crate::{
diff --git a/crates/ra_assists/src/handlers/apply_demorgan.rs b/crates/ra_assists/src/handlers/apply_demorgan.rs
index 3ac4aed7d29..1a6fdafda2c 100644
--- a/crates/ra_assists/src/handlers/apply_demorgan.rs
+++ b/crates/ra_assists/src/handlers/apply_demorgan.rs
@@ -1,4 +1,4 @@
-use ra_syntax::ast::{self, AstNode};
+use syntax::ast::{self, AstNode};
 
 use crate::{utils::invert_boolean_expression, AssistContext, AssistId, AssistKind, Assists};
 
diff --git a/crates/ra_assists/src/handlers/auto_import.rs b/crates/ra_assists/src/handlers/auto_import.rs
index 6ec59ec4d4f..e19b197d9e0 100644
--- a/crates/ra_assists/src/handlers/auto_import.rs
+++ b/crates/ra_assists/src/handlers/auto_import.rs
@@ -6,11 +6,11 @@ use hir::{
     Type,
 };
 use ra_ide_db::{imports_locator, RootDatabase};
-use ra_syntax::{
+use rustc_hash::FxHashSet;
+use syntax::{
     ast::{self, AstNode},
     SyntaxNode,
 };
-use rustc_hash::FxHashSet;
 
 use crate::{
     utils::insert_use_statement, AssistContext, AssistId, AssistKind, Assists, GroupLabel,
diff --git a/crates/ra_assists/src/handlers/change_return_type_to_result.rs b/crates/ra_assists/src/handlers/change_return_type_to_result.rs
index b83c944049c..d5a68a24c9e 100644
--- a/crates/ra_assists/src/handlers/change_return_type_to_result.rs
+++ b/crates/ra_assists/src/handlers/change_return_type_to_result.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{
+use syntax::{
     ast::{self, BlockExpr, Expr, LoopBodyOwner},
     AstNode, SyntaxNode,
 };
diff --git a/crates/ra_assists/src/handlers/change_visibility.rs b/crates/ra_assists/src/handlers/change_visibility.rs
index 724daa93f41..32dc0537890 100644
--- a/crates/ra_assists/src/handlers/change_visibility.rs
+++ b/crates/ra_assists/src/handlers/change_visibility.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{
+use syntax::{
     ast::{self, NameOwner, VisibilityOwner},
     AstNode,
     SyntaxKind::{CONST, ENUM, FN, MODULE, STATIC, STRUCT, TRAIT, VISIBILITY},
diff --git a/crates/ra_assists/src/handlers/early_return.rs b/crates/ra_assists/src/handlers/early_return.rs
index 6816a2709e4..7fd78e9d470 100644
--- a/crates/ra_assists/src/handlers/early_return.rs
+++ b/crates/ra_assists/src/handlers/early_return.rs
@@ -1,6 +1,6 @@
 use std::{iter::once, ops::RangeInclusive};
 
-use ra_syntax::{
+use syntax::{
     algo::replace_children,
     ast::{
         self,
diff --git a/crates/ra_assists/src/handlers/expand_glob_import.rs b/crates/ra_assists/src/handlers/expand_glob_import.rs
index eb216a81a11..cf34ffaf7f7 100644
--- a/crates/ra_assists/src/handlers/expand_glob_import.rs
+++ b/crates/ra_assists/src/handlers/expand_glob_import.rs
@@ -3,7 +3,7 @@ use ra_ide_db::{
     defs::{classify_name_ref, Definition, NameRefClass},
     RootDatabase,
 };
-use ra_syntax::{algo, ast, match_ast, AstNode, SyntaxNode, SyntaxToken, T};
+use syntax::{algo, ast, match_ast, AstNode, SyntaxNode, SyntaxToken, T};
 
 use crate::{
     assist_context::{AssistBuilder, AssistContext, Assists},
diff --git a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
index ccec688caee..6e9f2d0fc76 100644
--- a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -2,12 +2,12 @@ use hir::{EnumVariant, Module, ModuleDef, Name};
 use ra_db::FileId;
 use ra_fmt::leading_indent;
 use ra_ide_db::{defs::Definition, search::Reference, RootDatabase};
-use ra_syntax::{
+use rustc_hash::FxHashSet;
+use syntax::{
     algo::find_node_at_offset,
     ast::{self, ArgListOwner, AstNode, NameOwner, VisibilityOwner},
     SourceFile, SyntaxNode, TextRange, TextSize,
 };
-use rustc_hash::FxHashSet;
 
 use crate::{
     assist_context::AssistBuilder, utils::insert_use_statement, AssistContext, AssistId,
diff --git a/crates/ra_assists/src/handlers/extract_variable.rs b/crates/ra_assists/src/handlers/extract_variable.rs
index cc62db0c446..d2ae137cdd3 100644
--- a/crates/ra_assists/src/handlers/extract_variable.rs
+++ b/crates/ra_assists/src/handlers/extract_variable.rs
@@ -1,11 +1,11 @@
-use ra_syntax::{
+use stdx::format_to;
+use syntax::{
     ast::{self, AstNode},
     SyntaxKind::{
         BLOCK_EXPR, BREAK_EXPR, CLOSURE_EXPR, COMMENT, LOOP_EXPR, MATCH_ARM, PATH_EXPR, RETURN_EXPR,
     },
     SyntaxNode,
 };
-use stdx::format_to;
 use test_utils::mark;
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
diff --git a/crates/ra_assists/src/handlers/fill_match_arms.rs b/crates/ra_assists/src/handlers/fill_match_arms.rs
index 6698d1a27a2..8f666063727 100644
--- a/crates/ra_assists/src/handlers/fill_match_arms.rs
+++ b/crates/ra_assists/src/handlers/fill_match_arms.rs
@@ -3,7 +3,7 @@ use std::iter;
 use hir::{Adt, HasSource, ModuleDef, Semantics};
 use itertools::Itertools;
 use ra_ide_db::RootDatabase;
-use ra_syntax::ast::{self, make, AstNode, MatchArm, NameOwner, Pat};
+use syntax::ast::{self, make, AstNode, MatchArm, NameOwner, Pat};
 use test_utils::mark;
 
 use crate::{
diff --git a/crates/ra_assists/src/handlers/fix_visibility.rs b/crates/ra_assists/src/handlers/fix_visibility.rs
index a19dbf33f6b..b6cc1a3204c 100644
--- a/crates/ra_assists/src/handlers/fix_visibility.rs
+++ b/crates/ra_assists/src/handlers/fix_visibility.rs
@@ -1,6 +1,6 @@
 use hir::{db::HirDatabase, HasSource, HasVisibility, PathResolution};
 use ra_db::FileId;
-use ra_syntax::{ast, AstNode, TextRange, TextSize};
+use syntax::{ast, AstNode, TextRange, TextSize};
 
 use crate::{utils::vis_offset, AssistContext, AssistId, AssistKind, Assists};
 use ast::VisibilityOwner;
diff --git a/crates/ra_assists/src/handlers/flip_binexpr.rs b/crates/ra_assists/src/handlers/flip_binexpr.rs
index 3cd5326505e..404f06133d7 100644
--- a/crates/ra_assists/src/handlers/flip_binexpr.rs
+++ b/crates/ra_assists/src/handlers/flip_binexpr.rs
@@ -1,4 +1,4 @@
-use ra_syntax::ast::{AstNode, BinExpr, BinOp};
+use syntax::ast::{AstNode, BinExpr, BinOp};
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
 
diff --git a/crates/ra_assists/src/handlers/flip_comma.rs b/crates/ra_assists/src/handlers/flip_comma.rs
index 55a971dc77e..5c69db53e56 100644
--- a/crates/ra_assists/src/handlers/flip_comma.rs
+++ b/crates/ra_assists/src/handlers/flip_comma.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{algo::non_trivia_sibling, Direction, T};
+use syntax::{algo::non_trivia_sibling, Direction, T};
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
 
diff --git a/crates/ra_assists/src/handlers/flip_trait_bound.rs b/crates/ra_assists/src/handlers/flip_trait_bound.rs
index 1234f4d2966..347e79b1dad 100644
--- a/crates/ra_assists/src/handlers/flip_trait_bound.rs
+++ b/crates/ra_assists/src/handlers/flip_trait_bound.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{
+use syntax::{
     algo::non_trivia_sibling,
     ast::{self, AstNode},
     Direction, T,
diff --git a/crates/ra_assists/src/handlers/generate_derive.rs b/crates/ra_assists/src/handlers/generate_derive.rs
index 90ece9fab05..314504e15ce 100644
--- a/crates/ra_assists/src/handlers/generate_derive.rs
+++ b/crates/ra_assists/src/handlers/generate_derive.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode, AttrsOwner},
     SyntaxKind::{COMMENT, WHITESPACE},
     TextSize,
diff --git a/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs b/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs
index 4c1aef8a21f..302b6b67d49 100644
--- a/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs
+++ b/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs
@@ -1,5 +1,5 @@
 use ra_ide_db::RootDatabase;
-use ra_syntax::ast::{self, AstNode, NameOwner};
+use syntax::ast::{self, AstNode, NameOwner};
 use test_utils::mark;
 
 use crate::{utils::FamousDefs, AssistContext, AssistId, AssistKind, Assists};
diff --git a/crates/ra_assists/src/handlers/generate_function.rs b/crates/ra_assists/src/handlers/generate_function.rs
index acc97e64820..b5df4410197 100644
--- a/crates/ra_assists/src/handlers/generate_function.rs
+++ b/crates/ra_assists/src/handlers/generate_function.rs
@@ -1,6 +1,7 @@
 use hir::HirDisplay;
 use ra_db::FileId;
-use ra_syntax::{
+use rustc_hash::{FxHashMap, FxHashSet};
+use syntax::{
     ast::{
         self,
         edit::{AstNodeEdit, IndentLevel},
@@ -8,7 +9,6 @@ use ra_syntax::{
     },
     SyntaxKind, SyntaxNode, TextSize,
 };
-use rustc_hash::{FxHashMap, FxHashSet};
 
 use crate::{
     assist_config::SnippetCap,
diff --git a/crates/ra_assists/src/handlers/generate_impl.rs b/crates/ra_assists/src/handlers/generate_impl.rs
index 7162dc18486..9989109b5ae 100644
--- a/crates/ra_assists/src/handlers/generate_impl.rs
+++ b/crates/ra_assists/src/handlers/generate_impl.rs
@@ -1,6 +1,6 @@
 use itertools::Itertools;
-use ra_syntax::ast::{self, AstNode, GenericParamsOwner, NameOwner};
 use stdx::format_to;
+use syntax::ast::{self, AstNode, GenericParamsOwner, NameOwner};
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
 
diff --git a/crates/ra_assists/src/handlers/generate_new.rs b/crates/ra_assists/src/handlers/generate_new.rs
index 32dfed274ad..7db10f27686 100644
--- a/crates/ra_assists/src/handlers/generate_new.rs
+++ b/crates/ra_assists/src/handlers/generate_new.rs
@@ -1,10 +1,10 @@
 use hir::Adt;
 use itertools::Itertools;
-use ra_syntax::{
+use stdx::format_to;
+use syntax::{
     ast::{self, AstNode, GenericParamsOwner, NameOwner, StructKind, VisibilityOwner},
     T,
 };
-use stdx::format_to;
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
 
diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/ra_assists/src/handlers/inline_local_variable.rs
index 3c58020f803..5315923206d 100644
--- a/crates/ra_assists/src/handlers/inline_local_variable.rs
+++ b/crates/ra_assists/src/handlers/inline_local_variable.rs
@@ -1,5 +1,5 @@
 use ra_ide_db::defs::Definition;
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode, AstToken},
     TextRange,
 };
diff --git a/crates/ra_assists/src/handlers/introduce_named_lifetime.rs b/crates/ra_assists/src/handlers/introduce_named_lifetime.rs
index fbaf3c06b52..5f623e5f7ad 100644
--- a/crates/ra_assists/src/handlers/introduce_named_lifetime.rs
+++ b/crates/ra_assists/src/handlers/introduce_named_lifetime.rs
@@ -1,8 +1,8 @@
-use ra_syntax::{
+use rustc_hash::FxHashSet;
+use syntax::{
     ast::{self, GenericParamsOwner, NameOwner},
     AstNode, SyntaxKind, TextRange, TextSize,
 };
-use rustc_hash::FxHashSet;
 
 use crate::{assist_context::AssistBuilder, AssistContext, AssistId, AssistKind, Assists};
 
diff --git a/crates/ra_assists/src/handlers/invert_if.rs b/crates/ra_assists/src/handlers/invert_if.rs
index bbe3f364360..f0e04753891 100644
--- a/crates/ra_assists/src/handlers/invert_if.rs
+++ b/crates/ra_assists/src/handlers/invert_if.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode},
     T,
 };
diff --git a/crates/ra_assists/src/handlers/merge_imports.rs b/crates/ra_assists/src/handlers/merge_imports.rs
index c775fe25c52..9c5c6eda72b 100644
--- a/crates/ra_assists/src/handlers/merge_imports.rs
+++ b/crates/ra_assists/src/handlers/merge_imports.rs
@@ -1,6 +1,6 @@
 use std::iter::successors;
 
-use ra_syntax::{
+use syntax::{
     algo::{neighbor, skip_trivia_token, SyntaxRewriter},
     ast::{self, edit::AstNodeEdit, make},
     AstNode, Direction, InsertPosition, SyntaxElement, T,
diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/ra_assists/src/handlers/merge_match_arms.rs
index 56329228233..c347eb40efa 100644
--- a/crates/ra_assists/src/handlers/merge_match_arms.rs
+++ b/crates/ra_assists/src/handlers/merge_match_arms.rs
@@ -1,6 +1,6 @@
 use std::iter::successors;
 
-use ra_syntax::{
+use syntax::{
     algo::neighbor,
     ast::{self, AstNode},
     Direction,
diff --git a/crates/ra_assists/src/handlers/move_bounds.rs b/crates/ra_assists/src/handlers/move_bounds.rs
index 6d394443ebf..e2e461520dc 100644
--- a/crates/ra_assists/src/handlers/move_bounds.rs
+++ b/crates/ra_assists/src/handlers/move_bounds.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{
+use syntax::{
     ast::{self, edit::AstNodeEdit, make, AstNode, NameOwner, TypeBoundsOwner},
     match_ast,
     SyntaxKind::*,
diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/ra_assists/src/handlers/move_guard.rs
index 4060d34c641..c62ebc30618 100644
--- a/crates/ra_assists/src/handlers/move_guard.rs
+++ b/crates/ra_assists/src/handlers/move_guard.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{
+use syntax::{
     ast::{AstNode, IfExpr, MatchArm},
     SyntaxKind::WHITESPACE,
 };
diff --git a/crates/ra_assists/src/handlers/raw_string.rs b/crates/ra_assists/src/handlers/raw_string.rs
index 4c797178f1c..9ddd116e015 100644
--- a/crates/ra_assists/src/handlers/raw_string.rs
+++ b/crates/ra_assists/src/handlers/raw_string.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use ra_syntax::{
+use syntax::{
     ast::{self, HasQuotes, HasStringValue},
     AstToken,
     SyntaxKind::{RAW_STRING, STRING},
diff --git a/crates/ra_assists/src/handlers/remove_dbg.rs b/crates/ra_assists/src/handlers/remove_dbg.rs
index 9430ce1b5b8..f3dcca53481 100644
--- a/crates/ra_assists/src/handlers/remove_dbg.rs
+++ b/crates/ra_assists/src/handlers/remove_dbg.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode},
     TextRange, TextSize, T,
 };
diff --git a/crates/ra_assists/src/handlers/remove_mut.rs b/crates/ra_assists/src/handlers/remove_mut.rs
index ef55c354ee5..44f41daa92d 100644
--- a/crates/ra_assists/src/handlers/remove_mut.rs
+++ b/crates/ra_assists/src/handlers/remove_mut.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{SyntaxKind, TextRange, T};
+use syntax::{SyntaxKind, TextRange, T};
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
 
diff --git a/crates/ra_assists/src/handlers/reorder_fields.rs b/crates/ra_assists/src/handlers/reorder_fields.rs
index c9b743a06b3..013720dfcbe 100644
--- a/crates/ra_assists/src/handlers/reorder_fields.rs
+++ b/crates/ra_assists/src/handlers/reorder_fields.rs
@@ -3,7 +3,7 @@ use rustc_hash::FxHashMap;
 
 use hir::{Adt, ModuleDef, PathResolution, Semantics, Struct};
 use ra_ide_db::RootDatabase;
-use ra_syntax::{algo, ast, match_ast, AstNode, SyntaxKind, SyntaxKind::*, SyntaxNode};
+use syntax::{algo, ast, match_ast, AstNode, SyntaxKind, SyntaxKind::*, SyntaxNode};
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
 
diff --git a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs b/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
index ecafb74a1e1..2442f049b65 100644
--- a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
+++ b/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
@@ -1,5 +1,5 @@
 use ra_fmt::unwrap_trivial_block;
-use ra_syntax::{
+use syntax::{
     ast::{
         self,
         edit::{AstNodeEdit, IndentLevel},
diff --git a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
index e4d436decc8..ed6d0c29be8 100644
--- a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
@@ -1,6 +1,6 @@
 use std::iter::once;
 
-use ra_syntax::{
+use syntax::{
     ast::{
         self,
         edit::{AstNodeEdit, IndentLevel},
diff --git a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
index da0a860c599..011bf1106d1 100644
--- a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
@@ -1,5 +1,5 @@
 use hir;
-use ra_syntax::{algo::SyntaxRewriter, ast, match_ast, AstNode, SmolStr, SyntaxNode};
+use syntax::{algo::SyntaxRewriter, ast, match_ast, AstNode, SmolStr, SyntaxNode};
 
 use crate::{
     utils::{find_insert_use_container, insert_use_statement},
diff --git a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs b/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
index d69f2c1b0e2..9705f11b76b 100644
--- a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
+++ b/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
@@ -1,6 +1,6 @@
 use std::iter;
 
-use ra_syntax::{
+use syntax::{
     ast::{
         self,
         edit::{AstNodeEdit, IndentLevel},
diff --git a/crates/ra_assists/src/handlers/split_import.rs b/crates/ra_assists/src/handlers/split_import.rs
index 4ca5c3ca14c..15e67eaa19f 100644
--- a/crates/ra_assists/src/handlers/split_import.rs
+++ b/crates/ra_assists/src/handlers/split_import.rs
@@ -1,6 +1,6 @@
 use std::iter::successors;
 
-use ra_syntax::{ast, AstNode, T};
+use syntax::{ast, AstNode, T};
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
 
diff --git a/crates/ra_assists/src/handlers/unwrap_block.rs b/crates/ra_assists/src/handlers/unwrap_block.rs
index 8b38695a948..2879090b867 100644
--- a/crates/ra_assists/src/handlers/unwrap_block.rs
+++ b/crates/ra_assists/src/handlers/unwrap_block.rs
@@ -1,5 +1,5 @@
 use ra_fmt::unwrap_trivial_block;
-use ra_syntax::{
+use syntax::{
     ast::{
         self,
         edit::{AstNodeEdit, IndentLevel},
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index 890996a68d9..e2ef561fee2 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -20,7 +20,7 @@ pub mod ast_transform;
 use hir::Semantics;
 use ra_db::FileRange;
 use ra_ide_db::{source_change::SourceChange, RootDatabase};
-use ra_syntax::TextRange;
+use syntax::TextRange;
 
 pub(crate) use crate::assist_context::{AssistContext, Assists};
 
diff --git a/crates/ra_assists/src/tests.rs b/crates/ra_assists/src/tests.rs
index e738364220d..1ae7aaa09be 100644
--- a/crates/ra_assists/src/tests.rs
+++ b/crates/ra_assists/src/tests.rs
@@ -3,7 +3,7 @@ mod generated;
 use hir::Semantics;
 use ra_db::{fixture::WithFixture, FileId, FileRange, SourceDatabaseExt};
 use ra_ide_db::RootDatabase;
-use ra_syntax::TextRange;
+use syntax::TextRange;
 use test_utils::{assert_eq_text, extract_offset, extract_range};
 
 use crate::{handlers::Handler, Assist, AssistConfig, AssistContext, AssistKind, Assists};
diff --git a/crates/ra_assists/src/utils.rs b/crates/ra_assists/src/utils.rs
index 0de6fdf3fb8..6d85661c461 100644
--- a/crates/ra_assists/src/utils.rs
+++ b/crates/ra_assists/src/utils.rs
@@ -5,13 +5,13 @@ use std::{iter, ops};
 
 use hir::{Adt, Crate, Enum, ScopeDef, Semantics, Trait, Type};
 use ra_ide_db::RootDatabase;
-use ra_syntax::{
+use rustc_hash::FxHashSet;
+use syntax::{
     ast::{self, make, NameOwner},
     AstNode,
     SyntaxKind::*,
     SyntaxNode, TextSize, T,
 };
-use rustc_hash::FxHashSet;
 
 use crate::assist_config::SnippetCap;
 
diff --git a/crates/ra_assists/src/utils/insert_use.rs b/crates/ra_assists/src/utils/insert_use.rs
index 13dbe1919c1..f89c288da45 100644
--- a/crates/ra_assists/src/utils/insert_use.rs
+++ b/crates/ra_assists/src/utils/insert_use.rs
@@ -4,7 +4,7 @@
 
 use either::Either;
 use hir::{self, ModPath};
-use ra_syntax::{
+use syntax::{
     ast::{self, NameOwner, VisibilityOwner},
     AstNode, Direction, SmolStr,
     SyntaxKind::{PATH, PATH_SEGMENT},
diff --git a/crates/ra_cfg/Cargo.toml b/crates/ra_cfg/Cargo.toml
index 770a407428f..cb0d2b9d734 100644
--- a/crates/ra_cfg/Cargo.toml
+++ b/crates/ra_cfg/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
 [dependencies]
 rustc-hash = "1.1.0"
 
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 tt = { path = "../tt" }
 
 [dev-dependencies]
diff --git a/crates/ra_cfg/src/cfg_expr.rs b/crates/ra_cfg/src/cfg_expr.rs
index f48928aee87..940091465c3 100644
--- a/crates/ra_cfg/src/cfg_expr.rs
+++ b/crates/ra_cfg/src/cfg_expr.rs
@@ -4,7 +4,7 @@
 
 use std::slice::Iter as SliceIter;
 
-use ra_syntax::SmolStr;
+use syntax::SmolStr;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum CfgExpr {
@@ -87,7 +87,7 @@ mod tests {
     use super::*;
 
     use mbe::{ast_to_token_tree, TokenMap};
-    use ra_syntax::ast::{self, AstNode};
+    use syntax::ast::{self, AstNode};
 
     fn get_token_tree_generated(input: &str) -> (tt::Subtree, TokenMap) {
         let source_file = ast::SourceFile::parse(input).ok().unwrap();
diff --git a/crates/ra_cfg/src/lib.rs b/crates/ra_cfg/src/lib.rs
index cd5a0a7b640..7e025143bd4 100644
--- a/crates/ra_cfg/src/lib.rs
+++ b/crates/ra_cfg/src/lib.rs
@@ -2,8 +2,8 @@
 
 mod cfg_expr;
 
-use ra_syntax::SmolStr;
 use rustc_hash::FxHashSet;
+use syntax::SmolStr;
 
 pub use cfg_expr::CfgExpr;
 
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 47a0f6248f2..156ea1ee4b5 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -12,7 +12,7 @@ doctest = false
 salsa = "0.15.2"
 rustc-hash = "1.1.0"
 
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 ra_cfg = { path = "../ra_cfg" }
 profile = { path = "../profile" }
 tt = { path = "../tt" }
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index 02a1abee0f0..12a86349971 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -9,8 +9,8 @@
 use std::{fmt, iter::FromIterator, ops, str::FromStr, sync::Arc};
 
 use ra_cfg::CfgOptions;
-use ra_syntax::SmolStr;
 use rustc_hash::{FxHashMap, FxHashSet};
+use syntax::SmolStr;
 use tt::TokenExpander;
 use vfs::file_set::FileSet;
 
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index 795d7d2b613..73ac243d66b 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -5,8 +5,8 @@ pub mod fixture;
 
 use std::{panic, sync::Arc};
 
-use ra_syntax::{ast, Parse, SourceFile, TextRange, TextSize};
 use rustc_hash::FxHashSet;
+use syntax::{ast, Parse, SourceFile, TextRange, TextSize};
 
 pub use crate::{
     cancellation::Canceled,
diff --git a/crates/ra_fmt/Cargo.toml b/crates/ra_fmt/Cargo.toml
index b4ef93f2b27..d42ca62be27 100644
--- a/crates/ra_fmt/Cargo.toml
+++ b/crates/ra_fmt/Cargo.toml
@@ -12,4 +12,4 @@ doctest = false
 [dependencies]
 itertools = "0.9.0"
 
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
diff --git a/crates/ra_fmt/src/lib.rs b/crates/ra_fmt/src/lib.rs
index f910ded9da6..d0bf0593f7a 100644
--- a/crates/ra_fmt/src/lib.rs
+++ b/crates/ra_fmt/src/lib.rs
@@ -3,7 +3,7 @@
 use std::iter::successors;
 
 use itertools::Itertools;
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode, AstToken},
     SmolStr, SyntaxKind,
     SyntaxKind::*,
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 903406e849c..ee5622a7d99 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -17,7 +17,7 @@ arrayvec = "0.5.1"
 itertools = "0.9.0"
 
 stdx = { path = "../stdx" }
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 ra_db = { path = "../ra_db" }
 profile = { path = "../profile" }
 hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 5c0c6184a70..98724c1462f 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -31,12 +31,12 @@ use hir_ty::{
     InEnvironment, Substs, TraitEnvironment, Ty, TyDefId, TypeCtor,
 };
 use ra_db::{CrateId, Edition, FileId};
-use ra_syntax::{
+use rustc_hash::FxHashSet;
+use stdx::impl_from;
+use syntax::{
     ast::{self, AttrsOwner, NameOwner},
     AstNode,
 };
-use rustc_hash::FxHashSet;
-use stdx::impl_from;
 
 use crate::{
     db::{DefDatabase, HirDatabase},
diff --git a/crates/ra_hir/src/has_source.rs b/crates/ra_hir/src/has_source.rs
index 1c691d96196..a50d4ff0290 100644
--- a/crates/ra_hir/src/has_source.rs
+++ b/crates/ra_hir/src/has_source.rs
@@ -6,7 +6,7 @@ use hir_def::{
     src::{HasChildSource, HasSource as _},
     Lookup, VariantId,
 };
-use ra_syntax::ast;
+use syntax::ast;
 
 use crate::{
     db::HirDatabase, Const, Enum, EnumVariant, Field, FieldSource, Function, ImplDef, MacroDef,
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index 7e3ec6315e1..2e0ef440851 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -12,11 +12,11 @@ use hir_expand::{hygiene::Hygiene, name::AsName, ExpansionInfo};
 use hir_ty::associated_type_shorthand_candidates;
 use itertools::Itertools;
 use ra_db::{FileId, FileRange};
-use ra_syntax::{
+use rustc_hash::{FxHashMap, FxHashSet};
+use syntax::{
     algo::{find_node_at_offset, skip_trivia_token},
     ast, AstNode, Direction, SyntaxNode, SyntaxToken, TextRange, TextSize,
 };
-use rustc_hash::{FxHashMap, FxHashSet};
 
 use crate::{
     db::HirDatabase,
diff --git a/crates/ra_hir/src/semantics/source_to_def.rs b/crates/ra_hir/src/semantics/source_to_def.rs
index a6ff8b0bfcb..ab2fd0957fb 100644
--- a/crates/ra_hir/src/semantics/source_to_def.rs
+++ b/crates/ra_hir/src/semantics/source_to_def.rs
@@ -10,12 +10,12 @@ use hir_def::{
 };
 use hir_expand::{name::AsName, AstId, MacroDefKind};
 use ra_db::FileId;
-use ra_syntax::{
+use rustc_hash::FxHashMap;
+use stdx::impl_from;
+use syntax::{
     ast::{self, NameOwner},
     match_ast, AstNode, SyntaxNode,
 };
-use rustc_hash::FxHashMap;
-use stdx::impl_from;
 
 use crate::{db::HirDatabase, InFile, MacroDefId};
 
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index d3d62debfdd..6b2de3a06f7 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -21,7 +21,7 @@ use hir_ty::{
     diagnostics::{record_literal_missing_fields, record_pattern_missing_fields},
     InferenceResult, Substs, Ty,
 };
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode},
     SyntaxNode, TextRange, TextSize,
 };
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_def/Cargo.toml
index 1a080a8b4bd..38129782feb 100644
--- a/crates/ra_hir_def/Cargo.toml
+++ b/crates/ra_hir_def/Cargo.toml
@@ -24,7 +24,7 @@ stdx = { path = "../stdx" }
 
 arena = { path = "../arena" }
 ra_db = { path = "../ra_db" }
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 profile = { path = "../profile" }
 hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
 test_utils = { path = "../test_utils" }
diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs
index 896a69ca802..c83219d771e 100644
--- a/crates/ra_hir_def/src/adt.rs
+++ b/crates/ra_hir_def/src/adt.rs
@@ -8,7 +8,7 @@ use hir_expand::{
     name::{AsName, Name},
     InFile,
 };
-use ra_syntax::ast::{self, NameOwner, VisibilityOwner};
+use syntax::ast::{self, NameOwner, VisibilityOwner};
 use tt::{Delimiter, DelimiterKind, Leaf, Subtree, TokenTree};
 
 use crate::{
diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs
index 050832ce01b..36dc8b8166e 100644
--- a/crates/ra_hir_def/src/attr.rs
+++ b/crates/ra_hir_def/src/attr.rs
@@ -6,7 +6,7 @@ use either::Either;
 use hir_expand::{hygiene::Hygiene, AstId, InFile};
 use mbe::ast_to_token_tree;
 use ra_cfg::{CfgExpr, CfgOptions};
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode, AttrsOwner},
     SmolStr,
 };
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs
index 1deb1a8371a..7c33966a713 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/ra_hir_def/src/body.rs
@@ -11,8 +11,8 @@ use either::Either;
 use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, AstId, HirFileId, InFile, MacroDefId};
 use ra_cfg::CfgOptions;
 use ra_db::CrateId;
-use ra_syntax::{ast, AstNode, AstPtr};
 use rustc_hash::FxHashMap;
+use syntax::{ast, AstNode, AstPtr};
 use test_utils::mark;
 
 pub(crate) use lower::LowerCtx;
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs
index 4823930062d..a26251cdeb5 100644
--- a/crates/ra_hir_def/src/body/lower.rs
+++ b/crates/ra_hir_def/src/body/lower.rs
@@ -10,14 +10,14 @@ use hir_expand::{
     name::{name, AsName, Name},
     HirFileId, MacroDefId, MacroDefKind,
 };
-use ra_syntax::{
+use rustc_hash::FxHashMap;
+use syntax::{
     ast::{
         self, ArgListOwner, ArrayExprKind, AstChildren, LiteralKind, LoopBodyOwner, NameOwner,
         SlicePatComponents,
     },
     AstNode, AstPtr,
 };
-use rustc_hash::FxHashMap;
 use test_utils::mark;
 
 use crate::{
diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs
index f783e18b546..079f14c2980 100644
--- a/crates/ra_hir_def/src/body/scope.rs
+++ b/crates/ra_hir_def/src/body/scope.rs
@@ -171,7 +171,7 @@ fn compute_expr_scopes(expr: ExprId, body: &Body, scopes: &mut ExprScopes, scope
 mod tests {
     use hir_expand::{name::AsName, InFile};
     use ra_db::{fixture::WithFixture, FileId, SourceDatabase};
-    use ra_syntax::{algo::find_node_at_offset, ast, AstNode};
+    use syntax::{algo::find_node_at_offset, ast, AstNode};
     use test_utils::{assert_eq_text, extract_offset, mark};
 
     use crate::{db::DefDatabase, test_db::TestDB, FunctionId, ModuleDefId};
diff --git a/crates/ra_hir_def/src/data.rs b/crates/ra_hir_def/src/data.rs
index 758c12f3316..9a8eb4edec7 100644
--- a/crates/ra_hir_def/src/data.rs
+++ b/crates/ra_hir_def/src/data.rs
@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use hir_expand::{name::Name, InFile};
-use ra_syntax::ast;
+use syntax::ast;
 
 use crate::{
     attr::Attrs,
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs
index 1dd4197f85d..a925548b58c 100644
--- a/crates/ra_hir_def/src/db.rs
+++ b/crates/ra_hir_def/src/db.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use hir_expand::{db::AstDatabase, HirFileId};
 use ra_db::{salsa, CrateId, SourceDatabase, Upcast};
-use ra_syntax::SmolStr;
+use syntax::SmolStr;
 
 use crate::{
     adt::{EnumData, StructData},
diff --git a/crates/ra_hir_def/src/diagnostics.rs b/crates/ra_hir_def/src/diagnostics.rs
index 71d177070dd..2e38a978f82 100644
--- a/crates/ra_hir_def/src/diagnostics.rs
+++ b/crates/ra_hir_def/src/diagnostics.rs
@@ -3,7 +3,7 @@
 use std::any::Any;
 
 use hir_expand::diagnostics::Diagnostic;
-use ra_syntax::{ast, AstPtr, SyntaxNodePtr};
+use syntax::{ast, AstPtr, SyntaxNodePtr};
 
 use hir_expand::{HirFileId, InFile};
 
diff --git a/crates/ra_hir_def/src/docs.rs b/crates/ra_hir_def/src/docs.rs
index 2630b3d895e..e9a02b11bb6 100644
--- a/crates/ra_hir_def/src/docs.rs
+++ b/crates/ra_hir_def/src/docs.rs
@@ -6,7 +6,7 @@
 use std::sync::Arc;
 
 use either::Either;
-use ra_syntax::ast;
+use syntax::ast;
 
 use crate::{
     db::DefDatabase,
diff --git a/crates/ra_hir_def/src/expr.rs b/crates/ra_hir_def/src/expr.rs
index befe41c2aea..c94b3a36f57 100644
--- a/crates/ra_hir_def/src/expr.rs
+++ b/crates/ra_hir_def/src/expr.rs
@@ -14,7 +14,7 @@
 
 use arena::{Idx, RawId};
 use hir_expand::name::Name;
-use ra_syntax::ast::RangeOp;
+use syntax::ast::RangeOp;
 
 use crate::{
     builtin_type::{BuiltinFloat, BuiltinInt},
@@ -197,7 +197,7 @@ pub enum ArithOp {
     BitAnd,
 }
 
-pub use ra_syntax::ast::PrefixOp as UnaryOp;
+pub use syntax::ast::PrefixOp as UnaryOp;
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub enum Array {
     ElementList(Vec<ExprId>),
diff --git a/crates/ra_hir_def/src/find_path.rs b/crates/ra_hir_def/src/find_path.rs
index 46e70eb48ad..5099f417d3d 100644
--- a/crates/ra_hir_def/src/find_path.rs
+++ b/crates/ra_hir_def/src/find_path.rs
@@ -294,7 +294,7 @@ fn find_local_import_locations(
 mod tests {
     use hir_expand::hygiene::Hygiene;
     use ra_db::fixture::WithFixture;
-    use ra_syntax::ast::AstNode;
+    use syntax::ast::AstNode;
     use test_utils::mark;
 
     use crate::test_db::TestDB;
@@ -307,12 +307,9 @@ mod tests {
     fn check_found_path(ra_fixture: &str, path: &str) {
         let (db, pos) = TestDB::with_position(ra_fixture);
         let module = db.module_for_file(pos.file_id);
-        let parsed_path_file = ra_syntax::SourceFile::parse(&format!("use {};", path));
-        let ast_path = parsed_path_file
-            .syntax_node()
-            .descendants()
-            .find_map(ra_syntax::ast::Path::cast)
-            .unwrap();
+        let parsed_path_file = syntax::SourceFile::parse(&format!("use {};", path));
+        let ast_path =
+            parsed_path_file.syntax_node().descendants().find_map(syntax::ast::Path::cast).unwrap();
         let mod_path = ModPath::from_src(ast_path, &Hygiene::new_unhygienic()).unwrap();
 
         let crate_def_map = db.crate_def_map(module.krate);
@@ -441,12 +438,12 @@ mod tests {
         // already in scope.
         check_found_path(
             r#"
-            //- /main.rs crate:main deps:ra_syntax
+            //- /main.rs crate:main deps:syntax
 
-            use ra_syntax::ast;
+            use syntax::ast;
             <|>
 
-            //- /lib.rs crate:ra_syntax
+            //- /lib.rs crate:syntax
             pub mod ast {
                 pub enum ModuleItem {
                     A, B, C,
@@ -458,18 +455,18 @@ mod tests {
 
         check_found_path(
             r#"
-            //- /main.rs crate:main deps:ra_syntax
+            //- /main.rs crate:main deps:syntax
 
             <|>
 
-            //- /lib.rs crate:ra_syntax
+            //- /lib.rs crate:syntax
             pub mod ast {
                 pub enum ModuleItem {
                     A, B, C,
                 }
             }
         "#,
-            "ra_syntax::ast::ModuleItem",
+            "syntax::ast::ModuleItem",
         );
     }
 
diff --git a/crates/ra_hir_def/src/generics.rs b/crates/ra_hir_def/src/generics.rs
index 0e06a0b12e8..4476f031620 100644
--- a/crates/ra_hir_def/src/generics.rs
+++ b/crates/ra_hir_def/src/generics.rs
@@ -11,7 +11,7 @@ use hir_expand::{
     InFile,
 };
 use ra_db::FileId;
-use ra_syntax::ast::{self, GenericParamsOwner, NameOwner, TypeBoundsOwner};
+use syntax::ast::{self, GenericParamsOwner, NameOwner, TypeBoundsOwner};
 
 use crate::{
     body::LowerCtx,
diff --git a/crates/ra_hir_def/src/import_map.rs b/crates/ra_hir_def/src/import_map.rs
index 3a9eec8873c..431ff30abde 100644
--- a/crates/ra_hir_def/src/import_map.rs
+++ b/crates/ra_hir_def/src/import_map.rs
@@ -5,9 +5,9 @@ use std::{cmp::Ordering, fmt, hash::BuildHasherDefault, sync::Arc};
 use fst::{self, Streamer};
 use indexmap::{map::Entry, IndexMap};
 use ra_db::CrateId;
-use ra_syntax::SmolStr;
 use rustc_hash::{FxHashMap, FxHasher};
 use smallvec::SmallVec;
+use syntax::SmolStr;
 
 use crate::{
     db::DefDatabase,
diff --git a/crates/ra_hir_def/src/item_tree.rs b/crates/ra_hir_def/src/item_tree.rs
index 104966c7f24..e14722caebb 100644
--- a/crates/ra_hir_def/src/item_tree.rs
+++ b/crates/ra_hir_def/src/item_tree.rs
@@ -22,9 +22,9 @@ use hir_expand::{
     name::{name, AsName, Name},
     HirFileId, InFile,
 };
-use ra_syntax::{ast, match_ast};
 use rustc_hash::FxHashMap;
 use smallvec::SmallVec;
+use syntax::{ast, match_ast};
 use test_utils::mark;
 
 use crate::{
diff --git a/crates/ra_hir_def/src/item_tree/lower.rs b/crates/ra_hir_def/src/item_tree/lower.rs
index 4523d0fbbf5..391ab5d3928 100644
--- a/crates/ra_hir_def/src/item_tree/lower.rs
+++ b/crates/ra_hir_def/src/item_tree/lower.rs
@@ -4,11 +4,11 @@ use std::{collections::hash_map::Entry, mem, sync::Arc};
 
 use arena::map::ArenaMap;
 use hir_expand::{ast_id_map::AstIdMap, hygiene::Hygiene, HirFileId};
-use ra_syntax::{
+use smallvec::SmallVec;
+use syntax::{
     ast::{self, ModuleItemOwner},
     SyntaxNode,
 };
-use smallvec::SmallVec;
 
 use crate::{
     attr::Attrs,
diff --git a/crates/ra_hir_def/src/item_tree/tests.rs b/crates/ra_hir_def/src/item_tree/tests.rs
index a81497fa8a9..6c843e339a6 100644
--- a/crates/ra_hir_def/src/item_tree/tests.rs
+++ b/crates/ra_hir_def/src/item_tree/tests.rs
@@ -1,10 +1,10 @@
 use expect::{expect, Expect};
 use hir_expand::{db::AstDatabase, HirFileId, InFile};
 use ra_db::fixture::WithFixture;
-use ra_syntax::{ast, AstNode};
 use rustc_hash::FxHashSet;
 use std::sync::Arc;
 use stdx::format_to;
+use syntax::{ast, AstNode};
 
 use crate::{db::DefDatabase, test_db::TestDB};
 
@@ -228,31 +228,31 @@ fn smoke() {
 
             top-level items:
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
-            Import { path: ModPath { kind: Plain, segments: [Name(Text("a"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: false, is_prelude: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Use>(0) }
+            Import { path: ModPath { kind: Plain, segments: [Name(Text("a"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: false, is_prelude: false, ast_id: FileAstId::<syntax::ast::generated::nodes::Use>(0) }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
-            Import { path: ModPath { kind: Plain, segments: [Name(Text("b"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: true, is_prelude: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Use>(0) }
+            Import { path: ModPath { kind: Plain, segments: [Name(Text("b"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: true, is_prelude: false, ast_id: FileAstId::<syntax::ast::generated::nodes::Use>(0) }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("ext_crate"))] }, input: None }]) }]
-            ExternCrate { path: ModPath { kind: Plain, segments: [Name(Text("krate"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_macro_use: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::ExternCrate>(1) }
+            ExternCrate { path: ModPath { kind: Plain, segments: [Name(Text("krate"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_macro_use: false, ast_id: FileAstId::<syntax::ast::generated::nodes::ExternCrate>(1) }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_trait"))] }, input: None }]) }]
-            Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [TypeAlias(Idx::<TypeAlias>(0)), Const(Idx::<Const>(0)), Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Trait>(2) }
+            Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [TypeAlias(Idx::<TypeAlias>(0)), Const(Idx::<Const>(0)), Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Trait>(2) }
             > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_ty"))] }, input: None }]) }]
-            > TypeAlias { name: Name(Text("AssocTy")), visibility: RawVisibilityId("pub(self)"), bounds: [Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Tr"))] }, generic_args: [Some(GenericArgs { args: [Type(Tuple([]))], has_self_type: false, bindings: [] })] })], generic_params: GenericParamsId(4294967295), type_ref: None, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::TypeAlias>(8) }
+            > TypeAlias { name: Name(Text("AssocTy")), visibility: RawVisibilityId("pub(self)"), bounds: [Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Tr"))] }, generic_args: [Some(GenericArgs { args: [Type(Tuple([]))], has_self_type: false, bindings: [] })] })], generic_params: GenericParamsId(4294967295), type_ref: None, ast_id: FileAstId::<syntax::ast::generated::nodes::TypeAlias>(8) }
             > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_const"))] }, input: None }]) }]
-            > Const { name: Some(Name(Text("CONST"))), visibility: RawVisibilityId("pub(self)"), type_ref: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("u8"))] }, generic_args: [None] }), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Const>(9) }
+            > Const { name: Some(Name(Text("CONST"))), visibility: RawVisibilityId("pub(self)"), type_ref: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("u8"))] }, generic_args: [None] }), ast_id: FileAstId::<syntax::ast::generated::nodes::Const>(9) }
             > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_method"))] }, input: None }]) }]
-            > Function { name: Name(Text("method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Shared)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(10) }
+            > Function { name: Name(Text("method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Shared)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(10) }
             > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_dfl_method"))] }, input: None }]) }]
-            > Function { name: Name(Text("dfl_method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Mut)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(11) }
+            > Function { name: Name(Text("dfl_method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Mut)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(11) }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct0"))] }, input: None }]) }]
-            Struct { name: Name(Text("Struct0")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), fields: Unit, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Struct>(3), kind: Unit }
+            Struct { name: Name(Text("Struct0")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), fields: Unit, ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(3), kind: Unit }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct1"))] }, input: None }]) }]
-            Struct { name: Name(Text("Struct1")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(2), fields: Tuple(IdRange::<ra_hir_def::item_tree::Field>(0..1)), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Struct>(4), kind: Tuple }
+            Struct { name: Name(Text("Struct1")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(2), fields: Tuple(IdRange::<ra_hir_def::item_tree::Field>(0..1)), ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(4), kind: Tuple }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct2"))] }, input: None }]) }]
-            Struct { name: Name(Text("Struct2")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(3), fields: Record(IdRange::<ra_hir_def::item_tree::Field>(1..2)), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Struct>(5), kind: Record }
+            Struct { name: Name(Text("Struct2")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(3), fields: Record(IdRange::<ra_hir_def::item_tree::Field>(1..2)), ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(5), kind: Record }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("en"))] }, input: None }]) }]
-            Enum { name: Name(Text("En")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), variants: IdRange::<ra_hir_def::item_tree::Variant>(0..1), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Enum>(6) }
+            Enum { name: Name(Text("En")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), variants: IdRange::<ra_hir_def::item_tree::Variant>(0..1), ast_id: FileAstId::<syntax::ast::generated::nodes::Enum>(6) }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("un"))] }, input: None }]) }]
-            Union { name: Name(Text("Un")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), fields: Record(IdRange::<ra_hir_def::item_tree::Field>(3..4)), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Union>(7) }
+            Union { name: Name(Text("Un")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), fields: Record(IdRange::<ra_hir_def::item_tree::Field>(3..4)), ast_id: FileAstId::<syntax::ast::generated::nodes::Union>(7) }
         "##]],
     );
 }
@@ -274,13 +274,13 @@ fn simple_inner_items() {
             inner attrs: Attrs { entries: None }
 
             top-level items:
-            Impl { generic_params: GenericParamsId(0), target_trait: Some(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("D"))] }, generic_args: [None] })), target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Response"))] }, generic_args: [Some(GenericArgs { args: [Type(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("T"))] }, generic_args: [None] }))], has_self_type: false, bindings: [] })] }), is_negative: false, items: [Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Impl>(0) }
-            > Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(1) }
+            Impl { generic_params: GenericParamsId(0), target_trait: Some(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("D"))] }, generic_args: [None] })), target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Response"))] }, generic_args: [Some(GenericArgs { args: [Type(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("T"))] }, generic_args: [None] }))], has_self_type: false, bindings: [] })] }), is_negative: false, items: [Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Impl>(0) }
+            > Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
 
             inner items:
 
-            for AST FileAstId::<ra_syntax::ast::generated::nodes::Item>(2):
-            Function { name: Name(Text("end")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(2) }
+            for AST FileAstId::<syntax::ast::generated::nodes::Item>(2):
+            Function { name: Name(Text("end")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
 
         "#]],
     );
@@ -303,9 +303,9 @@ fn extern_attrs() {
 
             top-level items:
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }]
-            Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(1) }
+            Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }]
-            Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(2) }
+            Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
         "##]],
     );
 }
@@ -327,11 +327,11 @@ fn trait_attrs() {
 
             top-level items:
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("trait_attr"))] }, input: None }]) }]
-            Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Trait>(0) }
+            Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Trait>(0) }
             > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }]
-            > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(1) }
+            > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
             > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }]
-            > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(2) }
+            > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
         "##]],
     );
 }
@@ -353,11 +353,11 @@ fn impl_attrs() {
 
             top-level items:
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("impl_attr"))] }, input: None }]) }]
-            Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Ty"))] }, generic_args: [None] }), is_negative: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Impl>(0) }
+            Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Ty"))] }, generic_args: [None] }), is_negative: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Impl>(0) }
             > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }]
-            > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(1) }
+            > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
             > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }]
-            > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(2) }
+            > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
         "##]],
     );
 }
@@ -408,13 +408,13 @@ fn inner_item_attrs() {
             inner attrs: Attrs { entries: None }
 
             top-level items:
-            Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(0) }
+            Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(0) }
 
             inner items:
 
-            for AST FileAstId::<ra_syntax::ast::generated::nodes::Item>(1):
+            for AST FileAstId::<syntax::ast::generated::nodes::Item>(1):
             #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_inner"))] }, input: None }]) }]
-            Function { name: Name(Text("inner")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Fn>(1) }
+            Function { name: Name(Text("inner")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
 
         "##]],
     );
@@ -432,8 +432,8 @@ fn assoc_item_macros() {
             inner attrs: Attrs { entries: None }
 
             top-level items:
-            Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("S"))] }, generic_args: [None] }), is_negative: false, items: [MacroCall(Idx::<MacroCall>(0))], ast_id: FileAstId::<ra_syntax::ast::generated::nodes::Impl>(0) }
-            > MacroCall { name: None, path: ModPath { kind: Plain, segments: [Name(Text("items"))] }, is_export: false, is_local_inner: false, is_builtin: false, ast_id: FileAstId::<ra_syntax::ast::generated::nodes::MacroCall>(1) }
+            Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("S"))] }, generic_args: [None] }), is_negative: false, items: [MacroCall(Idx::<MacroCall>(0))], ast_id: FileAstId::<syntax::ast::generated::nodes::Impl>(0) }
+            > MacroCall { name: None, path: ModPath { kind: Plain, segments: [Name(Text("items"))] }, is_export: false, is_local_inner: false, is_builtin: false, ast_id: FileAstId::<syntax::ast::generated::nodes::MacroCall>(1) }
         "#]],
     );
 }
diff --git a/crates/ra_hir_def/src/keys.rs b/crates/ra_hir_def/src/keys.rs
index 441bdbead88..40a5d92b507 100644
--- a/crates/ra_hir_def/src/keys.rs
+++ b/crates/ra_hir_def/src/keys.rs
@@ -3,8 +3,8 @@
 use std::marker::PhantomData;
 
 use hir_expand::{InFile, MacroDefId};
-use ra_syntax::{ast, AstNode, AstPtr};
 use rustc_hash::FxHashMap;
+use syntax::{ast, AstNode, AstPtr};
 
 use crate::{
     dyn_map::{DynMap, Policy},
diff --git a/crates/ra_hir_def/src/lang_item.rs b/crates/ra_hir_def/src/lang_item.rs
index 3631499bf71..063eadccb2d 100644
--- a/crates/ra_hir_def/src/lang_item.rs
+++ b/crates/ra_hir_def/src/lang_item.rs
@@ -4,8 +4,8 @@
 //! features, such as Fn family of traits.
 use std::sync::Arc;
 
-use ra_syntax::SmolStr;
 use rustc_hash::FxHashMap;
+use syntax::SmolStr;
 
 use crate::{
     db::DefDatabase, AdtId, AttrDefId, CrateId, EnumId, FunctionId, ImplId, ModuleDefId, ModuleId,
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs
index 8103937397d..806ac731f5d 100644
--- a/crates/ra_hir_def/src/lib.rs
+++ b/crates/ra_hir_def/src/lib.rs
@@ -58,7 +58,7 @@ use hir_expand::{
     MacroCallId, MacroCallKind, MacroDefId, MacroDefKind,
 };
 use ra_db::{impl_intern_key, salsa, CrateId};
-use ra_syntax::ast;
+use syntax::ast;
 
 use crate::builtin_type::BuiltinType;
 use item_tree::{
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs
index dc239997f95..d26c837cc84 100644
--- a/crates/ra_hir_def/src/nameres.rs
+++ b/crates/ra_hir_def/src/nameres.rs
@@ -59,9 +59,9 @@ use std::sync::Arc;
 use arena::Arena;
 use hir_expand::{diagnostics::DiagnosticSink, name::Name, InFile};
 use ra_db::{CrateId, Edition, FileId};
-use ra_syntax::ast;
 use rustc_hash::FxHashMap;
 use stdx::format_to;
+use syntax::ast;
 
 use crate::{
     db::DefDatabase,
@@ -288,7 +288,7 @@ pub enum ModuleSource {
 
 mod diagnostics {
     use hir_expand::diagnostics::DiagnosticSink;
-    use ra_syntax::{ast, AstPtr};
+    use syntax::{ast, AstPtr};
 
     use crate::{db::DefDatabase, diagnostics::UnresolvedModule, nameres::LocalModuleId, AstId};
 
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index 52ee401d9ef..f7270ec91c1 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -13,8 +13,8 @@ use hir_expand::{
 };
 use ra_cfg::CfgOptions;
 use ra_db::{CrateId, FileId, ProcMacroId};
-use ra_syntax::ast;
 use rustc_hash::FxHashMap;
+use syntax::ast;
 use test_utils::mark;
 
 use crate::{
diff --git a/crates/ra_hir_def/src/nameres/mod_resolution.rs b/crates/ra_hir_def/src/nameres/mod_resolution.rs
index 9539616325a..316245d6ba7 100644
--- a/crates/ra_hir_def/src/nameres/mod_resolution.rs
+++ b/crates/ra_hir_def/src/nameres/mod_resolution.rs
@@ -1,7 +1,7 @@
 //! This module resolves `mod foo;` declaration to file.
 use hir_expand::name::Name;
 use ra_db::FileId;
-use ra_syntax::SmolStr;
+use syntax::SmolStr;
 
 use crate::{db::DefDatabase, HirFileId};
 
diff --git a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs b/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs
index ae58948c426..1f619787e1d 100644
--- a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs
+++ b/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs
@@ -698,7 +698,7 @@ fn unresolved_module_diagnostics() {
                             ),
                         ),
                     ),
-                    value: FileAstId::<ra_syntax::ast::generated::nodes::Module>(1),
+                    value: FileAstId::<syntax::ast::generated::nodes::Module>(1),
                 },
                 candidate: "bar.rs",
             },
diff --git a/crates/ra_hir_def/src/path.rs b/crates/ra_hir_def/src/path.rs
index cc1726e9e05..88be07c8a77 100644
--- a/crates/ra_hir_def/src/path.rs
+++ b/crates/ra_hir_def/src/path.rs
@@ -13,7 +13,7 @@ use hir_expand::{
     name::{AsName, Name},
 };
 use ra_db::CrateId;
-use ra_syntax::ast;
+use syntax::ast;
 
 use crate::{
     type_ref::{TypeBound, TypeRef},
diff --git a/crates/ra_hir_def/src/path/lower.rs b/crates/ra_hir_def/src/path/lower.rs
index d09fc66e4dc..07b9723ce01 100644
--- a/crates/ra_hir_def/src/path/lower.rs
+++ b/crates/ra_hir_def/src/path/lower.rs
@@ -9,7 +9,7 @@ use hir_expand::{
     hygiene::Hygiene,
     name::{name, AsName},
 };
-use ra_syntax::ast::{self, AstNode, TypeBoundsOwner};
+use syntax::ast::{self, AstNode, TypeBoundsOwner};
 
 use super::AssociatedTypeBinding;
 use crate::{
diff --git a/crates/ra_hir_def/src/path/lower/lower_use.rs b/crates/ra_hir_def/src/path/lower/lower_use.rs
index 794be45e894..53cecb05fb2 100644
--- a/crates/ra_hir_def/src/path/lower/lower_use.rs
+++ b/crates/ra_hir_def/src/path/lower/lower_use.rs
@@ -5,7 +5,7 @@ use std::iter;
 
 use either::Either;
 use hir_expand::{hygiene::Hygiene, name::AsName};
-use ra_syntax::ast::{self, NameOwner};
+use syntax::ast::{self, NameOwner};
 use test_utils::mark;
 
 use crate::path::{ImportAlias, ModPath, PathKind};
diff --git a/crates/ra_hir_def/src/type_ref.rs b/crates/ra_hir_def/src/type_ref.rs
index 6f7884ffe59..1a78c1444c4 100644
--- a/crates/ra_hir_def/src/type_ref.rs
+++ b/crates/ra_hir_def/src/type_ref.rs
@@ -1,6 +1,6 @@
 //! HIR for references to types. Paths in these are not yet resolved. They can
 //! be directly created from an ast::TypeRef, without further queries.
-use ra_syntax::ast::{self};
+use syntax::ast::{self};
 
 use crate::{body::LowerCtx, path::Path};
 
diff --git a/crates/ra_hir_def/src/visibility.rs b/crates/ra_hir_def/src/visibility.rs
index 1abffb4c3ca..e6e0853a30a 100644
--- a/crates/ra_hir_def/src/visibility.rs
+++ b/crates/ra_hir_def/src/visibility.rs
@@ -1,7 +1,7 @@
 //! Defines hir-level representation of visibility (e.g. `pub` and `pub(crate)`).
 
 use hir_expand::{hygiene::Hygiene, InFile};
-use ra_syntax::ast;
+use syntax::ast;
 
 use crate::{
     db::DefDatabase,
diff --git a/crates/ra_hir_expand/Cargo.toml b/crates/ra_hir_expand/Cargo.toml
index 052330fdefa..153a70bdf51 100644
--- a/crates/ra_hir_expand/Cargo.toml
+++ b/crates/ra_hir_expand/Cargo.toml
@@ -15,7 +15,7 @@ rustc-hash = "1.0.0"
 
 arena = { path = "../arena" }
 ra_db = { path = "../ra_db" }
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 parser = { path = "../parser" }
 profile = { path = "../profile" }
 tt = { path = "../tt" }
diff --git a/crates/ra_hir_expand/src/ast_id_map.rs b/crates/ra_hir_expand/src/ast_id_map.rs
index 703a85b0f7a..f63629b3053 100644
--- a/crates/ra_hir_expand/src/ast_id_map.rs
+++ b/crates/ra_hir_expand/src/ast_id_map.rs
@@ -13,7 +13,7 @@ use std::{
 };
 
 use arena::{Arena, Idx};
-use ra_syntax::{ast, AstNode, AstPtr, SyntaxNode, SyntaxNodePtr};
+use syntax::{ast, AstNode, AstPtr, SyntaxNode, SyntaxNodePtr};
 
 /// `AstId` points to an AST node in a specific file.
 pub struct FileAstId<N: AstNode> {
diff --git a/crates/ra_hir_expand/src/builtin_derive.rs b/crates/ra_hir_expand/src/builtin_derive.rs
index 95e6977f24a..2d2f8bcb842 100644
--- a/crates/ra_hir_expand/src/builtin_derive.rs
+++ b/crates/ra_hir_expand/src/builtin_derive.rs
@@ -3,7 +3,7 @@
 use log::debug;
 
 use parser::FragmentKind;
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode, GenericParamsOwner, ModuleItemOwner, NameOwner},
     match_ast,
 };
diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs
index 24dc0b4e7fd..ae4c8438209 100644
--- a/crates/ra_hir_expand/src/builtin_macro.rs
+++ b/crates/ra_hir_expand/src/builtin_macro.rs
@@ -8,7 +8,7 @@ use either::Either;
 use mbe::parse_to_token_tree;
 use parser::FragmentKind;
 use ra_db::FileId;
-use ra_syntax::ast::{self, AstToken, HasStringValue};
+use syntax::ast::{self, AstToken, HasStringValue};
 
 macro_rules! register_builtin {
     ( LAZY: $(($name:ident, $kind: ident) => $expand:ident),* , EAGER: $(($e_name:ident, $e_kind: ident) => $e_expand:ident),*  ) => {
@@ -427,8 +427,8 @@ mod tests {
         MacroCallLoc,
     };
     use ra_db::{fixture::WithFixture, SourceDatabase};
-    use ra_syntax::ast::NameOwner;
     use std::sync::Arc;
+    use syntax::ast::NameOwner;
 
     fn expand_builtin_macro(ra_fixture: &str) -> String {
         let (db, file_id) = TestDB::with_single_file(&ra_fixture);
diff --git a/crates/ra_hir_expand/src/db.rs b/crates/ra_hir_expand/src/db.rs
index d83c391a90b..c275f6b017b 100644
--- a/crates/ra_hir_expand/src/db.rs
+++ b/crates/ra_hir_expand/src/db.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 use mbe::{ExpandResult, MacroRules};
 use parser::FragmentKind;
 use ra_db::{salsa, SourceDatabase};
-use ra_syntax::{algo::diff, AstNode, GreenNode, Parse, SyntaxKind::*, SyntaxNode};
+use syntax::{algo::diff, AstNode, GreenNode, Parse, SyntaxKind::*, SyntaxNode};
 
 use crate::{
     ast_id_map::AstIdMap, BuiltinDeriveExpander, BuiltinFnLikeExpander, EagerCallLoc, EagerMacroId,
@@ -92,9 +92,9 @@ pub trait AstDatabase: SourceDatabase {
 pub fn expand_hypothetical(
     db: &dyn AstDatabase,
     actual_macro_call: MacroCallId,
-    hypothetical_args: &ra_syntax::ast::TokenTree,
-    token_to_map: ra_syntax::SyntaxToken,
-) -> Option<(SyntaxNode, ra_syntax::SyntaxToken)> {
+    hypothetical_args: &syntax::ast::TokenTree,
+    token_to_map: syntax::SyntaxToken,
+) -> Option<(SyntaxNode, syntax::SyntaxToken)> {
     let macro_file = MacroFile { macro_call_id: actual_macro_call };
     let (tt, tmap_1) = mbe::syntax_node_to_token_tree(hypothetical_args.syntax()).unwrap();
     let range =
@@ -105,7 +105,7 @@ pub fn expand_hypothetical(
         parse_macro_with_arg(db, macro_file, Some(std::sync::Arc::new((tt, tmap_1))))?;
     let token_id = macro_def.0.map_id_down(token_id);
     let range = tmap_2.range_by_token(token_id)?.by_kind(token_to_map.kind())?;
-    let token = ra_syntax::algo::find_covering_element(&node.syntax_node(), range).into_token()?;
+    let token = syntax::algo::find_covering_element(&node.syntax_node(), range).into_token()?;
     Some((node.syntax_node(), token))
 }
 
diff --git a/crates/ra_hir_expand/src/diagnostics.rs b/crates/ra_hir_expand/src/diagnostics.rs
index b138500e734..59d35debe33 100644
--- a/crates/ra_hir_expand/src/diagnostics.rs
+++ b/crates/ra_hir_expand/src/diagnostics.rs
@@ -16,7 +16,7 @@
 
 use std::{any::Any, fmt};
 
-use ra_syntax::SyntaxNodePtr;
+use syntax::SyntaxNodePtr;
 
 use crate::InFile;
 
diff --git a/crates/ra_hir_expand/src/eager.rs b/crates/ra_hir_expand/src/eager.rs
index dc83044ea4e..bd3409f973b 100644
--- a/crates/ra_hir_expand/src/eager.rs
+++ b/crates/ra_hir_expand/src/eager.rs
@@ -27,8 +27,8 @@ use crate::{
 
 use parser::FragmentKind;
 use ra_db::CrateId;
-use ra_syntax::{algo::SyntaxRewriter, SyntaxNode};
 use std::sync::Arc;
+use syntax::{algo::SyntaxRewriter, SyntaxNode};
 
 pub fn expand_eager_macro(
     db: &dyn AstDatabase,
diff --git a/crates/ra_hir_expand/src/hygiene.rs b/crates/ra_hir_expand/src/hygiene.rs
index aefe47bd32a..23b5eac2704 100644
--- a/crates/ra_hir_expand/src/hygiene.rs
+++ b/crates/ra_hir_expand/src/hygiene.rs
@@ -4,7 +4,7 @@
 //! this moment, this is horribly incomplete and handles only `$crate`.
 use either::Either;
 use ra_db::CrateId;
-use ra_syntax::ast;
+use syntax::ast;
 
 use crate::{
     db::AstDatabase,
diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs
index 38f0ffff81c..af0cc445f7e 100644
--- a/crates/ra_hir_expand/src/lib.rs
+++ b/crates/ra_hir_expand/src/lib.rs
@@ -19,7 +19,7 @@ use std::hash::Hash;
 use std::sync::Arc;
 
 use ra_db::{impl_intern_key, salsa, CrateId, FileId};
-use ra_syntax::{
+use syntax::{
     algo,
     ast::{self, AstNode},
     SyntaxNode, SyntaxToken, TextSize,
diff --git a/crates/ra_hir_expand/src/name.rs b/crates/ra_hir_expand/src/name.rs
index 969a2e5b834..4dcaff08853 100644
--- a/crates/ra_hir_expand/src/name.rs
+++ b/crates/ra_hir_expand/src/name.rs
@@ -2,7 +2,7 @@
 
 use std::fmt;
 
-use ra_syntax::{ast, SmolStr};
+use syntax::{ast, SmolStr};
 
 /// `Name` is a wrapper around string, which is used in hir for both references
 /// and declarations. In theory, names should also carry hygiene info, but we are
@@ -37,8 +37,8 @@ impl Name {
         Name(Repr::TupleField(idx))
     }
 
-    pub fn new_lifetime(lt: &ra_syntax::SyntaxToken) -> Name {
-        assert!(lt.kind() == ra_syntax::SyntaxKind::LIFETIME);
+    pub fn new_lifetime(lt: &syntax::SyntaxToken) -> Name {
+        assert!(lt.kind() == syntax::SyntaxKind::LIFETIME);
         Name(Repr::Text(lt.text().clone()))
     }
 
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index 380d5e6015d..6156e4a854b 100644
--- a/crates/ra_hir_ty/Cargo.toml
+++ b/crates/ra_hir_ty/Cargo.toml
@@ -23,7 +23,7 @@ hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
 arena = { path = "../arena" }
 ra_db = { path = "../ra_db" }
 profile = { path = "../profile" }
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 test_utils = { path = "../test_utils" }
 
 scoped-tls = "1"
diff --git a/crates/ra_hir_ty/src/diagnostics.rs b/crates/ra_hir_ty/src/diagnostics.rs
index 55c02c1febc..bf35d2d0ee0 100644
--- a/crates/ra_hir_ty/src/diagnostics.rs
+++ b/crates/ra_hir_ty/src/diagnostics.rs
@@ -8,8 +8,8 @@ use std::any::Any;
 use hir_def::DefWithBodyId;
 use hir_expand::diagnostics::{Diagnostic, DiagnosticSink};
 use hir_expand::{name::Name, HirFileId, InFile};
-use ra_syntax::{ast, AstPtr, SyntaxNodePtr};
 use stdx::format_to;
+use syntax::{ast, AstPtr, SyntaxNodePtr};
 
 use crate::db::HirDatabase;
 
@@ -214,8 +214,8 @@ mod tests {
         diagnostics::{Diagnostic, DiagnosticSinkBuilder},
     };
     use ra_db::{fixture::WithFixture, FileId, SourceDatabase, SourceDatabaseExt};
-    use ra_syntax::{TextRange, TextSize};
     use rustc_hash::FxHashMap;
+    use syntax::{TextRange, TextSize};
 
     use crate::{diagnostics::validate_body, test_db::TestDB};
 
diff --git a/crates/ra_hir_ty/src/diagnostics/expr.rs b/crates/ra_hir_ty/src/diagnostics/expr.rs
index 51adcecafae..fb76e2e4ecf 100644
--- a/crates/ra_hir_ty/src/diagnostics/expr.rs
+++ b/crates/ra_hir_ty/src/diagnostics/expr.rs
@@ -4,8 +4,8 @@ use std::sync::Arc;
 
 use hir_def::{path::path, resolver::HasResolver, AdtId, DefWithBodyId};
 use hir_expand::diagnostics::DiagnosticSink;
-use ra_syntax::{ast, AstPtr};
 use rustc_hash::FxHashSet;
+use syntax::{ast, AstPtr};
 
 use crate::{
     db::HirDatabase,
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs
index 784ae1c3ccf..03b00b101c2 100644
--- a/crates/ra_hir_ty/src/infer.rs
+++ b/crates/ra_hir_ty/src/infer.rs
@@ -31,9 +31,9 @@ use hir_def::{
     TypeAliasId, VariantId,
 };
 use hir_expand::{diagnostics::DiagnosticSink, name::name};
-use ra_syntax::SmolStr;
 use rustc_hash::FxHashMap;
 use stdx::impl_from;
+use syntax::SmolStr;
 
 use super::{
     primitive::{FloatTy, IntTy},
diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs
index 731b062c2da..a2f849d0213 100644
--- a/crates/ra_hir_ty/src/infer/expr.rs
+++ b/crates/ra_hir_ty/src/infer/expr.rs
@@ -11,7 +11,7 @@ use hir_def::{
     AdtId, AssocContainerId, FieldId, Lookup,
 };
 use hir_expand::name::{name, Name};
-use ra_syntax::ast::RangeOp;
+use syntax::ast::RangeOp;
 
 use crate::{
     autoderef, method_resolution, op,
diff --git a/crates/ra_hir_ty/src/test_db.rs b/crates/ra_hir_ty/src/test_db.rs
index a1714ff0fcd..0e2a69eec2a 100644
--- a/crates/ra_hir_ty/src/test_db.rs
+++ b/crates/ra_hir_ty/src/test_db.rs
@@ -8,8 +8,8 @@ use std::{
 use hir_def::{db::DefDatabase, ModuleId};
 use hir_expand::db::AstDatabase;
 use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast};
-use ra_syntax::TextRange;
 use rustc_hash::{FxHashMap, FxHashSet};
+use syntax::TextRange;
 use test_utils::extract_annotations;
 
 #[salsa::database(
diff --git a/crates/ra_hir_ty/src/tests.rs b/crates/ra_hir_ty/src/tests.rs
index 016e689fff2..5f6f8869ae0 100644
--- a/crates/ra_hir_ty/src/tests.rs
+++ b/crates/ra_hir_ty/src/tests.rs
@@ -22,12 +22,12 @@ use hir_def::{
 };
 use hir_expand::{db::AstDatabase, InFile};
 use ra_db::{fixture::WithFixture, FileRange, SourceDatabase, SourceDatabaseExt};
-use ra_syntax::{
+use stdx::format_to;
+use syntax::{
     algo,
     ast::{self, AstNode},
     SyntaxNode,
 };
-use stdx::format_to;
 
 use crate::{
     db::HirDatabase, display::HirDisplay, infer::TypeMismatch, test_db::TestDB, InferenceResult, Ty,
diff --git a/crates/ra_hir_ty/src/tests/macros.rs b/crates/ra_hir_ty/src/tests/macros.rs
index 24c53eb0222..d887c7a7992 100644
--- a/crates/ra_hir_ty/src/tests/macros.rs
+++ b/crates/ra_hir_ty/src/tests/macros.rs
@@ -543,7 +543,7 @@ fn bar() -> u32 {0}
 #[test]
 #[ignore]
 fn include_accidentally_quadratic() {
-    let file = project_dir().join("crates/ra_syntax/test_data/accidentally_quadratic");
+    let file = project_dir().join("crates/syntax/test_data/accidentally_quadratic");
     let big_file = fs::read_to_string(file).unwrap();
     let big_file = vec![big_file; 10].join("\n");
 
diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml
index 84c25f0b8a2..8e0fa59178d 100644
--- a/crates/ra_ide/Cargo.toml
+++ b/crates/ra_ide/Cargo.toml
@@ -21,7 +21,7 @@ oorandom = "11.1.2"
 
 stdx = { path = "../stdx" }
 
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 text_edit = { path = "../text_edit" }
 ra_db = { path = "../ra_db" }
 ra_ide_db = { path = "../ra_ide_db" }
diff --git a/crates/ra_ide/src/call_hierarchy.rs b/crates/ra_ide/src/call_hierarchy.rs
index 1fcaf4a32b7..116e6bf83e1 100644
--- a/crates/ra_ide/src/call_hierarchy.rs
+++ b/crates/ra_ide/src/call_hierarchy.rs
@@ -4,7 +4,7 @@ use indexmap::IndexMap;
 
 use hir::Semantics;
 use ra_ide_db::RootDatabase;
-use ra_syntax::{ast, match_ast, AstNode, TextRange};
+use syntax::{ast, match_ast, AstNode, TextRange};
 
 use crate::{
     call_info::FnCallNode, display::ToNav, goto_definition, references, FilePosition,
diff --git a/crates/ra_ide/src/call_info.rs b/crates/ra_ide/src/call_info.rs
index ff602202f2d..703cbc6b433 100644
--- a/crates/ra_ide/src/call_info.rs
+++ b/crates/ra_ide/src/call_info.rs
@@ -2,11 +2,11 @@
 use either::Either;
 use hir::{Docs, HirDisplay, Semantics, Type};
 use ra_ide_db::RootDatabase;
-use ra_syntax::{
+use stdx::format_to;
+use syntax::{
     ast::{self, ArgListOwner},
     match_ast, AstNode, SyntaxNode, SyntaxToken, TextRange, TextSize,
 };
-use stdx::format_to;
 use test_utils::mark;
 
 use crate::FilePosition;
diff --git a/crates/ra_ide/src/completion/complete_attribute.rs b/crates/ra_ide/src/completion/complete_attribute.rs
index 2faaae97460..603d935deb7 100644
--- a/crates/ra_ide/src/completion/complete_attribute.rs
+++ b/crates/ra_ide/src/completion/complete_attribute.rs
@@ -3,8 +3,8 @@
 //! This module uses a bit of static metadata to provide completions
 //! for built-in attributes.
 
-use ra_syntax::{ast, AstNode, SyntaxKind};
 use rustc_hash::FxHashSet;
+use syntax::{ast, AstNode, SyntaxKind};
 
 use crate::completion::{
     completion_context::CompletionContext,
diff --git a/crates/ra_ide/src/completion/complete_fn_param.rs b/crates/ra_ide/src/completion/complete_fn_param.rs
index 4063342572b..7c63ce58f89 100644
--- a/crates/ra_ide/src/completion/complete_fn_param.rs
+++ b/crates/ra_ide/src/completion/complete_fn_param.rs
@@ -1,10 +1,10 @@
 //! See `complete_fn_param`.
 
-use ra_syntax::{
+use rustc_hash::FxHashMap;
+use syntax::{
     ast::{self, ModuleItemOwner},
     match_ast, AstNode,
 };
-use rustc_hash::FxHashMap;
 
 use crate::completion::{CompletionContext, CompletionItem, CompletionKind, Completions};
 
diff --git a/crates/ra_ide/src/completion/complete_keyword.rs b/crates/ra_ide/src/completion/complete_keyword.rs
index b62064797b0..a80708935ea 100644
--- a/crates/ra_ide/src/completion/complete_keyword.rs
+++ b/crates/ra_ide/src/completion/complete_keyword.rs
@@ -1,6 +1,6 @@
 //! FIXME: write short doc here
 
-use ra_syntax::{ast, SyntaxKind};
+use syntax::{ast, SyntaxKind};
 use test_utils::mark;
 
 use crate::completion::{
diff --git a/crates/ra_ide/src/completion/complete_postfix.rs b/crates/ra_ide/src/completion/complete_postfix.rs
index 42087da8dc5..05e15d4647b 100644
--- a/crates/ra_ide/src/completion/complete_postfix.rs
+++ b/crates/ra_ide/src/completion/complete_postfix.rs
@@ -1,6 +1,6 @@
 //! FIXME: write short doc here
 use ra_assists::utils::TryEnum;
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode},
     TextRange, TextSize,
 };
diff --git a/crates/ra_ide/src/completion/complete_qualified_path.rs b/crates/ra_ide/src/completion/complete_qualified_path.rs
index b08f5b9b45e..cb7dd23c187 100644
--- a/crates/ra_ide/src/completion/complete_qualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_qualified_path.rs
@@ -1,8 +1,8 @@
 //! Completion of paths, i.e. `some::prefix::<|>`.
 
 use hir::{Adt, HasVisibility, PathResolution, ScopeDef};
-use ra_syntax::AstNode;
 use rustc_hash::FxHashSet;
+use syntax::AstNode;
 use test_utils::mark;
 
 use crate::completion::{CompletionContext, Completions};
diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs
index b397baf1078..d7edd92cf04 100644
--- a/crates/ra_ide/src/completion/complete_trait_impl.rs
+++ b/crates/ra_ide/src/completion/complete_trait_impl.rs
@@ -33,7 +33,7 @@
 
 use hir::{self, Docs, HasSource};
 use ra_assists::utils::get_missing_assoc_items;
-use ra_syntax::{
+use syntax::{
     ast::{self, edit, Impl},
     AstNode, SyntaxKind, SyntaxNode, TextRange, T,
 };
diff --git a/crates/ra_ide/src/completion/complete_unqualified_path.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs
index bd9551f358a..824227f310a 100644
--- a/crates/ra_ide/src/completion/complete_unqualified_path.rs
+++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -1,7 +1,7 @@
 //! Completion of names from the current scope, e.g. locals and imported items.
 
 use hir::{Adt, ModuleDef, ScopeDef, Type};
-use ra_syntax::AstNode;
+use syntax::AstNode;
 use test_utils::mark;
 
 use crate::completion::{CompletionContext, Completions};
diff --git a/crates/ra_ide/src/completion/completion_context.rs b/crates/ra_ide/src/completion/completion_context.rs
index 0cb57fb1b42..b5efb6cd675 100644
--- a/crates/ra_ide/src/completion/completion_context.rs
+++ b/crates/ra_ide/src/completion/completion_context.rs
@@ -3,7 +3,7 @@
 use hir::{Semantics, SemanticsScope, Type};
 use ra_db::SourceDatabase;
 use ra_ide_db::RootDatabase;
-use ra_syntax::{
+use syntax::{
     algo::{find_covering_element, find_node_at_offset},
     ast, match_ast, AstNode, NodeOrToken,
     SyntaxKind::*,
diff --git a/crates/ra_ide/src/completion/completion_item.rs b/crates/ra_ide/src/completion/completion_item.rs
index 1c0684f4ed5..9377cdc577e 100644
--- a/crates/ra_ide/src/completion/completion_item.rs
+++ b/crates/ra_ide/src/completion/completion_item.rs
@@ -3,7 +3,7 @@
 use std::fmt;
 
 use hir::Documentation;
-use ra_syntax::TextRange;
+use syntax::TextRange;
 use text_edit::TextEdit;
 
 use crate::completion::completion_config::SnippetCap;
diff --git a/crates/ra_ide/src/completion/patterns.rs b/crates/ra_ide/src/completion/patterns.rs
index 7c4feff6d16..ffc97c076a2 100644
--- a/crates/ra_ide/src/completion/patterns.rs
+++ b/crates/ra_ide/src/completion/patterns.rs
@@ -1,6 +1,6 @@
 //! Patterns telling us certain facts about current syntax element, they are used in completion context
 
-use ra_syntax::{
+use syntax::{
     algo::non_trivia_sibling,
     ast::{self, LoopBodyOwner},
     match_ast, AstNode, Direction, NodeOrToken, SyntaxElement,
diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index 59f1b14246f..e1b1ea4ce44 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -3,7 +3,7 @@
 
 use hir::{Docs, HasAttrs, HasSource, HirDisplay, ModPath, ScopeDef, StructKind, Type};
 use itertools::Itertools;
-use ra_syntax::ast::NameOwner;
+use syntax::ast::NameOwner;
 use test_utils::mark;
 
 use crate::{
diff --git a/crates/ra_ide/src/completion/test_utils.rs b/crates/ra_ide/src/completion/test_utils.rs
index 9191777455b..1452d7e9e54 100644
--- a/crates/ra_ide/src/completion/test_utils.rs
+++ b/crates/ra_ide/src/completion/test_utils.rs
@@ -2,8 +2,8 @@
 
 use hir::Semantics;
 use itertools::Itertools;
-use ra_syntax::{AstNode, NodeOrToken, SyntaxElement};
 use stdx::{format_to, trim_indent};
+use syntax::{AstNode, NodeOrToken, SyntaxElement};
 use test_utils::assert_eq_text;
 
 use crate::{
diff --git a/crates/ra_ide/src/diagnostics.rs b/crates/ra_ide/src/diagnostics.rs
index 54810d5bbf0..18def6115d7 100644
--- a/crates/ra_ide/src/diagnostics.rs
+++ b/crates/ra_ide/src/diagnostics.rs
@@ -10,7 +10,7 @@ use hir::{diagnostics::DiagnosticSinkBuilder, Semantics};
 use itertools::Itertools;
 use ra_db::SourceDatabase;
 use ra_ide_db::RootDatabase;
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode},
     SyntaxNode, TextRange, T,
 };
diff --git a/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs b/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs
index 8fb25de6c16..efcd631b31b 100644
--- a/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs
+++ b/crates/ra_ide/src/diagnostics/diagnostics_with_fix.rs
@@ -12,7 +12,7 @@ use ra_ide_db::{
     source_change::{FileSystemEdit, SourceFileEdit},
     RootDatabase,
 };
-use ra_syntax::{algo, ast, AstNode};
+use syntax::{algo, ast, AstNode};
 use text_edit::TextEdit;
 
 /// A [Diagnostic] that potentially has a fix available.
diff --git a/crates/ra_ide/src/display.rs b/crates/ra_ide/src/display.rs
index fd42aa4352e..41b5bdc490c 100644
--- a/crates/ra_ide/src/display.rs
+++ b/crates/ra_ide/src/display.rs
@@ -4,7 +4,7 @@
 mod navigation_target;
 mod short_label;
 
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode, AttrsOwner, GenericParamsOwner, NameOwner},
     SyntaxKind::{ATTR, COMMENT},
 };
diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs
index fdbf75abd91..683088a7484 100644
--- a/crates/ra_ide/src/display/navigation_target.rs
+++ b/crates/ra_ide/src/display/navigation_target.rs
@@ -4,7 +4,7 @@ use either::Either;
 use hir::{original_range, AssocItem, FieldSource, HasSource, InFile, ModuleSource};
 use ra_db::{FileId, SourceDatabase};
 use ra_ide_db::{defs::Definition, RootDatabase};
-use ra_syntax::{
+use syntax::{
     ast::{self, DocCommentsOwner, NameOwner},
     match_ast, AstNode, SmolStr,
     SyntaxKind::{self, IDENT_PAT, TYPE_PARAM},
diff --git a/crates/ra_ide/src/display/short_label.rs b/crates/ra_ide/src/display/short_label.rs
index 010c34705c7..ea49d9f9707 100644
--- a/crates/ra_ide/src/display/short_label.rs
+++ b/crates/ra_ide/src/display/short_label.rs
@@ -1,7 +1,7 @@
 //! FIXME: write short doc here
 
-use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
 use stdx::format_to;
+use syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
 
 pub(crate) trait ShortLabel {
     fn short_label(&self) -> Option<String>;
diff --git a/crates/ra_ide/src/expand_macro.rs b/crates/ra_ide/src/expand_macro.rs
index 043515f541f..c25e068d60f 100644
--- a/crates/ra_ide/src/expand_macro.rs
+++ b/crates/ra_ide/src/expand_macro.rs
@@ -1,6 +1,6 @@
 use hir::Semantics;
 use ra_ide_db::RootDatabase;
-use ra_syntax::{
+use syntax::{
     algo::{find_node_at_offset, SyntaxRewriter},
     ast, AstNode, NodeOrToken, SyntaxKind,
     SyntaxKind::*,
diff --git a/crates/ra_ide/src/extend_selection.rs b/crates/ra_ide/src/extend_selection.rs
index 7230a0ff9ee..f30df2bff47 100644
--- a/crates/ra_ide/src/extend_selection.rs
+++ b/crates/ra_ide/src/extend_selection.rs
@@ -2,7 +2,7 @@ use std::iter::successors;
 
 use hir::Semantics;
 use ra_ide_db::RootDatabase;
-use ra_syntax::{
+use syntax::{
     algo::{self, find_covering_element, skip_trivia_token},
     ast::{self, AstNode, AstToken},
     Direction, NodeOrToken,
diff --git a/crates/ra_ide/src/file_structure.rs b/crates/ra_ide/src/file_structure.rs
index 87cab450373..c90247ba658 100644
--- a/crates/ra_ide/src/file_structure.rs
+++ b/crates/ra_ide/src/file_structure.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{
+use syntax::{
     ast::{self, AttrsOwner, GenericParamsOwner, NameOwner},
     match_ast, AstNode, SourceFile, SyntaxKind, SyntaxNode, TextRange, WalkEvent,
 };
diff --git a/crates/ra_ide/src/folding_ranges.rs b/crates/ra_ide/src/folding_ranges.rs
index 0fbc9babd58..7523aec5573 100644
--- a/crates/ra_ide/src/folding_ranges.rs
+++ b/crates/ra_ide/src/folding_ranges.rs
@@ -2,7 +2,7 @@
 
 use rustc_hash::FxHashSet;
 
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode, AstToken, VisibilityOwner},
     Direction, NodeOrToken, SourceFile,
     SyntaxKind::{self, *},
diff --git a/crates/ra_ide/src/goto_definition.rs b/crates/ra_ide/src/goto_definition.rs
index 45389fd23fe..77f374ea2a2 100644
--- a/crates/ra_ide/src/goto_definition.rs
+++ b/crates/ra_ide/src/goto_definition.rs
@@ -3,7 +3,7 @@ use ra_ide_db::{
     defs::{classify_name, classify_name_ref},
     symbol_index, RootDatabase,
 };
-use ra_syntax::{
+use syntax::{
     ast::{self},
     match_ast, AstNode,
     SyntaxKind::*,
@@ -101,7 +101,7 @@ pub(crate) fn reference_definition(
 #[cfg(test)]
 mod tests {
     use ra_db::FileRange;
-    use ra_syntax::{TextRange, TextSize};
+    use syntax::{TextRange, TextSize};
 
     use crate::mock_analysis::MockAnalysis;
 
diff --git a/crates/ra_ide/src/goto_implementation.rs b/crates/ra_ide/src/goto_implementation.rs
index 9912b714214..91a8c1dd17a 100644
--- a/crates/ra_ide/src/goto_implementation.rs
+++ b/crates/ra_ide/src/goto_implementation.rs
@@ -1,6 +1,6 @@
 use hir::{Crate, ImplDef, Semantics};
 use ra_ide_db::RootDatabase;
-use ra_syntax::{algo::find_node_at_offset, ast, AstNode};
+use syntax::{algo::find_node_at_offset, ast, AstNode};
 
 use crate::{display::ToNav, FilePosition, NavigationTarget, RangeInfo};
 
diff --git a/crates/ra_ide/src/goto_type_definition.rs b/crates/ra_ide/src/goto_type_definition.rs
index 8f52feea6e9..3ec2ee59ded 100644
--- a/crates/ra_ide/src/goto_type_definition.rs
+++ b/crates/ra_ide/src/goto_type_definition.rs
@@ -1,5 +1,5 @@
 use ra_ide_db::RootDatabase;
-use ra_syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T};
+use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T};
 
 use crate::{display::ToNav, FilePosition, NavigationTarget, RangeInfo};
 
diff --git a/crates/ra_ide/src/hover.rs b/crates/ra_ide/src/hover.rs
index f66f62bfb5e..37e68ff7a5d 100644
--- a/crates/ra_ide/src/hover.rs
+++ b/crates/ra_ide/src/hover.rs
@@ -8,8 +8,8 @@ use ra_ide_db::{
     defs::{classify_name, classify_name_ref, Definition},
     RootDatabase,
 };
-use ra_syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T};
 use stdx::format_to;
+use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, TokenAtOffset, T};
 use test_utils::mark;
 
 use crate::{
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 920b04e8d73..46ddc528e52 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -1,10 +1,10 @@
 use hir::{Adt, Callable, HirDisplay, Semantics, Type};
 use ra_ide_db::RootDatabase;
-use ra_syntax::{
+use stdx::to_lower_snake_case;
+use syntax::{
     ast::{self, ArgListOwner, AstNode},
     match_ast, Direction, NodeOrToken, SmolStr, SyntaxKind, TextRange, T,
 };
-use stdx::to_lower_snake_case;
 
 use crate::FileId;
 use ast::NameOwner;
diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs
index caf63933a9b..35cec87f670 100644
--- a/crates/ra_ide/src/join_lines.rs
+++ b/crates/ra_ide/src/join_lines.rs
@@ -1,6 +1,6 @@
 use itertools::Itertools;
 use ra_fmt::{compute_ws, extract_trivial_expression};
-use ra_syntax::{
+use syntax::{
     algo::{find_covering_element, non_trivia_sibling},
     ast::{self, AstNode, AstToken},
     Direction, NodeOrToken, SourceFile,
@@ -170,7 +170,7 @@ fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool {
 
 #[cfg(test)]
 mod tests {
-    use ra_syntax::SourceFile;
+    use syntax::SourceFile;
     use test_utils::{add_cursor, assert_eq_text, extract_offset, extract_range};
 
     use super::*;
@@ -437,11 +437,11 @@ fn foo() {
         // No space after the '{'
         check_join_lines(
             r"
-<|>use ra_syntax::{
+<|>use syntax::{
     TextSize, TextRange,
 };",
             r"
-<|>use ra_syntax::{TextSize, TextRange,
+<|>use syntax::{TextSize, TextRange,
 };",
         );
     }
@@ -451,11 +451,11 @@ fn foo() {
         // No space after the '}'
         check_join_lines(
             r"
-use ra_syntax::{
+use syntax::{
 <|>    TextSize, TextRange
 };",
             r"
-use ra_syntax::{
+use syntax::{
 <|>    TextSize, TextRange};",
         );
     }
@@ -465,11 +465,11 @@ use ra_syntax::{
         // No space after the '}'
         check_join_lines(
             r"
-use ra_syntax::{
+use syntax::{
 <|>    TextSize, TextRange,
 };",
             r"
-use ra_syntax::{
+use syntax::{
 <|>    TextSize, TextRange};",
         );
     }
@@ -478,14 +478,14 @@ use ra_syntax::{
     fn test_join_lines_use_tree() {
         check_join_lines(
             r"
-use ra_syntax::{
+use syntax::{
     algo::<|>{
         find_token_at_offset,
     },
     ast,
 };",
             r"
-use ra_syntax::{
+use syntax::{
     algo::<|>find_token_at_offset,
     ast,
 };",
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 09cb5faf68f..20967ba9900 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -56,7 +56,7 @@ use ra_ide_db::{
     symbol_index::{self, FileSymbol},
     LineIndexDatabase,
 };
-use ra_syntax::{SourceFile, TextRange, TextSize};
+use syntax::{SourceFile, TextRange, TextSize};
 
 use crate::display::ToNav;
 
diff --git a/crates/ra_ide/src/matching_brace.rs b/crates/ra_ide/src/matching_brace.rs
index 742d70c9c08..cb6abb0db94 100644
--- a/crates/ra_ide/src/matching_brace.rs
+++ b/crates/ra_ide/src/matching_brace.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode},
     SourceFile, SyntaxKind, TextSize, T,
 };
diff --git a/crates/ra_ide/src/parent_module.rs b/crates/ra_ide/src/parent_module.rs
index e3e0c763923..69af0c86ad0 100644
--- a/crates/ra_ide/src/parent_module.rs
+++ b/crates/ra_ide/src/parent_module.rs
@@ -1,7 +1,7 @@
 use hir::Semantics;
 use ra_db::{CrateId, FileId, FilePosition};
 use ra_ide_db::RootDatabase;
-use ra_syntax::{
+use syntax::{
     algo::find_node_at_offset,
     ast::{self, AstNode},
 };
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs
index c4eea3a45bb..e89dca869ca 100644
--- a/crates/ra_ide/src/references.rs
+++ b/crates/ra_ide/src/references.rs
@@ -17,7 +17,7 @@ use ra_ide_db::{
     search::SearchScope,
     RootDatabase,
 };
-use ra_syntax::{
+use syntax::{
     algo::find_node_at_offset,
     ast::{self, NameOwner},
     AstNode, SyntaxKind, SyntaxNode, TextRange, TokenAtOffset,
diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs
index 9c688fb0631..a075618e74f 100644
--- a/crates/ra_ide/src/references/rename.rs
+++ b/crates/ra_ide/src/references/rename.rs
@@ -6,12 +6,12 @@ use ra_ide_db::{
     defs::{classify_name, classify_name_ref, Definition, NameClass, NameRefClass},
     RootDatabase,
 };
-use ra_syntax::{
+use std::convert::TryInto;
+use syntax::{
     algo::find_node_at_offset,
     ast::{self, NameOwner},
     lex_single_valid_syntax_kind, match_ast, AstNode, SyntaxKind, SyntaxNode, SyntaxToken,
 };
-use std::convert::TryInto;
 use test_utils::mark;
 use text_edit::TextEdit;
 
diff --git a/crates/ra_ide/src/runnables.rs b/crates/ra_ide/src/runnables.rs
index 3b7162b8416..54cb3b30944 100644
--- a/crates/ra_ide/src/runnables.rs
+++ b/crates/ra_ide/src/runnables.rs
@@ -4,7 +4,7 @@ use hir::{AsAssocItem, Attrs, HirFileId, InFile, Semantics};
 use itertools::Itertools;
 use ra_cfg::CfgExpr;
 use ra_ide_db::RootDatabase;
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode, AttrsOwner, DocCommentsOwner, ModuleItemOwner, NameOwner},
     match_ast, SyntaxNode,
 };
diff --git a/crates/ra_ide/src/status.rs b/crates/ra_ide/src/status.rs
index 009bb662f77..797ead1adab 100644
--- a/crates/ra_ide/src/status.rs
+++ b/crates/ra_ide/src/status.rs
@@ -10,8 +10,8 @@ use ra_ide_db::{
     symbol_index::{LibrarySymbolsQuery, SymbolIndex},
     RootDatabase,
 };
-use ra_syntax::{ast, Parse, SyntaxNode};
 use rustc_hash::FxHashMap;
+use syntax::{ast, Parse, SyntaxNode};
 
 use crate::FileId;
 
diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs
index ebdf05127a9..4b41ceb1dc4 100644
--- a/crates/ra_ide/src/syntax_highlighting.rs
+++ b/crates/ra_ide/src/syntax_highlighting.rs
@@ -9,13 +9,13 @@ use ra_ide_db::{
     defs::{classify_name, classify_name_ref, Definition, NameClass, NameRefClass},
     RootDatabase,
 };
-use ra_syntax::{
+use rustc_hash::FxHashMap;
+use syntax::{
     ast::{self, HasFormatSpecifier},
     AstNode, AstToken, Direction, NodeOrToken, SyntaxElement,
     SyntaxKind::*,
     TextRange, WalkEvent, T,
 };
-use rustc_hash::FxHashMap;
 
 use crate::FileId;
 
diff --git a/crates/ra_ide/src/syntax_highlighting/html.rs b/crates/ra_ide/src/syntax_highlighting/html.rs
index a5e7d28676d..418122648a6 100644
--- a/crates/ra_ide/src/syntax_highlighting/html.rs
+++ b/crates/ra_ide/src/syntax_highlighting/html.rs
@@ -2,7 +2,7 @@
 
 use oorandom::Rand32;
 use ra_db::SourceDatabase;
-use ra_syntax::{AstNode, TextRange, TextSize};
+use syntax::{AstNode, TextRange, TextSize};
 
 use crate::{syntax_highlighting::highlight, FileId, RootDatabase};
 
diff --git a/crates/ra_ide/src/syntax_highlighting/injection.rs b/crates/ra_ide/src/syntax_highlighting/injection.rs
index 6046643ef1e..43f4e6feab3 100644
--- a/crates/ra_ide/src/syntax_highlighting/injection.rs
+++ b/crates/ra_ide/src/syntax_highlighting/injection.rs
@@ -5,7 +5,7 @@ use std::{collections::BTreeMap, convert::TryFrom};
 use ast::{HasQuotes, HasStringValue};
 use hir::Semantics;
 use itertools::Itertools;
-use ra_syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize};
+use syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize};
 
 use crate::{
     call_info::ActiveParameter, Analysis, Highlight, HighlightModifier, HighlightTag,
diff --git a/crates/ra_ide/src/syntax_highlighting/tests.rs b/crates/ra_ide/src/syntax_highlighting/tests.rs
index a8087635a87..594f61e85b7 100644
--- a/crates/ra_ide/src/syntax_highlighting/tests.rs
+++ b/crates/ra_ide/src/syntax_highlighting/tests.rs
@@ -135,7 +135,7 @@ fn bar() {
 
 #[test]
 fn accidentally_quadratic() {
-    let file = project_dir().join("crates/ra_syntax/test_data/accidentally_quadratic");
+    let file = project_dir().join("crates/syntax/test_data/accidentally_quadratic");
     let src = fs::read_to_string(file).unwrap();
 
     let (analysis, file_id) = single_file(&src);
diff --git a/crates/ra_ide/src/syntax_tree.rs b/crates/ra_ide/src/syntax_tree.rs
index 07217e8087a..d05ff221497 100644
--- a/crates/ra_ide/src/syntax_tree.rs
+++ b/crates/ra_ide/src/syntax_tree.rs
@@ -1,6 +1,6 @@
 use ra_db::{FileId, SourceDatabase};
 use ra_ide_db::RootDatabase;
-use ra_syntax::{
+use syntax::{
     algo, AstNode, NodeOrToken, SourceFile,
     SyntaxKind::{RAW_STRING, STRING},
     SyntaxToken, TextRange, TextSize,
diff --git a/crates/ra_ide/src/typing.rs b/crates/ra_ide/src/typing.rs
index 952429cde65..c408b1d5218 100644
--- a/crates/ra_ide/src/typing.rs
+++ b/crates/ra_ide/src/typing.rs
@@ -18,7 +18,7 @@ mod on_enter;
 use ra_db::{FilePosition, SourceDatabase};
 use ra_fmt::leading_indent;
 use ra_ide_db::{source_change::SourceFileEdit, RootDatabase};
-use ra_syntax::{
+use syntax::{
     algo::find_node_at_offset,
     ast::{self, AstToken},
     AstNode, SourceFile,
diff --git a/crates/ra_ide/src/typing/on_enter.rs b/crates/ra_ide/src/typing/on_enter.rs
index c0c5ce3bcd2..9cd153f94ab 100644
--- a/crates/ra_ide/src/typing/on_enter.rs
+++ b/crates/ra_ide/src/typing/on_enter.rs
@@ -3,7 +3,7 @@
 
 use ra_db::{FilePosition, SourceDatabase};
 use ra_ide_db::RootDatabase;
-use ra_syntax::{
+use syntax::{
     ast::{self, AstToken},
     AstNode, SmolStr, SourceFile,
     SyntaxKind::*,
diff --git a/crates/ra_ide_db/Cargo.toml b/crates/ra_ide_db/Cargo.toml
index 5446a596141..9ed13a13dbd 100644
--- a/crates/ra_ide_db/Cargo.toml
+++ b/crates/ra_ide_db/Cargo.toml
@@ -21,7 +21,7 @@ either = "1.5.3"
 
 stdx = { path = "../stdx" }
 
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 text_edit = { path = "../text_edit" }
 ra_db = { path = "../ra_db" }
 profile = { path = "../profile" }
diff --git a/crates/ra_ide_db/src/defs.rs b/crates/ra_ide_db/src/defs.rs
index d46d1fe71ba..7b5d6ac491b 100644
--- a/crates/ra_ide_db/src/defs.rs
+++ b/crates/ra_ide_db/src/defs.rs
@@ -9,7 +9,7 @@ use hir::{
     db::HirDatabase, Crate, Field, HasVisibility, ImplDef, Local, MacroDef, Module, ModuleDef,
     Name, PathResolution, Semantics, TypeParam, Visibility,
 };
-use ra_syntax::{
+use syntax::{
     ast::{self, AstNode},
     match_ast, SyntaxNode,
 };
diff --git a/crates/ra_ide_db/src/imports_locator.rs b/crates/ra_ide_db/src/imports_locator.rs
index d510ce3b76e..1d0c202915e 100644
--- a/crates/ra_ide_db/src/imports_locator.rs
+++ b/crates/ra_ide_db/src/imports_locator.rs
@@ -2,7 +2,7 @@
 //! Later, this should be moved away to a separate crate that is accessible from the ra_assists module.
 
 use hir::{Crate, MacroDef, ModuleDef, Semantics};
-use ra_syntax::{ast, AstNode, SyntaxKind::NAME};
+use syntax::{ast, AstNode, SyntaxKind::NAME};
 
 use crate::{
     defs::{classify_name, Definition},
diff --git a/crates/ra_ide_db/src/line_index.rs b/crates/ra_ide_db/src/line_index.rs
index 2ab662098a6..a381f7fb8d5 100644
--- a/crates/ra_ide_db/src/line_index.rs
+++ b/crates/ra_ide_db/src/line_index.rs
@@ -2,9 +2,9 @@
 //! representation.
 use std::iter;
 
-use ra_syntax::{TextRange, TextSize};
 use rustc_hash::FxHashMap;
 use stdx::partition_point;
+use syntax::{TextRange, TextSize};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct LineIndex {
diff --git a/crates/ra_ide_db/src/search.rs b/crates/ra_ide_db/src/search.rs
index d90b830d0c9..7827cc71cf9 100644
--- a/crates/ra_ide_db/src/search.rs
+++ b/crates/ra_ide_db/src/search.rs
@@ -9,8 +9,8 @@ use std::{convert::TryInto, mem};
 use hir::{DefWithBody, HasSource, Module, ModuleSource, Semantics, Visibility};
 use once_cell::unsync::Lazy;
 use ra_db::{FileId, FileRange, SourceDatabaseExt};
-use ra_syntax::{ast, match_ast, AstNode, TextRange, TextSize};
 use rustc_hash::FxHashMap;
+use syntax::{ast, match_ast, AstNode, TextRange, TextSize};
 
 use crate::{
     defs::{classify_name_ref, Definition, NameRefClass},
diff --git a/crates/ra_ide_db/src/symbol_index.rs b/crates/ra_ide_db/src/symbol_index.rs
index 6ca8bb51698..896092b4675 100644
--- a/crates/ra_ide_db/src/symbol_index.rs
+++ b/crates/ra_ide_db/src/symbol_index.rs
@@ -34,14 +34,14 @@ use ra_db::{
     salsa::{self, ParallelDatabase},
     CrateId, FileId, SourceDatabaseExt, SourceRootId,
 };
-use ra_syntax::{
+use rayon::prelude::*;
+use rustc_hash::{FxHashMap, FxHashSet};
+use syntax::{
     ast::{self, NameOwner},
     match_ast, AstNode, Parse, SmolStr, SourceFile,
     SyntaxKind::{self, *},
     SyntaxNode, SyntaxNodePtr, TextRange, WalkEvent,
 };
-use rayon::prelude::*;
-use rustc_hash::{FxHashMap, FxHashSet};
 
 use crate::RootDatabase;
 
diff --git a/crates/ra_mbe/Cargo.toml b/crates/ra_mbe/Cargo.toml
index e518f73e32c..4a4be65ebcc 100644
--- a/crates/ra_mbe/Cargo.toml
+++ b/crates/ra_mbe/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
 doctest = false
 
 [dependencies]
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 parser = { path = "../parser" }
 tt = { path = "../tt" }
 rustc-hash = "1.1.0"
diff --git a/crates/ra_mbe/src/mbe_expander.rs b/crates/ra_mbe/src/mbe_expander.rs
index b1eacf1242c..1ad8b9f8a58 100644
--- a/crates/ra_mbe/src/mbe_expander.rs
+++ b/crates/ra_mbe/src/mbe_expander.rs
@@ -5,8 +5,8 @@
 mod matcher;
 mod transcriber;
 
-use ra_syntax::SmolStr;
 use rustc_hash::FxHashMap;
+use syntax::SmolStr;
 
 use crate::{ExpandError, ExpandResult};
 
@@ -123,7 +123,7 @@ enum Fragment {
 
 #[cfg(test)]
 mod tests {
-    use ra_syntax::{ast, AstNode};
+    use syntax::{ast, AstNode};
 
     use super::*;
     use crate::ast_to_token_tree;
diff --git a/crates/ra_mbe/src/mbe_expander/matcher.rs b/crates/ra_mbe/src/mbe_expander/matcher.rs
index c752804b29d..b698b98326d 100644
--- a/crates/ra_mbe/src/mbe_expander/matcher.rs
+++ b/crates/ra_mbe/src/mbe_expander/matcher.rs
@@ -10,7 +10,7 @@ use crate::{
 
 use super::ExpandResult;
 use parser::{FragmentKind::*, TreeSink};
-use ra_syntax::{SmolStr, SyntaxKind};
+use syntax::{SmolStr, SyntaxKind};
 use tt::buffer::{Cursor, TokenBuffer};
 
 impl Bindings {
diff --git a/crates/ra_mbe/src/mbe_expander/transcriber.rs b/crates/ra_mbe/src/mbe_expander/transcriber.rs
index 7c9bb4d00e1..c9525c5bf20 100644
--- a/crates/ra_mbe/src/mbe_expander/transcriber.rs
+++ b/crates/ra_mbe/src/mbe_expander/transcriber.rs
@@ -1,7 +1,7 @@
 //! Transcriber takes a template, like `fn $ident() {}`, a set of bindings like
 //! `$ident => foo`, interpolates variables in the template, to get `fn foo() {}`
 
-use ra_syntax::SmolStr;
+use syntax::SmolStr;
 
 use super::ExpandResult;
 use crate::{
diff --git a/crates/ra_mbe/src/parser.rs b/crates/ra_mbe/src/parser.rs
index 1e5dafbdf91..6b46a1673c3 100644
--- a/crates/ra_mbe/src/parser.rs
+++ b/crates/ra_mbe/src/parser.rs
@@ -1,8 +1,8 @@
 //! Parser recognizes special macro syntax, `$var` and `$(repeat)*`, in token
 //! trees.
 
-use ra_syntax::SmolStr;
 use smallvec::SmallVec;
+use syntax::SmolStr;
 
 use crate::{tt_iter::TtIter, ExpandError};
 
diff --git a/crates/ra_mbe/src/subtree_source.rs b/crates/ra_mbe/src/subtree_source.rs
index 1a1cb08cf77..41461b3150a 100644
--- a/crates/ra_mbe/src/subtree_source.rs
+++ b/crates/ra_mbe/src/subtree_source.rs
@@ -1,8 +1,8 @@
 //! FIXME: write short doc here
 
 use parser::{Token, TokenSource};
-use ra_syntax::{lex_single_syntax_kind, SmolStr, SyntaxKind, SyntaxKind::*, T};
 use std::cell::{Cell, Ref, RefCell};
+use syntax::{lex_single_syntax_kind, SmolStr, SyntaxKind, SyntaxKind::*, T};
 use tt::buffer::{Cursor, TokenBuffer};
 
 #[derive(Debug, Clone, Eq, PartialEq)]
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs
index 7b9c88ae643..a8ad917fb88 100644
--- a/crates/ra_mbe/src/syntax_bridge.rs
+++ b/crates/ra_mbe/src/syntax_bridge.rs
@@ -1,13 +1,13 @@
 //! FIXME: write short doc here
 
 use parser::{FragmentKind, ParseError, TreeSink};
-use ra_syntax::{
+use rustc_hash::FxHashMap;
+use syntax::{
     ast::{self, make::tokens::doc_comment},
     tokenize, AstToken, Parse, SmolStr, SyntaxKind,
     SyntaxKind::*,
     SyntaxNode, SyntaxToken, SyntaxTreeBuilder, TextRange, TextSize, Token as RawToken, T,
 };
-use rustc_hash::FxHashMap;
 use tt::buffer::{Cursor, TokenBuffer};
 
 use crate::subtree_source::SubtreeTokenSource;
@@ -176,7 +176,7 @@ fn doc_comment_text(comment: &ast::Comment) -> SmolStr {
     text.into()
 }
 
-fn convert_doc_comment(token: &ra_syntax::SyntaxToken) -> Option<Vec<tt::TokenTree>> {
+fn convert_doc_comment(token: &syntax::SyntaxToken) -> Option<Vec<tt::TokenTree>> {
     let comment = ast::Comment::cast(token.clone())?;
     let doc = comment.kind().doc?;
 
@@ -716,7 +716,7 @@ mod tests {
     use super::*;
     use crate::tests::parse_macro;
     use parser::TokenSource;
-    use ra_syntax::{
+    use syntax::{
         algo::{insert_children, InsertPosition},
         ast::AstNode,
     };
diff --git a/crates/ra_mbe/src/tests.rs b/crates/ra_mbe/src/tests.rs
index be39b0e45ee..0796ceee1a7 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/ra_mbe/src/tests.rs
@@ -1,13 +1,13 @@
 use std::fmt::Write;
 
 use ::parser::FragmentKind;
-use ra_syntax::{ast, AstNode, NodeOrToken, SyntaxKind::IDENT, SyntaxNode, WalkEvent, T};
+use syntax::{ast, AstNode, NodeOrToken, SyntaxKind::IDENT, SyntaxNode, WalkEvent, T};
 use test_utils::assert_eq_text;
 
 use super::*;
 
 mod rule_parsing {
-    use ra_syntax::{ast, AstNode};
+    use syntax::{ast, AstNode};
 
     use crate::ast_to_token_tree;
 
@@ -1698,7 +1698,7 @@ pub(crate) fn parse_to_token_tree_by_syntax(ra_fixture: &str) -> tt::Subtree {
     parsed
 }
 
-fn debug_dump_ignore_spaces(node: &ra_syntax::SyntaxNode) -> String {
+fn debug_dump_ignore_spaces(node: &syntax::SyntaxNode) -> String {
     let mut level = 0;
     let mut buf = String::new();
     macro_rules! indent {
@@ -1718,7 +1718,7 @@ fn debug_dump_ignore_spaces(node: &ra_syntax::SyntaxNode) -> String {
                         writeln!(buf, "{:?}", node.kind()).unwrap();
                     }
                     NodeOrToken::Token(token) => match token.kind() {
-                        ra_syntax::SyntaxKind::WHITESPACE => {}
+                        syntax::SyntaxKind::WHITESPACE => {}
                         _ => {
                             indent!();
                             writeln!(buf, "{:?}", token.kind()).unwrap();
diff --git a/crates/ra_ssr/Cargo.toml b/crates/ra_ssr/Cargo.toml
index d0f2ae73393..958baa2df73 100644
--- a/crates/ra_ssr/Cargo.toml
+++ b/crates/ra_ssr/Cargo.toml
@@ -12,7 +12,7 @@ doctest = false
 
 [dependencies]
 text_edit = { path = "../text_edit" }
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 ra_db = { path = "../ra_db" }
 ra_ide_db = { path = "../ra_ide_db" }
 hir = { path = "../ra_hir", package = "ra_hir" }
diff --git a/crates/ra_ssr/src/lib.rs b/crates/ra_ssr/src/lib.rs
index c780b460a72..fb53212a3a5 100644
--- a/crates/ra_ssr/src/lib.rs
+++ b/crates/ra_ssr/src/lib.rs
@@ -21,9 +21,9 @@ use crate::matching::MatchFailureReason;
 use hir::Semantics;
 use ra_db::{FileId, FilePosition, FileRange};
 use ra_ide_db::source_change::SourceFileEdit;
-use ra_syntax::{ast, AstNode, SyntaxNode, TextRange};
 use resolving::ResolvedRule;
 use rustc_hash::FxHashMap;
+use syntax::{ast, AstNode, SyntaxNode, TextRange};
 
 // A structured search replace rule. Create by calling `parse` on a str.
 #[derive(Debug)]
diff --git a/crates/ra_ssr/src/matching.rs b/crates/ra_ssr/src/matching.rs
index 0f72fea6911..125bf38951a 100644
--- a/crates/ra_ssr/src/matching.rs
+++ b/crates/ra_ssr/src/matching.rs
@@ -8,10 +8,10 @@ use crate::{
 };
 use hir::Semantics;
 use ra_db::FileRange;
-use ra_syntax::ast::{AstNode, AstToken};
-use ra_syntax::{ast, SyntaxElement, SyntaxElementChildren, SyntaxKind, SyntaxNode, SyntaxToken};
 use rustc_hash::FxHashMap;
 use std::{cell::Cell, iter::Peekable};
+use syntax::ast::{AstNode, AstToken};
+use syntax::{ast, SyntaxElement, SyntaxElementChildren, SyntaxKind, SyntaxNode, SyntaxToken};
 use test_utils::mark;
 
 // Creates a match error. If we're currently attempting to match some code that we thought we were
@@ -264,7 +264,7 @@ impl<'db, 'sema> Matcher<'db, 'sema> {
         &self,
         phase: &mut Phase,
         pattern: &mut Peekable<PatternIterator>,
-        code: &ra_syntax::SyntaxToken,
+        code: &syntax::SyntaxToken,
     ) -> Result<(), MatchFailed> {
         phase.record_ignored_comments(code);
         // Ignore whitespace and comments.
@@ -444,7 +444,7 @@ impl<'db, 'sema> Matcher<'db, 'sema> {
         &self,
         phase: &mut Phase,
         pattern: &SyntaxNode,
-        code: &ra_syntax::SyntaxNode,
+        code: &syntax::SyntaxNode,
     ) -> Result<(), MatchFailed> {
         let mut pattern = PatternIterator::new(pattern).peekable();
         let mut children = code.children_with_tokens();
diff --git a/crates/ra_ssr/src/nester.rs b/crates/ra_ssr/src/nester.rs
index b3e20579bda..8be570d3cf9 100644
--- a/crates/ra_ssr/src/nester.rs
+++ b/crates/ra_ssr/src/nester.rs
@@ -8,8 +8,8 @@
 //! middle match would take the second `foo` from the outer match.
 
 use crate::{Match, SsrMatches};
-use ra_syntax::SyntaxNode;
 use rustc_hash::FxHashMap;
+use syntax::SyntaxNode;
 
 pub(crate) fn nest_and_remove_collisions(
     mut matches: Vec<Match>,
diff --git a/crates/ra_ssr/src/parsing.rs b/crates/ra_ssr/src/parsing.rs
index f455eb5b7e5..9570e96e36e 100644
--- a/crates/ra_ssr/src/parsing.rs
+++ b/crates/ra_ssr/src/parsing.rs
@@ -7,9 +7,9 @@
 
 use crate::errors::bail;
 use crate::{SsrError, SsrPattern, SsrRule};
-use ra_syntax::{ast, AstNode, SmolStr, SyntaxKind, SyntaxNode, T};
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::str::FromStr;
+use syntax::{ast, AstNode, SmolStr, SyntaxKind, SyntaxNode, T};
 use test_utils::mark;
 
 #[derive(Debug)]
@@ -243,7 +243,7 @@ fn validate_rule(rule: &SsrRule) -> Result<(), SsrError> {
 
 fn tokenize(source: &str) -> Result<Vec<Token>, SsrError> {
     let mut start = 0;
-    let (raw_tokens, errors) = ra_syntax::tokenize(source);
+    let (raw_tokens, errors) = syntax::tokenize(source);
     if let Some(first_error) = errors.first() {
         bail!("Failed to parse pattern: {}", first_error);
     }
diff --git a/crates/ra_ssr/src/replacing.rs b/crates/ra_ssr/src/replacing.rs
index 74f9e7db616..8f8fe6149a5 100644
--- a/crates/ra_ssr/src/replacing.rs
+++ b/crates/ra_ssr/src/replacing.rs
@@ -2,9 +2,9 @@
 
 use crate::matching::Var;
 use crate::{resolving::ResolvedRule, Match, SsrMatches};
-use ra_syntax::ast::{self, AstToken};
-use ra_syntax::{SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize};
 use rustc_hash::{FxHashMap, FxHashSet};
+use syntax::ast::{self, AstToken};
+use syntax::{SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize};
 use text_edit::TextEdit;
 
 /// Returns a text edit that will replace each match in `matches` with its corresponding replacement
@@ -92,7 +92,7 @@ impl ReplacementRenderer<'_> {
     }
 
     fn render_node(&mut self, node: &SyntaxNode) {
-        use ra_syntax::ast::AstNode;
+        use syntax::ast::AstNode;
         if let Some(mod_path) = self.match_info.rendered_template_paths.get(&node) {
             self.out.push_str(&mod_path.to_string());
             // Emit everything except for the segment's name-ref, since we already effectively
@@ -180,7 +180,7 @@ impl ReplacementRenderer<'_> {
 }
 
 fn parse_as_kind(code: &str, kind: SyntaxKind) -> Option<SyntaxNode> {
-    use ra_syntax::ast::AstNode;
+    use syntax::ast::AstNode;
     if ast::Expr::can_cast(kind) {
         if let Ok(expr) = ast::Expr::parse(code) {
             return Some(expr.syntax().clone());
diff --git a/crates/ra_ssr/src/resolving.rs b/crates/ra_ssr/src/resolving.rs
index d53bd46c77f..7e7585c8bbe 100644
--- a/crates/ra_ssr/src/resolving.rs
+++ b/crates/ra_ssr/src/resolving.rs
@@ -4,8 +4,8 @@ use crate::errors::error;
 use crate::{parsing, SsrError};
 use parsing::Placeholder;
 use ra_db::FilePosition;
-use ra_syntax::{ast, SmolStr, SyntaxKind, SyntaxNode, SyntaxToken};
 use rustc_hash::FxHashMap;
+use syntax::{ast, SmolStr, SyntaxKind, SyntaxNode, SyntaxToken};
 use test_utils::mark;
 
 pub(crate) struct ResolutionScope<'db> {
@@ -70,7 +70,7 @@ struct Resolver<'a, 'db> {
 
 impl Resolver<'_, '_> {
     fn resolve_pattern_tree(&self, pattern: SyntaxNode) -> Result<ResolvedPattern, SsrError> {
-        use ra_syntax::{SyntaxElement, T};
+        use syntax::{SyntaxElement, T};
         let mut resolved_paths = FxHashMap::default();
         self.resolve(pattern.clone(), 0, &mut resolved_paths)?;
         let ufcs_function_calls = resolved_paths
@@ -108,7 +108,7 @@ impl Resolver<'_, '_> {
         depth: u32,
         resolved_paths: &mut FxHashMap<SyntaxNode, ResolvedPath>,
     ) -> Result<(), SsrError> {
-        use ra_syntax::ast::AstNode;
+        use syntax::ast::AstNode;
         if let Some(path) = ast::Path::cast(node.clone()) {
             if is_self(&path) {
                 // Self cannot be resolved like other paths.
@@ -179,7 +179,7 @@ impl<'db> ResolutionScope<'db> {
         sema: &hir::Semantics<'db, ra_ide_db::RootDatabase>,
         resolve_context: FilePosition,
     ) -> ResolutionScope<'db> {
-        use ra_syntax::ast::AstNode;
+        use syntax::ast::AstNode;
         let file = sema.parse(resolve_context.file_id);
         // Find a node at the requested position, falling back to the whole file.
         let node = file
diff --git a/crates/ra_ssr/src/search.rs b/crates/ra_ssr/src/search.rs
index 85ffa2ac23f..e44e1495992 100644
--- a/crates/ra_ssr/src/search.rs
+++ b/crates/ra_ssr/src/search.rs
@@ -10,8 +10,8 @@ use ra_ide_db::{
     defs::Definition,
     search::{Reference, SearchScope},
 };
-use ra_syntax::{ast, AstNode, SyntaxKind, SyntaxNode};
 use rustc_hash::FxHashSet;
+use syntax::{ast, AstNode, SyntaxKind, SyntaxNode};
 use test_utils::mark;
 
 /// A cache for the results of find_usages. This is for when we have multiple patterns that have the
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index ef244da5970..86c786e25c4 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -38,7 +38,7 @@ flycheck = { path = "../flycheck" }
 ra_ide = { path = "../ra_ide" }
 profile = { path = "../profile" }
 ra_project_model = { path = "../ra_project_model" }
-ra_syntax = { path = "../ra_syntax" }
+syntax = { path = "../syntax" }
 text_edit = { path = "../text_edit" }
 vfs = { path = "../vfs" }
 vfs-notify = { path = "../vfs-notify" }
diff --git a/crates/rust-analyzer/src/cargo_target_spec.rs b/crates/rust-analyzer/src/cargo_target_spec.rs
index 03c41263aa7..7929368c0cd 100644
--- a/crates/rust-analyzer/src/cargo_target_spec.rs
+++ b/crates/rust-analyzer/src/cargo_target_spec.rs
@@ -179,7 +179,7 @@ mod tests {
 
     use mbe::ast_to_token_tree;
     use ra_cfg::CfgExpr;
-    use ra_syntax::{
+    use syntax::{
         ast::{self, AstNode},
         SmolStr,
     };
diff --git a/crates/rust-analyzer/src/cli.rs b/crates/rust-analyzer/src/cli.rs
index 46d70fcb2ae..420abaccb93 100644
--- a/crates/rust-analyzer/src/cli.rs
+++ b/crates/rust-analyzer/src/cli.rs
@@ -11,7 +11,7 @@ use std::io::Read;
 
 use anyhow::Result;
 use ra_ide::Analysis;
-use ra_syntax::{AstNode, SourceFile};
+use syntax::{AstNode, SourceFile};
 
 pub use analysis_bench::{BenchCmd, BenchWhat, Position};
 pub use analysis_stats::AnalysisStatsCmd;
diff --git a/crates/rust-analyzer/src/cli/analysis_stats.rs b/crates/rust-analyzer/src/cli/analysis_stats.rs
index a30c1ec7980..cfc1b224403 100644
--- a/crates/rust-analyzer/src/cli/analysis_stats.rs
+++ b/crates/rust-analyzer/src/cli/analysis_stats.rs
@@ -18,10 +18,10 @@ use ra_db::{
     salsa::{self, ParallelDatabase},
     SourceDatabaseExt,
 };
-use ra_syntax::AstNode;
 use rayon::prelude::*;
 use rustc_hash::FxHashSet;
 use stdx::format_to;
+use syntax::AstNode;
 
 use crate::{
     cli::{
diff --git a/crates/rust-analyzer/src/from_proto.rs b/crates/rust-analyzer/src/from_proto.rs
index 9f8ce3b991e..ad88ffdd729 100644
--- a/crates/rust-analyzer/src/from_proto.rs
+++ b/crates/rust-analyzer/src/from_proto.rs
@@ -3,7 +3,7 @@ use std::convert::TryFrom;
 
 use ra_db::{FileId, FilePosition, FileRange};
 use ra_ide::{AssistKind, LineCol, LineIndex};
-use ra_syntax::{TextRange, TextSize};
+use syntax::{TextRange, TextSize};
 use vfs::AbsPathBuf;
 
 use crate::{global_state::GlobalStateSnapshot, Result};
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index 07f4af3d3b6..86e7833f2f9 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -23,10 +23,10 @@ use ra_ide::{
     RangeInfo, Runnable, RunnableKind, SearchScope, TextEdit,
 };
 use ra_project_model::TargetKind;
-use ra_syntax::{algo, ast, AstNode, SyntaxKind, TextRange, TextSize};
 use serde::{Deserialize, Serialize};
 use serde_json::to_value;
 use stdx::{format_to, split_once};
+use syntax::{algo, ast, AstNode, SyntaxKind, TextRange, TextSize};
 
 use crate::{
     cargo_target_spec::CargoTargetSpec,
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs
index 62fda8a1f20..278819a5c3f 100644
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -12,7 +12,7 @@ use ra_ide::{
     Indel, InlayHint, InlayKind, InsertTextFormat, LineIndex, Markup, NavigationTarget,
     ReferenceAccess, ResolvedAssist, Runnable, Severity, SourceChange, SourceFileEdit, TextEdit,
 };
-use ra_syntax::{SyntaxKind, TextRange, TextSize};
+use syntax::{SyntaxKind, TextRange, TextSize};
 
 use crate::{
     cargo_target_spec::CargoTargetSpec, global_state::GlobalStateSnapshot,
diff --git a/crates/ra_syntax/Cargo.toml b/crates/syntax/Cargo.toml
index eec4bd845ed..47e351f9d1a 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/syntax/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-edition = "2018"
-name = "ra_syntax"
-version = "0.1.0"
-authors = ["rust-analyzer developers"]
-license = "MIT OR Apache-2.0"
+name = "syntax"
+version = "0.0.0"
 description = "Comment and whitespace preserving parser for the Rust language"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-analyzer/rust-analyzer"
+authors = ["rust-analyzer developers"]
+edition = "2018"
 
 [lib]
 doctest = false
@@ -17,20 +17,19 @@ rustc_lexer = { version = "671.0.0", package = "rustc-ap-rustc_lexer" }
 rustc-hash = "1.1.0"
 arrayvec = "0.5.1"
 once_cell = "1.3.1"
-
-stdx = { path = "../stdx" }
-
-text_edit = { path = "../text_edit" }
-parser = { path = "../parser" }
-
 # This crate transitively depends on `smol_str` via `rowan`.
 # 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.106", features = ["derive"] }
 
+stdx = { path = "../stdx" }
+text_edit = { path = "../text_edit" }
+parser = { path = "../parser" }
+
 [dev-dependencies]
-test_utils = { path = "../test_utils" }
-expect = { path = "../expect" }
 walkdir = "2.3.1"
 rayon = "1"
+
+test_utils = { path = "../test_utils" }
+expect = { path = "../expect" }
diff --git a/crates/ra_syntax/fuzz/.gitignore b/crates/syntax/fuzz/.gitignore
index f734abd499c..f734abd499c 100644
--- a/crates/ra_syntax/fuzz/.gitignore
+++ b/crates/syntax/fuzz/.gitignore
diff --git a/crates/ra_syntax/fuzz/Cargo.toml b/crates/syntax/fuzz/Cargo.toml
index 4cec3c4cd8b..32c40d1b95c 100644
--- a/crates/ra_syntax/fuzz/Cargo.toml
+++ b/crates/syntax/fuzz/Cargo.toml
@@ -1,6 +1,6 @@
 
 [package]
-name = "ra_syntax-fuzz"
+name = "syntax-fuzz"
 version = "0.0.1"
 authors = ["rust-analyzer developers"]
 publish = false
@@ -10,7 +10,7 @@ edition = "2018"
 cargo-fuzz = true
 
 [dependencies]
-ra_syntax = { path = ".." }
+syntax = { path = ".." }
 text_edit = { path = "../../text_edit" }
 libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" }
 
diff --git a/crates/ra_syntax/fuzz/fuzz_targets/parser.rs b/crates/syntax/fuzz/fuzz_targets/parser.rs
index 7bc4ef30d0e..386768343bd 100644
--- a/crates/ra_syntax/fuzz/fuzz_targets/parser.rs
+++ b/crates/syntax/fuzz/fuzz_targets/parser.rs
@@ -2,7 +2,7 @@
 
 #![no_main]
 use libfuzzer_sys::fuzz_target;
-use ra_syntax::fuzz::check_parser;
+use syntax::fuzz::check_parser;
 
 fuzz_target!(|data: &[u8]| {
     if let Ok(text) = std::str::from_utf8(data) {
diff --git a/crates/ra_syntax/fuzz/fuzz_targets/reparse.rs b/crates/syntax/fuzz/fuzz_targets/reparse.rs
index 16598f5f110..5ac99fdafdf 100644
--- a/crates/ra_syntax/fuzz/fuzz_targets/reparse.rs
+++ b/crates/syntax/fuzz/fuzz_targets/reparse.rs
@@ -2,7 +2,7 @@
 
 #![no_main]
 use libfuzzer_sys::fuzz_target;
-use ra_syntax::fuzz::CheckReparse;
+use syntax::fuzz::CheckReparse;
 
 fuzz_target!(|data: &[u8]| {
     if let Some(check) = CheckReparse::from_data(data) {
diff --git a/crates/ra_syntax/src/algo.rs b/crates/syntax/src/algo.rs
index 6254b38ba1c..6254b38ba1c 100644
--- a/crates/ra_syntax/src/algo.rs
+++ b/crates/syntax/src/algo.rs
diff --git a/crates/ra_syntax/src/ast.rs b/crates/syntax/src/ast.rs
index d536bb1e7d6..d536bb1e7d6 100644
--- a/crates/ra_syntax/src/ast.rs
+++ b/crates/syntax/src/ast.rs
diff --git a/crates/ra_syntax/src/ast/edit.rs b/crates/syntax/src/ast/edit.rs
index 5ed123f91fe..5ed123f91fe 100644
--- a/crates/ra_syntax/src/ast/edit.rs
+++ b/crates/syntax/src/ast/edit.rs
diff --git a/crates/ra_syntax/src/ast/expr_ext.rs b/crates/syntax/src/ast/expr_ext.rs
index f5ba872233f..f5ba872233f 100644
--- a/crates/ra_syntax/src/ast/expr_ext.rs
+++ b/crates/syntax/src/ast/expr_ext.rs
diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/syntax/src/ast/generated.rs
index 4a6f41ee71f..4a6f41ee71f 100644
--- a/crates/ra_syntax/src/ast/generated.rs
+++ b/crates/syntax/src/ast/generated.rs
diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/syntax/src/ast/generated/nodes.rs
index 3d49309d148..3d49309d148 100644
--- a/crates/ra_syntax/src/ast/generated/nodes.rs
+++ b/crates/syntax/src/ast/generated/nodes.rs
diff --git a/crates/ra_syntax/src/ast/generated/tokens.rs b/crates/syntax/src/ast/generated/tokens.rs
index abadd0b61c6..abadd0b61c6 100644
--- a/crates/ra_syntax/src/ast/generated/tokens.rs
+++ b/crates/syntax/src/ast/generated/tokens.rs
diff --git a/crates/ra_syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs
index 254a37fe3e4..254a37fe3e4 100644
--- a/crates/ra_syntax/src/ast/make.rs
+++ b/crates/syntax/src/ast/make.rs
diff --git a/crates/ra_syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index 50c1c157d87..50c1c157d87 100644
--- a/crates/ra_syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
diff --git a/crates/ra_syntax/src/ast/token_ext.rs b/crates/syntax/src/ast/token_ext.rs
index c5ef92733d8..c5ef92733d8 100644
--- a/crates/ra_syntax/src/ast/token_ext.rs
+++ b/crates/syntax/src/ast/token_ext.rs
diff --git a/crates/ra_syntax/src/ast/traits.rs b/crates/syntax/src/ast/traits.rs
index 0bdc22d953f..0bdc22d953f 100644
--- a/crates/ra_syntax/src/ast/traits.rs
+++ b/crates/syntax/src/ast/traits.rs
diff --git a/crates/ra_syntax/src/fuzz.rs b/crates/syntax/src/fuzz.rs
index fbb97aa2736..fbb97aa2736 100644
--- a/crates/ra_syntax/src/fuzz.rs
+++ b/crates/syntax/src/fuzz.rs
diff --git a/crates/ra_syntax/src/lib.rs b/crates/syntax/src/lib.rs
index 7f8da66af07..7f8da66af07 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/syntax/src/lib.rs
diff --git a/crates/ra_syntax/src/parsing.rs b/crates/syntax/src/parsing.rs
index 68a39eb2103..68a39eb2103 100644
--- a/crates/ra_syntax/src/parsing.rs
+++ b/crates/syntax/src/parsing.rs
diff --git a/crates/ra_syntax/src/parsing/lexer.rs b/crates/syntax/src/parsing/lexer.rs
index fa3be101622..fa3be101622 100644
--- a/crates/ra_syntax/src/parsing/lexer.rs
+++ b/crates/syntax/src/parsing/lexer.rs
diff --git a/crates/ra_syntax/src/parsing/reparsing.rs b/crates/syntax/src/parsing/reparsing.rs
index 4149f856a83..4149f856a83 100644
--- a/crates/ra_syntax/src/parsing/reparsing.rs
+++ b/crates/syntax/src/parsing/reparsing.rs
diff --git a/crates/ra_syntax/src/parsing/text_token_source.rs b/crates/syntax/src/parsing/text_token_source.rs
index df866dc2b75..df866dc2b75 100644
--- a/crates/ra_syntax/src/parsing/text_token_source.rs
+++ b/crates/syntax/src/parsing/text_token_source.rs
diff --git a/crates/ra_syntax/src/parsing/text_tree_sink.rs b/crates/syntax/src/parsing/text_tree_sink.rs
index c1b5f246d11..c1b5f246d11 100644
--- a/crates/ra_syntax/src/parsing/text_tree_sink.rs
+++ b/crates/syntax/src/parsing/text_tree_sink.rs
diff --git a/crates/ra_syntax/src/ptr.rs b/crates/syntax/src/ptr.rs
index ca795774713..ca795774713 100644
--- a/crates/ra_syntax/src/ptr.rs
+++ b/crates/syntax/src/ptr.rs
diff --git a/crates/ra_syntax/src/syntax_error.rs b/crates/syntax/src/syntax_error.rs
index 7c4511fece0..7c4511fece0 100644
--- a/crates/ra_syntax/src/syntax_error.rs
+++ b/crates/syntax/src/syntax_error.rs
diff --git a/crates/ra_syntax/src/syntax_node.rs b/crates/syntax/src/syntax_node.rs
index b2abcbfbb36..b2abcbfbb36 100644
--- a/crates/ra_syntax/src/syntax_node.rs
+++ b/crates/syntax/src/syntax_node.rs
diff --git a/crates/ra_syntax/src/tests.rs b/crates/syntax/src/tests.rs
index 00b957f4347..ddc71836940 100644
--- a/crates/ra_syntax/src/tests.rs
+++ b/crates/syntax/src/tests.rs
@@ -126,7 +126,7 @@ fn self_hosting_parsing() {
     let files = walkdir::WalkDir::new(dir)
         .into_iter()
         .filter_entry(|entry| {
-            // Get all files which are not in the crates/ra_syntax/test_data folder
+            // Get all files which are not in the crates/syntax/test_data folder
             !entry.path().components().any(|component| component.as_os_str() == "test_data")
         })
         .map(|e| e.unwrap())
@@ -162,7 +162,7 @@ fn self_hosting_parsing() {
 }
 
 fn test_data_dir() -> PathBuf {
-    project_dir().join("crates/ra_syntax/test_data")
+    project_dir().join("crates/syntax/test_data")
 }
 
 fn assert_errors_are_present(errors: &[SyntaxError], path: &Path) {
diff --git a/crates/ra_syntax/src/validation.rs b/crates/syntax/src/validation.rs
index 2dddaf09a40..2dddaf09a40 100644
--- a/crates/ra_syntax/src/validation.rs
+++ b/crates/syntax/src/validation.rs
diff --git a/crates/ra_syntax/src/validation/block.rs b/crates/syntax/src/validation/block.rs
index ad990146885..ad990146885 100644
--- a/crates/ra_syntax/src/validation/block.rs
+++ b/crates/syntax/src/validation/block.rs
diff --git a/crates/ra_syntax/test_data/accidentally_quadratic b/crates/syntax/test_data/accidentally_quadratic
index 428f83a627b..428f83a627b 100644
--- a/crates/ra_syntax/test_data/accidentally_quadratic
+++ b/crates/syntax/test_data/accidentally_quadratic
diff --git a/crates/ra_syntax/test_data/lexer/err/0001_unclosed_char_at_eof.rs b/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.rs
index ad2823b48f7..ad2823b48f7 100644
--- a/crates/ra_syntax/test_data/lexer/err/0001_unclosed_char_at_eof.rs
+++ b/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt b/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt
index 4d5ad74df57..4d5ad74df57 100644
--- a/crates/ra_syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt
+++ b/crates/syntax/test_data/lexer/err/0001_unclosed_char_at_eof.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.rs b/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.rs
index e264a415280..e264a415280 100644
--- a/crates/ra_syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.rs
+++ b/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt b/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt
index eafdb3c7c91..eafdb3c7c91 100644
--- a/crates/ra_syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt
+++ b/crates/syntax/test_data/lexer/err/0002_unclosed_char_with_ferris.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.rs
index cf74b4dad3b..cf74b4dad3b 100644
--- a/crates/ra_syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt
index cc2b4866a17..cc2b4866a17 100644
--- a/crates/ra_syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0003_unclosed_char_with_ascii_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.rs
index 50be91f6852..50be91f6852 100644
--- a/crates/ra_syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt
index a6d422cb3d4..a6d422cb3d4 100644
--- a/crates/ra_syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0004_unclosed_char_with_unicode_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0005_unclosed_char_with_space.rs b/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.rs
index 309ecfe4786..309ecfe4786 100644
--- a/crates/ra_syntax/test_data/lexer/err/0005_unclosed_char_with_space.rs
+++ b/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt b/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt
index 47e7baa708a..47e7baa708a 100644
--- a/crates/ra_syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt
+++ b/crates/syntax/test_data/lexer/err/0005_unclosed_char_with_space.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0006_unclosed_char_with_slash.rs b/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.rs
index 6ba258b1093..6ba258b1093 100644
--- a/crates/ra_syntax/test_data/lexer/err/0006_unclosed_char_with_slash.rs
+++ b/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt b/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt
index 511029d8078..511029d8078 100644
--- a/crates/ra_syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt
+++ b/crates/syntax/test_data/lexer/err/0006_unclosed_char_with_slash.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.rs
index 78bef7e3eb2..78bef7e3eb2 100644
--- a/crates/ra_syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.rs
+++ b/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt
index d2ba5742c67..d2ba5742c67 100644
--- a/crates/ra_syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt
+++ b/crates/syntax/test_data/lexer/err/0007_unclosed_char_with_slash_n.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.rs b/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.rs
index a0e722065bd..a0e722065bd 100644
--- a/crates/ra_syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.rs
+++ b/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt b/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt
index ae9a7f0e2a7..ae9a7f0e2a7 100644
--- a/crates/ra_syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt
+++ b/crates/syntax/test_data/lexer/err/0008_unclosed_char_with_slash_single_quote.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.rs b/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.rs
index 795dc7e25c5..795dc7e25c5 100644
--- a/crates/ra_syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.rs
+++ b/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt b/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt
index ff15045920f..ff15045920f 100644
--- a/crates/ra_syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt
+++ b/crates/syntax/test_data/lexer/err/0009_unclosed_byte_at_eof.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.rs b/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.rs
index c9230dc24ea..c9230dc24ea 100644
--- a/crates/ra_syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.rs
+++ b/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt b/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt
index 34f7bd6d407..34f7bd6d407 100644
--- a/crates/ra_syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt
+++ b/crates/syntax/test_data/lexer/err/0010_unclosed_byte_with_ferris.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.rs
index d146a8090d1..d146a8090d1 100644
--- a/crates/ra_syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt
index c964d0f00a5..c964d0f00a5 100644
--- a/crates/ra_syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0011_unclosed_byte_with_ascii_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.rs
index a3dec7c255d..a3dec7c255d 100644
--- a/crates/ra_syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt
index cc65fb86f97..cc65fb86f97 100644
--- a/crates/ra_syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0012_unclosed_byte_with_unicode_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0013_unclosed_byte_with_space.rs b/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.rs
index 93b7f9c87c9..93b7f9c87c9 100644
--- a/crates/ra_syntax/test_data/lexer/err/0013_unclosed_byte_with_space.rs
+++ b/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt b/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt
index 800834a144f..800834a144f 100644
--- a/crates/ra_syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt
+++ b/crates/syntax/test_data/lexer/err/0013_unclosed_byte_with_space.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.rs b/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.rs
index abffa5037c0..abffa5037c0 100644
--- a/crates/ra_syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.rs
+++ b/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt b/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt
index 7b85ee64634..7b85ee64634 100644
--- a/crates/ra_syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt
+++ b/crates/syntax/test_data/lexer/err/0014_unclosed_byte_with_slash.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.rs
index 4f46836a935..4f46836a935 100644
--- a/crates/ra_syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.rs
+++ b/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt
index 4b9a63117b5..4b9a63117b5 100644
--- a/crates/ra_syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt
+++ b/crates/syntax/test_data/lexer/err/0015_unclosed_byte_with_slash_n.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.rs b/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.rs
index 645b641eedb..645b641eedb 100644
--- a/crates/ra_syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.rs
+++ b/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt b/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt
index fe337f8d325..fe337f8d325 100644
--- a/crates/ra_syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt
+++ b/crates/syntax/test_data/lexer/err/0016_unclosed_byte_with_slash_single_quote.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0017_unclosed_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0017_unclosed_string_at_eof.rs
index 9d68933c44f..9d68933c44f 100644
--- a/crates/ra_syntax/test_data/lexer/err/0017_unclosed_string_at_eof.rs
+++ b/crates/syntax/test_data/lexer/err/0017_unclosed_string_at_eof.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0017_unclosed_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0017_unclosed_string_at_eof.txt
index d11a8d880ea..d11a8d880ea 100644
--- a/crates/ra_syntax/test_data/lexer/err/0017_unclosed_string_at_eof.txt
+++ b/crates/syntax/test_data/lexer/err/0017_unclosed_string_at_eof.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.rs b/crates/syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.rs
index d439b8d2a1d..d439b8d2a1d 100644
--- a/crates/ra_syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.rs
+++ b/crates/syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.txt b/crates/syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.txt
index 167f942d12c..167f942d12c 100644
--- a/crates/ra_syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.txt
+++ b/crates/syntax/test_data/lexer/err/0018_unclosed_string_with_ferris.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.rs
index 56186a34444..56186a34444 100644
--- a/crates/ra_syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.txt
index 224c653d26d..224c653d26d 100644
--- a/crates/ra_syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0019_unclosed_string_with_ascii_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.rs
index ed24095c3d4..ed24095c3d4 100644
--- a/crates/ra_syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.txt
index 48975bbcbc4..48975bbcbc4 100644
--- a/crates/ra_syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0020_unclosed_string_with_unicode_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0021_unclosed_string_with_space.rs b/crates/syntax/test_data/lexer/err/0021_unclosed_string_with_space.rs
index 72cdc841fbd..72cdc841fbd 100644
--- a/crates/ra_syntax/test_data/lexer/err/0021_unclosed_string_with_space.rs
+++ b/crates/syntax/test_data/lexer/err/0021_unclosed_string_with_space.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0021_unclosed_string_with_space.txt b/crates/syntax/test_data/lexer/err/0021_unclosed_string_with_space.txt
index a823cca7a48..a823cca7a48 100644
--- a/crates/ra_syntax/test_data/lexer/err/0021_unclosed_string_with_space.txt
+++ b/crates/syntax/test_data/lexer/err/0021_unclosed_string_with_space.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0022_unclosed_string_with_slash.rs b/crates/syntax/test_data/lexer/err/0022_unclosed_string_with_slash.rs
index 00a25840087..00a25840087 100644
--- a/crates/ra_syntax/test_data/lexer/err/0022_unclosed_string_with_slash.rs
+++ b/crates/syntax/test_data/lexer/err/0022_unclosed_string_with_slash.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0022_unclosed_string_with_slash.txt b/crates/syntax/test_data/lexer/err/0022_unclosed_string_with_slash.txt
index 0914f001f55..0914f001f55 100644
--- a/crates/ra_syntax/test_data/lexer/err/0022_unclosed_string_with_slash.txt
+++ b/crates/syntax/test_data/lexer/err/0022_unclosed_string_with_slash.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.rs
index a0c29b8cff7..a0c29b8cff7 100644
--- a/crates/ra_syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.rs
+++ b/crates/syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.txt
index 5674b55fdfa..5674b55fdfa 100644
--- a/crates/ra_syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.txt
+++ b/crates/syntax/test_data/lexer/err/0023_unclosed_string_with_slash_n.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.rs b/crates/syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.rs
index 403c2d6ddc6..403c2d6ddc6 100644
--- a/crates/ra_syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.rs
+++ b/crates/syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.txt b/crates/syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.txt
index 4c9a774e466..4c9a774e466 100644
--- a/crates/ra_syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.txt
+++ b/crates/syntax/test_data/lexer/err/0024_unclosed_string_with_slash_double_quote.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.rs
index 36f4f432187..36f4f432187 100644
--- a/crates/ra_syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.rs
+++ b/crates/syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.txt
index 04e6b0aa4f1..04e6b0aa4f1 100644
--- a/crates/ra_syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.txt
+++ b/crates/syntax/test_data/lexer/err/0025_unclosed_byte_string_at_eof.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.rs b/crates/syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.rs
index 3c23a037228..3c23a037228 100644
--- a/crates/ra_syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.rs
+++ b/crates/syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.txt b/crates/syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.txt
index 0576a0609a8..0576a0609a8 100644
--- a/crates/ra_syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.txt
+++ b/crates/syntax/test_data/lexer/err/0026_unclosed_byte_string_with_ferris.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.rs
index 836c112c157..836c112c157 100644
--- a/crates/ra_syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.txt
index 541a013d853..541a013d853 100644
--- a/crates/ra_syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0027_unclosed_byte_string_with_ascii_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.rs
index 1c6df1d00e4..1c6df1d00e4 100644
--- a/crates/ra_syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.txt
index 71b0fb2118c..71b0fb2118c 100644
--- a/crates/ra_syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0028_unclosed_byte_string_with_unicode_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.rs b/crates/syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.rs
index d6898541e62..d6898541e62 100644
--- a/crates/ra_syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.rs
+++ b/crates/syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.txt b/crates/syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.txt
index bd5058bc118..bd5058bc118 100644
--- a/crates/ra_syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.txt
+++ b/crates/syntax/test_data/lexer/err/0029_unclosed_byte_string_with_space.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.rs b/crates/syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.rs
index cce6615381d..cce6615381d 100644
--- a/crates/ra_syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.rs
+++ b/crates/syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.txt b/crates/syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.txt
index 7f94f10ba15..7f94f10ba15 100644
--- a/crates/ra_syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.txt
+++ b/crates/syntax/test_data/lexer/err/0030_unclosed_byte_string_with_slash.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.rs
index 5e680aabb7b..5e680aabb7b 100644
--- a/crates/ra_syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.rs
+++ b/crates/syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.txt
index 9c3c089d724..9c3c089d724 100644
--- a/crates/ra_syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.txt
+++ b/crates/syntax/test_data/lexer/err/0031_unclosed_byte_string_with_slash_n.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.rs b/crates/syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.rs
index f2ff58ba9a8..f2ff58ba9a8 100644
--- a/crates/ra_syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.rs
+++ b/crates/syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.txt b/crates/syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.txt
index 884b12c8ee0..884b12c8ee0 100644
--- a/crates/ra_syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.txt
+++ b/crates/syntax/test_data/lexer/err/0032_unclosed_byte_string_with_slash_double_quote.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.rs
index 557c59b6251..557c59b6251 100644
--- a/crates/ra_syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.rs
+++ b/crates/syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.txt
index 6fd59ccc027..6fd59ccc027 100644
--- a/crates/ra_syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.txt
+++ b/crates/syntax/test_data/lexer/err/0033_unclosed_raw_string_at_eof.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.rs b/crates/syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.rs
index bd046e4bb91..bd046e4bb91 100644
--- a/crates/ra_syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.rs
+++ b/crates/syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.txt b/crates/syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.txt
index 8d9ca0e8f12..8d9ca0e8f12 100644
--- a/crates/ra_syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.txt
+++ b/crates/syntax/test_data/lexer/err/0034_unclosed_raw_string_with_ferris.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.rs
index 5bec883dc7a..5bec883dc7a 100644
--- a/crates/ra_syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.txt
index a906380c718..a906380c718 100644
--- a/crates/ra_syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0035_unclosed_raw_string_with_ascii_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.rs
index bf05c39134b..bf05c39134b 100644
--- a/crates/ra_syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.txt
index 5667c614995..5667c614995 100644
--- a/crates/ra_syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0036_unclosed_raw_string_with_unicode_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.rs b/crates/syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.rs
index f104bae4f2c..f104bae4f2c 100644
--- a/crates/ra_syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.rs
+++ b/crates/syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.txt b/crates/syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.txt
index 141c8268e80..141c8268e80 100644
--- a/crates/ra_syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.txt
+++ b/crates/syntax/test_data/lexer/err/0037_unclosed_raw_string_with_space.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.rs b/crates/syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.rs
index 9242077b8b7..9242077b8b7 100644
--- a/crates/ra_syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.rs
+++ b/crates/syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.txt b/crates/syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.txt
index f61d4cc915e..f61d4cc915e 100644
--- a/crates/ra_syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.txt
+++ b/crates/syntax/test_data/lexer/err/0038_unclosed_raw_string_with_slash.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.rs
index db1c16f2ba5..db1c16f2ba5 100644
--- a/crates/ra_syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.rs
+++ b/crates/syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.txt
index 12e2c0fc038..12e2c0fc038 100644
--- a/crates/ra_syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.txt
+++ b/crates/syntax/test_data/lexer/err/0039_unclosed_raw_string_with_slash_n.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.rs
index ae5bae62230..ae5bae62230 100644
--- a/crates/ra_syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.rs
+++ b/crates/syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.txt
index fe12cb5fc6d..fe12cb5fc6d 100644
--- a/crates/ra_syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.txt
+++ b/crates/syntax/test_data/lexer/err/0040_unclosed_raw_byte_string_at_eof.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.rs b/crates/syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.rs
index 9ef01207a17..9ef01207a17 100644
--- a/crates/ra_syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.rs
+++ b/crates/syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.txt b/crates/syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.txt
index 5be2a7861b4..5be2a7861b4 100644
--- a/crates/ra_syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.txt
+++ b/crates/syntax/test_data/lexer/err/0041_unclosed_raw_byte_string_with_ferris.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.rs b/crates/syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.rs
index d50270afe1e..d50270afe1e 100644
--- a/crates/ra_syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.txt b/crates/syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.txt
index 6cbe08d07ed..6cbe08d07ed 100644
--- a/crates/ra_syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0042_unclosed_raw_byte_string_with_ascii_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.rs b/crates/syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.rs
index 90e299a1a97..90e299a1a97 100644
--- a/crates/ra_syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.rs
+++ b/crates/syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.txt b/crates/syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.txt
index f56a4f98480..f56a4f98480 100644
--- a/crates/ra_syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.txt
+++ b/crates/syntax/test_data/lexer/err/0043_unclosed_raw_byte_string_with_unicode_escape.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.rs b/crates/syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.rs
index 14c602fd2b3..14c602fd2b3 100644
--- a/crates/ra_syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.rs
+++ b/crates/syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.txt b/crates/syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.txt
index 3d32ce34ea5..3d32ce34ea5 100644
--- a/crates/ra_syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.txt
+++ b/crates/syntax/test_data/lexer/err/0044_unclosed_raw_byte_string_with_space.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.rs b/crates/syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.rs
index 0b3c015d74d..0b3c015d74d 100644
--- a/crates/ra_syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.rs
+++ b/crates/syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.txt b/crates/syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.txt
index 320fea17700..320fea17700 100644
--- a/crates/ra_syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.txt
+++ b/crates/syntax/test_data/lexer/err/0045_unclosed_raw_byte_string_with_slash.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.rs b/crates/syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.rs
index 0d8b0e7ab04..0d8b0e7ab04 100644
--- a/crates/ra_syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.rs
+++ b/crates/syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.txt b/crates/syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.txt
index b3a56380cbd..b3a56380cbd 100644
--- a/crates/ra_syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.txt
+++ b/crates/syntax/test_data/lexer/err/0046_unclosed_raw_byte_string_with_slash_n.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.rs
index eddf8d08094..eddf8d08094 100644
--- a/crates/ra_syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.rs
+++ b/crates/syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.txt
index 5af1e2d97ff..5af1e2d97ff 100644
--- a/crates/ra_syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.txt
+++ b/crates/syntax/test_data/lexer/err/0047_unstarted_raw_string_at_eof.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.rs b/crates/syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.rs
index 7e8cadf4f49..7e8cadf4f49 100644
--- a/crates/ra_syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.rs
+++ b/crates/syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.txt b/crates/syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.txt
index aec7afd9278..aec7afd9278 100644
--- a/crates/ra_syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.txt
+++ b/crates/syntax/test_data/lexer/err/0048_unstarted_raw_byte_string_at_eof.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.rs b/crates/syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.rs
index 534668a9b66..534668a9b66 100644
--- a/crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.rs
+++ b/crates/syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt b/crates/syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt
index e22fe5374f0..e22fe5374f0 100644
--- a/crates/ra_syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt
+++ b/crates/syntax/test_data/lexer/err/0049_unstarted_raw_string_with_ascii.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.rs b/crates/syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.rs
index d9b55455ac4..d9b55455ac4 100644
--- a/crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.rs
+++ b/crates/syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt b/crates/syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt
index d74ea4c2796..d74ea4c2796 100644
--- a/crates/ra_syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt
+++ b/crates/syntax/test_data/lexer/err/0050_unstarted_raw_byte_string_with_ascii.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.rs b/crates/syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.rs
index 22e83649f7d..22e83649f7d 100644
--- a/crates/ra_syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.rs
+++ b/crates/syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.txt b/crates/syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.txt
index 2a256e9dffd..2a256e9dffd 100644
--- a/crates/ra_syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.txt
+++ b/crates/syntax/test_data/lexer/err/0051_unclosed_block_comment_at_eof.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.rs b/crates/syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.rs
index c45c2844dbc..c45c2844dbc 100644
--- a/crates/ra_syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.rs
+++ b/crates/syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.txt b/crates/syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.txt
index 8e8490302a5..8e8490302a5 100644
--- a/crates/ra_syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.txt
+++ b/crates/syntax/test_data/lexer/err/0052_unclosed_block_comment_with_content.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.rs b/crates/syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.rs
index 3fcfc96600a..3fcfc96600a 100644
--- a/crates/ra_syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.rs
+++ b/crates/syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.txt b/crates/syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.txt
index b7d28fc05d5..b7d28fc05d5 100644
--- a/crates/ra_syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.txt
+++ b/crates/syntax/test_data/lexer/err/0053_unclosed_nested_block_comment_entirely.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.rs b/crates/syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.rs
index 26c898f019d..26c898f019d 100644
--- a/crates/ra_syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.rs
+++ b/crates/syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.txt b/crates/syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.txt
index 4742d2c12ca..4742d2c12ca 100644
--- a/crates/ra_syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.txt
+++ b/crates/syntax/test_data/lexer/err/0054_unclosed_nested_block_comment_partially.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0055_empty_int.rs b/crates/syntax/test_data/lexer/err/0055_empty_int.rs
index aa2a9fdca17..aa2a9fdca17 100644
--- a/crates/ra_syntax/test_data/lexer/err/0055_empty_int.rs
+++ b/crates/syntax/test_data/lexer/err/0055_empty_int.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0055_empty_int.txt b/crates/syntax/test_data/lexer/err/0055_empty_int.txt
index bcd094b6ef7..bcd094b6ef7 100644
--- a/crates/ra_syntax/test_data/lexer/err/0055_empty_int.txt
+++ b/crates/syntax/test_data/lexer/err/0055_empty_int.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0056_empty_exponent.rs b/crates/syntax/test_data/lexer/err/0056_empty_exponent.rs
index 286584c887f..286584c887f 100644
--- a/crates/ra_syntax/test_data/lexer/err/0056_empty_exponent.rs
+++ b/crates/syntax/test_data/lexer/err/0056_empty_exponent.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0056_empty_exponent.txt b/crates/syntax/test_data/lexer/err/0056_empty_exponent.txt
index 6a645a6a44c..6a645a6a44c 100644
--- a/crates/ra_syntax/test_data/lexer/err/0056_empty_exponent.txt
+++ b/crates/syntax/test_data/lexer/err/0056_empty_exponent.txt
diff --git a/crates/ra_syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.rs b/crates/syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.rs
index a7698a404a8..a7698a404a8 100644
--- a/crates/ra_syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.rs
+++ b/crates/syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.rs
diff --git a/crates/ra_syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.txt b/crates/syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.txt
index e138bcebcdc..e138bcebcdc 100644
--- a/crates/ra_syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.txt
+++ b/crates/syntax/test_data/lexer/err/0057_lifetime_strarts_with_a_number.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0001_hello.rs b/crates/syntax/test_data/lexer/ok/0001_hello.rs
index 95d09f2b101..95d09f2b101 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0001_hello.rs
+++ b/crates/syntax/test_data/lexer/ok/0001_hello.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0001_hello.txt b/crates/syntax/test_data/lexer/ok/0001_hello.txt
index 27a5940a9c1..27a5940a9c1 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0001_hello.txt
+++ b/crates/syntax/test_data/lexer/ok/0001_hello.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0002_whitespace.rs b/crates/syntax/test_data/lexer/ok/0002_whitespace.rs
index 08fce1418a7..08fce1418a7 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0002_whitespace.rs
+++ b/crates/syntax/test_data/lexer/ok/0002_whitespace.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0002_whitespace.txt b/crates/syntax/test_data/lexer/ok/0002_whitespace.txt
index 01d260918ee..01d260918ee 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0002_whitespace.txt
+++ b/crates/syntax/test_data/lexer/ok/0002_whitespace.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0003_ident.rs b/crates/syntax/test_data/lexer/ok/0003_ident.rs
index c05c9c009d7..c05c9c009d7 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0003_ident.rs
+++ b/crates/syntax/test_data/lexer/ok/0003_ident.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0003_ident.txt b/crates/syntax/test_data/lexer/ok/0003_ident.txt
index 4a0d5c05312..4a0d5c05312 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0003_ident.txt
+++ b/crates/syntax/test_data/lexer/ok/0003_ident.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0004_numbers.rs b/crates/syntax/test_data/lexer/ok/0004_numbers.rs
index bc761c235d8..bc761c235d8 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0004_numbers.rs
+++ b/crates/syntax/test_data/lexer/ok/0004_numbers.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0004_numbers.txt b/crates/syntax/test_data/lexer/ok/0004_numbers.txt
index e19fc5789e3..e19fc5789e3 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0004_numbers.txt
+++ b/crates/syntax/test_data/lexer/ok/0004_numbers.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0005_symbols.rs b/crates/syntax/test_data/lexer/ok/0005_symbols.rs
index 487569b5ae3..487569b5ae3 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0005_symbols.rs
+++ b/crates/syntax/test_data/lexer/ok/0005_symbols.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0005_symbols.txt b/crates/syntax/test_data/lexer/ok/0005_symbols.txt
index 2049c2f1d66..2049c2f1d66 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0005_symbols.txt
+++ b/crates/syntax/test_data/lexer/ok/0005_symbols.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0006_chars.rs b/crates/syntax/test_data/lexer/ok/0006_chars.rs
index 454ee0a5f61..454ee0a5f61 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0006_chars.rs
+++ b/crates/syntax/test_data/lexer/ok/0006_chars.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0006_chars.txt b/crates/syntax/test_data/lexer/ok/0006_chars.txt
index 950954fbc88..950954fbc88 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0006_chars.txt
+++ b/crates/syntax/test_data/lexer/ok/0006_chars.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0007_lifetimes.rs b/crates/syntax/test_data/lexer/ok/0007_lifetimes.rs
index b764f1dce3c..b764f1dce3c 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0007_lifetimes.rs
+++ b/crates/syntax/test_data/lexer/ok/0007_lifetimes.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0007_lifetimes.txt b/crates/syntax/test_data/lexer/ok/0007_lifetimes.txt
index 005c29100a0..005c29100a0 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0007_lifetimes.txt
+++ b/crates/syntax/test_data/lexer/ok/0007_lifetimes.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0008_byte_strings.rs b/crates/syntax/test_data/lexer/ok/0008_byte_strings.rs
index b54930f5e69..b54930f5e69 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0008_byte_strings.rs
+++ b/crates/syntax/test_data/lexer/ok/0008_byte_strings.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0008_byte_strings.txt b/crates/syntax/test_data/lexer/ok/0008_byte_strings.txt
index bc03b51a8ab..bc03b51a8ab 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0008_byte_strings.txt
+++ b/crates/syntax/test_data/lexer/ok/0008_byte_strings.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0009_strings.rs b/crates/syntax/test_data/lexer/ok/0009_strings.rs
index 4ddb5bffccc..4ddb5bffccc 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0009_strings.rs
+++ b/crates/syntax/test_data/lexer/ok/0009_strings.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0009_strings.txt b/crates/syntax/test_data/lexer/ok/0009_strings.txt
index 4cb4d711d67..4cb4d711d67 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0009_strings.txt
+++ b/crates/syntax/test_data/lexer/ok/0009_strings.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0010_single_line_comments.rs b/crates/syntax/test_data/lexer/ok/0010_single_line_comments.rs
index 4b6653f9cc9..4b6653f9cc9 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0010_single_line_comments.rs
+++ b/crates/syntax/test_data/lexer/ok/0010_single_line_comments.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0010_single_line_comments.txt b/crates/syntax/test_data/lexer/ok/0010_single_line_comments.txt
index 98a3818c06c..98a3818c06c 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0010_single_line_comments.txt
+++ b/crates/syntax/test_data/lexer/ok/0010_single_line_comments.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0011_keywords.rs b/crates/syntax/test_data/lexer/ok/0011_keywords.rs
index 1e91bff4e7d..1e91bff4e7d 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0011_keywords.rs
+++ b/crates/syntax/test_data/lexer/ok/0011_keywords.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0011_keywords.txt b/crates/syntax/test_data/lexer/ok/0011_keywords.txt
index 22c00eefb62..22c00eefb62 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0011_keywords.txt
+++ b/crates/syntax/test_data/lexer/ok/0011_keywords.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0012_block_comment.rs b/crates/syntax/test_data/lexer/ok/0012_block_comment.rs
index b880a59d952..b880a59d952 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0012_block_comment.rs
+++ b/crates/syntax/test_data/lexer/ok/0012_block_comment.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0012_block_comment.txt b/crates/syntax/test_data/lexer/ok/0012_block_comment.txt
index 2618e287e63..2618e287e63 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0012_block_comment.txt
+++ b/crates/syntax/test_data/lexer/ok/0012_block_comment.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0013_raw_strings.rs b/crates/syntax/test_data/lexer/ok/0013_raw_strings.rs
index e5ed0b693b3..e5ed0b693b3 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0013_raw_strings.rs
+++ b/crates/syntax/test_data/lexer/ok/0013_raw_strings.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0013_raw_strings.txt b/crates/syntax/test_data/lexer/ok/0013_raw_strings.txt
index 9cf0957d1e6..9cf0957d1e6 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0013_raw_strings.txt
+++ b/crates/syntax/test_data/lexer/ok/0013_raw_strings.txt
diff --git a/crates/ra_syntax/test_data/lexer/ok/0014_raw_ident.rs b/crates/syntax/test_data/lexer/ok/0014_raw_ident.rs
index b40a1b6a248..b40a1b6a248 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0014_raw_ident.rs
+++ b/crates/syntax/test_data/lexer/ok/0014_raw_ident.rs
diff --git a/crates/ra_syntax/test_data/lexer/ok/0014_raw_ident.txt b/crates/syntax/test_data/lexer/ok/0014_raw_ident.txt
index 484689693ba..484689693ba 100644
--- a/crates/ra_syntax/test_data/lexer/ok/0014_raw_ident.txt
+++ b/crates/syntax/test_data/lexer/ok/0014_raw_ident.txt
diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast b/crates/syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
index bbbf496c82d..bbbf496c82d 100644
--- a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
+++ b/crates/syntax/test_data/parser/err/0000_struct_field_missing_comma.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rs b/crates/syntax/test_data/parser/err/0000_struct_field_missing_comma.rs
index fe5030d893f..fe5030d893f 100644
--- a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.rs
+++ b/crates/syntax/test_data/parser/err/0000_struct_field_missing_comma.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast b/crates/syntax/test_data/parser/err/0001_item_recovery_in_file.rast
index 6dc73bfdbae..6dc73bfdbae 100644
--- a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rast
+++ b/crates/syntax/test_data/parser/err/0001_item_recovery_in_file.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rs b/crates/syntax/test_data/parser/err/0001_item_recovery_in_file.rs
index 98f23de1f22..98f23de1f22 100644
--- a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.rs
+++ b/crates/syntax/test_data/parser/err/0001_item_recovery_in_file.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast b/crates/syntax/test_data/parser/err/0002_duplicate_shebang.rast
index 4cfd1bce4b1..4cfd1bce4b1 100644
--- a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast
+++ b/crates/syntax/test_data/parser/err/0002_duplicate_shebang.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rs b/crates/syntax/test_data/parser/err/0002_duplicate_shebang.rs
index 48a3a3980ba..48a3a3980ba 100644
--- a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rs
+++ b/crates/syntax/test_data/parser/err/0002_duplicate_shebang.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast b/crates/syntax/test_data/parser/err/0003_C++_semicolon.rast
index 7763fad840b..7763fad840b 100644
--- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast
+++ b/crates/syntax/test_data/parser/err/0003_C++_semicolon.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rs b/crates/syntax/test_data/parser/err/0003_C++_semicolon.rs
index 009312270fe..009312270fe 100644
--- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rs
+++ b/crates/syntax/test_data/parser/err/0003_C++_semicolon.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast b/crates/syntax/test_data/parser/err/0004_use_path_bad_segment.rast
index 9a0f4665efc..9a0f4665efc 100644
--- a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast
+++ b/crates/syntax/test_data/parser/err/0004_use_path_bad_segment.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rs b/crates/syntax/test_data/parser/err/0004_use_path_bad_segment.rs
index 060e65d06d2..060e65d06d2 100644
--- a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rs
+++ b/crates/syntax/test_data/parser/err/0004_use_path_bad_segment.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast b/crates/syntax/test_data/parser/err/0005_attribute_recover.rast
index 4845a6563cb..4845a6563cb 100644
--- a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rast
+++ b/crates/syntax/test_data/parser/err/0005_attribute_recover.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rs b/crates/syntax/test_data/parser/err/0005_attribute_recover.rs
index de7f8162839..de7f8162839 100644
--- a/crates/ra_syntax/test_data/parser/err/0005_attribute_recover.rs
+++ b/crates/syntax/test_data/parser/err/0005_attribute_recover.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast b/crates/syntax/test_data/parser/err/0006_named_field_recovery.rast
index 5f85c3943ab..5f85c3943ab 100644
--- a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rast
+++ b/crates/syntax/test_data/parser/err/0006_named_field_recovery.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rs b/crates/syntax/test_data/parser/err/0006_named_field_recovery.rs
index 8069c111b4b..8069c111b4b 100644
--- a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.rs
+++ b/crates/syntax/test_data/parser/err/0006_named_field_recovery.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/syntax/test_data/parser/err/0007_stray_curly_in_file.rast
index 560bfd75186..560bfd75186 100644
--- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast
+++ b/crates/syntax/test_data/parser/err/0007_stray_curly_in_file.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rs b/crates/syntax/test_data/parser/err/0007_stray_curly_in_file.rs
index dc869fb785e..dc869fb785e 100644
--- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rs
+++ b/crates/syntax/test_data/parser/err/0007_stray_curly_in_file.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/syntax/test_data/parser/err/0008_item_block_recovery.rast
index 1e9637c26d5..1e9637c26d5 100644
--- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast
+++ b/crates/syntax/test_data/parser/err/0008_item_block_recovery.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rs b/crates/syntax/test_data/parser/err/0008_item_block_recovery.rs
index 9fcac19b5ce..9fcac19b5ce 100644
--- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rs
+++ b/crates/syntax/test_data/parser/err/0008_item_block_recovery.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast b/crates/syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
index dacf71aa165..dacf71aa165 100644
--- a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
+++ b/crates/syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rs b/crates/syntax/test_data/parser/err/0009_broken_struct_type_parameter.rs
index 0dd30d0bd68..0dd30d0bd68 100644
--- a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rs
+++ b/crates/syntax/test_data/parser/err/0009_broken_struct_type_parameter.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
index e0f1d0c2749..e0f1d0c2749 100644
--- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
+++ b/crates/syntax/test_data/parser/err/0010_unsafe_lambda_block.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rs b/crates/syntax/test_data/parser/err/0010_unsafe_lambda_block.rs
index 9857752824a..9857752824a 100644
--- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rs
+++ b/crates/syntax/test_data/parser/err/0010_unsafe_lambda_block.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast b/crates/syntax/test_data/parser/err/0011_extern_struct.rast
index b02d390af9b..b02d390af9b 100644
--- a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast
+++ b/crates/syntax/test_data/parser/err/0011_extern_struct.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rs b/crates/syntax/test_data/parser/err/0011_extern_struct.rs
index c1bd0a2d1be..c1bd0a2d1be 100644
--- a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rs
+++ b/crates/syntax/test_data/parser/err/0011_extern_struct.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/syntax/test_data/parser/err/0012_broken_lambda.rast
index f31c2763398..f31c2763398 100644
--- a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast
+++ b/crates/syntax/test_data/parser/err/0012_broken_lambda.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/syntax/test_data/parser/err/0013_invalid_type.rast
index f48ab6e7124..f48ab6e7124 100644
--- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast
+++ b/crates/syntax/test_data/parser/err/0013_invalid_type.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rs b/crates/syntax/test_data/parser/err/0013_invalid_type.rs
index 20dde3bc30f..20dde3bc30f 100644
--- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rs
+++ b/crates/syntax/test_data/parser/err/0013_invalid_type.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast b/crates/syntax/test_data/parser/err/0014_where_no_bounds.rast
index a1f39b22a52..a1f39b22a52 100644
--- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rast
+++ b/crates/syntax/test_data/parser/err/0014_where_no_bounds.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rs b/crates/syntax/test_data/parser/err/0014_where_no_bounds.rs
index 75c1d2f9861..75c1d2f9861 100644
--- a/crates/ra_syntax/test_data/parser/err/0014_where_no_bounds.rs
+++ b/crates/syntax/test_data/parser/err/0014_where_no_bounds.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast b/crates/syntax/test_data/parser/err/0015_curly_in_params.rast
index a3c25b450a9..a3c25b450a9 100644
--- a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rast
+++ b/crates/syntax/test_data/parser/err/0015_curly_in_params.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rs b/crates/syntax/test_data/parser/err/0015_curly_in_params.rs
index 156e70251a1..156e70251a1 100644
--- a/crates/ra_syntax/test_data/parser/err/0015_curly_in_params.rs
+++ b/crates/syntax/test_data/parser/err/0015_curly_in_params.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/syntax/test_data/parser/err/0016_missing_semi.rast
index 66157c3dce9..66157c3dce9 100644
--- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast
+++ b/crates/syntax/test_data/parser/err/0016_missing_semi.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rs b/crates/syntax/test_data/parser/err/0016_missing_semi.rs
index 9ae85768619..9ae85768619 100644
--- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rs
+++ b/crates/syntax/test_data/parser/err/0016_missing_semi.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/syntax/test_data/parser/err/0017_incomplete_binexpr.rast
index fe094f61c17..fe094f61c17 100644
--- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast
+++ b/crates/syntax/test_data/parser/err/0017_incomplete_binexpr.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rs b/crates/syntax/test_data/parser/err/0017_incomplete_binexpr.rs
index 17bd4977777..17bd4977777 100644
--- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rs
+++ b/crates/syntax/test_data/parser/err/0017_incomplete_binexpr.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast
index 72939fc981a..72939fc981a 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
+++ b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rs b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rs
index fe604006c9e..fe604006c9e 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rs
+++ b/crates/syntax/test_data/parser/err/0018_incomplete_fn.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/syntax/test_data/parser/err/0019_let_recover.rast
index 72c05bd964a..72c05bd964a 100644
--- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast
+++ b/crates/syntax/test_data/parser/err/0019_let_recover.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rs b/crates/syntax/test_data/parser/err/0019_let_recover.rs
index 48bf3d68bd3..48bf3d68bd3 100644
--- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rs
+++ b/crates/syntax/test_data/parser/err/0019_let_recover.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast b/crates/syntax/test_data/parser/err/0020_fn_recover.rast
index 6f6feba5a83..6f6feba5a83 100644
--- a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rast
+++ b/crates/syntax/test_data/parser/err/0020_fn_recover.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rs b/crates/syntax/test_data/parser/err/0020_fn_recover.rs
index 3393b668b41..3393b668b41 100644
--- a/crates/ra_syntax/test_data/parser/err/0020_fn_recover.rs
+++ b/crates/syntax/test_data/parser/err/0020_fn_recover.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast b/crates/syntax/test_data/parser/err/0021_incomplete_param.rast
index b3284553770..b3284553770 100644
--- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rast
+++ b/crates/syntax/test_data/parser/err/0021_incomplete_param.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rs b/crates/syntax/test_data/parser/err/0021_incomplete_param.rs
index 7a6c264f6d7..7a6c264f6d7 100644
--- a/crates/ra_syntax/test_data/parser/err/0021_incomplete_param.rs
+++ b/crates/syntax/test_data/parser/err/0021_incomplete_param.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/syntax/test_data/parser/err/0022_bad_exprs.rast
index 71fb19783ad..71fb19783ad 100644
--- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast
+++ b/crates/syntax/test_data/parser/err/0022_bad_exprs.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rs b/crates/syntax/test_data/parser/err/0022_bad_exprs.rs
index cd2d493a10c..cd2d493a10c 100644
--- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rs
+++ b/crates/syntax/test_data/parser/err/0022_bad_exprs.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/syntax/test_data/parser/err/0023_mismatched_paren.rast
index 5ffefd74290..5ffefd74290 100644
--- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast
+++ b/crates/syntax/test_data/parser/err/0023_mismatched_paren.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rs b/crates/syntax/test_data/parser/err/0023_mismatched_paren.rs
index 0206d563ea7..0206d563ea7 100644
--- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rs
+++ b/crates/syntax/test_data/parser/err/0023_mismatched_paren.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/syntax/test_data/parser/err/0024_many_type_parens.rast
index e3be6b22e11..e3be6b22e11 100644
--- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast
+++ b/crates/syntax/test_data/parser/err/0024_many_type_parens.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rs b/crates/syntax/test_data/parser/err/0024_many_type_parens.rs
index 6c2e95c0296..6c2e95c0296 100644
--- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rs
+++ b/crates/syntax/test_data/parser/err/0024_many_type_parens.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/syntax/test_data/parser/err/0025_nope.rast
index 83fc9fe776c..83fc9fe776c 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast
+++ b/crates/syntax/test_data/parser/err/0025_nope.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rs b/crates/syntax/test_data/parser/err/0025_nope.rs
index 28726ed5138..28726ed5138 100644
--- a/crates/ra_syntax/test_data/parser/err/0025_nope.rs
+++ b/crates/syntax/test_data/parser/err/0025_nope.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast b/crates/syntax/test_data/parser/err/0026_imp_recovery.rast
index 1b08c834eb8..1b08c834eb8 100644
--- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rast
+++ b/crates/syntax/test_data/parser/err/0026_imp_recovery.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rs b/crates/syntax/test_data/parser/err/0026_imp_recovery.rs
index 829ca1c4be9..829ca1c4be9 100644
--- a/crates/ra_syntax/test_data/parser/err/0026_imp_recovery.rs
+++ b/crates/syntax/test_data/parser/err/0026_imp_recovery.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast b/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast
index a8e42e6eaae..a8e42e6eaae 100644
--- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast
+++ b/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rs b/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rs
index 2792c20843a..2792c20843a 100644
--- a/crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rs
+++ b/crates/syntax/test_data/parser/err/0027_incomplere_where_for.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast b/crates/syntax/test_data/parser/err/0029_field_completion.rast
index c6402cdd847..c6402cdd847 100644
--- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rast
+++ b/crates/syntax/test_data/parser/err/0029_field_completion.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rs b/crates/syntax/test_data/parser/err/0029_field_completion.rs
index a7cdc17bb11..a7cdc17bb11 100644
--- a/crates/ra_syntax/test_data/parser/err/0029_field_completion.rs
+++ b/crates/syntax/test_data/parser/err/0029_field_completion.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/syntax/test_data/parser/err/0031_block_inner_attrs.rast
index a443b37db17..a443b37db17 100644
--- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast
+++ b/crates/syntax/test_data/parser/err/0031_block_inner_attrs.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rs b/crates/syntax/test_data/parser/err/0031_block_inner_attrs.rs
index 6a04f2d0aae..6a04f2d0aae 100644
--- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rs
+++ b/crates/syntax/test_data/parser/err/0031_block_inner_attrs.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
index 672dd054ac5..672dd054ac5 100644
--- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
+++ b/crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rs b/crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rs
index 06aa4777043..06aa4777043 100644
--- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rs
+++ b/crates/syntax/test_data/parser/err/0032_match_arms_inner_attrs.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast b/crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
index 33bb085e918..33bb085e918 100644
--- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
+++ b/crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rs b/crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rs
index 4635222da28..4635222da28 100644
--- a/crates/ra_syntax/test_data/parser/err/0033_match_arms_outer_attrs.rs
+++ b/crates/syntax/test_data/parser/err/0033_match_arms_outer_attrs.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/syntax/test_data/parser/err/0034_bad_box_pattern.rast
index d9d49bfb5ff..d9d49bfb5ff 100644
--- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast
+++ b/crates/syntax/test_data/parser/err/0034_bad_box_pattern.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rs b/crates/syntax/test_data/parser/err/0034_bad_box_pattern.rs
index d3fa2e468cc..d3fa2e468cc 100644
--- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rs
+++ b/crates/syntax/test_data/parser/err/0034_bad_box_pattern.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/syntax/test_data/parser/err/0035_use_recover.rast
index 2f03709ebad..2f03709ebad 100644
--- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast
+++ b/crates/syntax/test_data/parser/err/0035_use_recover.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rs b/crates/syntax/test_data/parser/err/0035_use_recover.rs
index 4a266812628..4a266812628 100644
--- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rs
+++ b/crates/syntax/test_data/parser/err/0035_use_recover.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast b/crates/syntax/test_data/parser/err/0036_partial_use.rast
index ef6172f8a1a..ef6172f8a1a 100644
--- a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast
+++ b/crates/syntax/test_data/parser/err/0036_partial_use.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rs b/crates/syntax/test_data/parser/err/0036_partial_use.rs
index d521a5bb2de..d521a5bb2de 100644
--- a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rs
+++ b/crates/syntax/test_data/parser/err/0036_partial_use.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/syntax/test_data/parser/err/0037_visibility_in_traits.rast
index faf87d6e5cc..faf87d6e5cc 100644
--- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast
+++ b/crates/syntax/test_data/parser/err/0037_visibility_in_traits.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rs b/crates/syntax/test_data/parser/err/0037_visibility_in_traits.rs
index a43e7ef10c1..a43e7ef10c1 100644
--- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rs
+++ b/crates/syntax/test_data/parser/err/0037_visibility_in_traits.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/syntax/test_data/parser/err/0038_endless_inclusive_range.rast
index bed7ad6c332..bed7ad6c332 100644
--- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast
+++ b/crates/syntax/test_data/parser/err/0038_endless_inclusive_range.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rs b/crates/syntax/test_data/parser/err/0038_endless_inclusive_range.rs
index 0b4ed7a2bc2..0b4ed7a2bc2 100644
--- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rs
+++ b/crates/syntax/test_data/parser/err/0038_endless_inclusive_range.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/syntax/test_data/parser/err/0039_lambda_recovery.rast
index a9c5b70fd3d..a9c5b70fd3d 100644
--- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast
+++ b/crates/syntax/test_data/parser/err/0039_lambda_recovery.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rs b/crates/syntax/test_data/parser/err/0039_lambda_recovery.rs
index a2f74bd879a..a2f74bd879a 100644
--- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rs
+++ b/crates/syntax/test_data/parser/err/0039_lambda_recovery.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
index 284c8715b35..284c8715b35 100644
--- a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
+++ b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs
index 508def2c7ef..508def2c7ef 100644
--- a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs
+++ b/crates/syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
index 2049a9d724f..2049a9d724f 100644
--- a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
+++ b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs
index bd4d5804263..bd4d5804263 100644
--- a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs
+++ b/crates/syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
index deadf56b4b5..deadf56b4b5 100644
--- a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
+++ b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs
index b9e1d7d8be2..b9e1d7d8be2 100644
--- a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs
+++ b/crates/syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0043_weird_blocks.rast b/crates/syntax/test_data/parser/err/0043_weird_blocks.rast
index df29017e7f2..df29017e7f2 100644
--- a/crates/ra_syntax/test_data/parser/err/0043_weird_blocks.rast
+++ b/crates/syntax/test_data/parser/err/0043_weird_blocks.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0043_weird_blocks.rs b/crates/syntax/test_data/parser/err/0043_weird_blocks.rs
index 8fa324c1a14..8fa324c1a14 100644
--- a/crates/ra_syntax/test_data/parser/err/0043_weird_blocks.rs
+++ b/crates/syntax/test_data/parser/err/0043_weird_blocks.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast b/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast
index 71aa864943f..71aa864943f 100644
--- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast
+++ b/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rs b/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rs
index 0e9f8ccb4f8..0e9f8ccb4f8 100644
--- a/crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rs
+++ b/crates/syntax/test_data/parser/err/0044_unexpected_for_type.rs
diff --git a/crates/ra_syntax/test_data/parser/err/0045_item_modifiers.rast b/crates/syntax/test_data/parser/err/0045_item_modifiers.rast
index a6e6552a99e..a6e6552a99e 100644
--- a/crates/ra_syntax/test_data/parser/err/0045_item_modifiers.rast
+++ b/crates/syntax/test_data/parser/err/0045_item_modifiers.rast
diff --git a/crates/ra_syntax/test_data/parser/err/0045_item_modifiers.rs b/crates/syntax/test_data/parser/err/0045_item_modifiers.rs
index 731e58013bd..731e58013bd 100644
--- a/crates/ra_syntax/test_data/parser/err/0045_item_modifiers.rs
+++ b/crates/syntax/test_data/parser/err/0045_item_modifiers.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rast b/crates/syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rast
index 5df7507e2de..5df7507e2de 100644
--- a/crates/ra_syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rast
+++ b/crates/syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rs b/crates/syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rs
index ca49acb079e..ca49acb079e 100644
--- a/crates/ra_syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rs
+++ b/crates/syntax/test_data/parser/fragments/expr/err/0000_truncated_add.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/expr/ok/0000_add.rast b/crates/syntax/test_data/parser/fragments/expr/ok/0000_add.rast
index fa78a02a6bf..fa78a02a6bf 100644
--- a/crates/ra_syntax/test_data/parser/fragments/expr/ok/0000_add.rast
+++ b/crates/syntax/test_data/parser/fragments/expr/ok/0000_add.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/expr/ok/0000_add.rs b/crates/syntax/test_data/parser/fragments/expr/ok/0000_add.rs
index e0ef5840209..e0ef5840209 100644
--- a/crates/ra_syntax/test_data/parser/fragments/expr/ok/0000_add.rs
+++ b/crates/syntax/test_data/parser/fragments/expr/ok/0000_add.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rast b/crates/syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rast
index 5df7507e2de..5df7507e2de 100644
--- a/crates/ra_syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rast
+++ b/crates/syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rs b/crates/syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rs
index dc32389bbb7..dc32389bbb7 100644
--- a/crates/ra_syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rs
+++ b/crates/syntax/test_data/parser/fragments/item/err/0000_extra_keyword.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast b/crates/syntax/test_data/parser/fragments/item/ok/0000_fn.rast
index 93c429e128c..93c429e128c 100644
--- a/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rast
+++ b/crates/syntax/test_data/parser/fragments/item/ok/0000_fn.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rs b/crates/syntax/test_data/parser/fragments/item/ok/0000_fn.rs
index 8f3b7ef112a..8f3b7ef112a 100644
--- a/crates/ra_syntax/test_data/parser/fragments/item/ok/0000_fn.rs
+++ b/crates/syntax/test_data/parser/fragments/item/ok/0000_fn.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/path/err/0000_reserved_word.rast b/crates/syntax/test_data/parser/fragments/path/err/0000_reserved_word.rast
index 5df7507e2de..5df7507e2de 100644
--- a/crates/ra_syntax/test_data/parser/fragments/path/err/0000_reserved_word.rast
+++ b/crates/syntax/test_data/parser/fragments/path/err/0000_reserved_word.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/path/err/0000_reserved_word.rs b/crates/syntax/test_data/parser/fragments/path/err/0000_reserved_word.rs
index 2046de04929..2046de04929 100644
--- a/crates/ra_syntax/test_data/parser/fragments/path/err/0000_reserved_word.rs
+++ b/crates/syntax/test_data/parser/fragments/path/err/0000_reserved_word.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/path/err/0001_expression.rast b/crates/syntax/test_data/parser/fragments/path/err/0001_expression.rast
index 5df7507e2de..5df7507e2de 100644
--- a/crates/ra_syntax/test_data/parser/fragments/path/err/0001_expression.rast
+++ b/crates/syntax/test_data/parser/fragments/path/err/0001_expression.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/path/err/0001_expression.rs b/crates/syntax/test_data/parser/fragments/path/err/0001_expression.rs
index 745e8d376f7..745e8d376f7 100644
--- a/crates/ra_syntax/test_data/parser/fragments/path/err/0001_expression.rs
+++ b/crates/syntax/test_data/parser/fragments/path/err/0001_expression.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/path/ok/0000_single_ident.rast b/crates/syntax/test_data/parser/fragments/path/ok/0000_single_ident.rast
index 0c5d4360fa8..0c5d4360fa8 100644
--- a/crates/ra_syntax/test_data/parser/fragments/path/ok/0000_single_ident.rast
+++ b/crates/syntax/test_data/parser/fragments/path/ok/0000_single_ident.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/path/ok/0000_single_ident.rs b/crates/syntax/test_data/parser/fragments/path/ok/0000_single_ident.rs
index 257cc5642cb..257cc5642cb 100644
--- a/crates/ra_syntax/test_data/parser/fragments/path/ok/0000_single_ident.rs
+++ b/crates/syntax/test_data/parser/fragments/path/ok/0000_single_ident.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/path/ok/0001_multipart.rast b/crates/syntax/test_data/parser/fragments/path/ok/0001_multipart.rast
index 4a2b45e6a96..4a2b45e6a96 100644
--- a/crates/ra_syntax/test_data/parser/fragments/path/ok/0001_multipart.rast
+++ b/crates/syntax/test_data/parser/fragments/path/ok/0001_multipart.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/path/ok/0001_multipart.rs b/crates/syntax/test_data/parser/fragments/path/ok/0001_multipart.rs
index 81e0b21cd41..81e0b21cd41 100644
--- a/crates/ra_syntax/test_data/parser/fragments/path/ok/0001_multipart.rs
+++ b/crates/syntax/test_data/parser/fragments/path/ok/0001_multipart.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rast b/crates/syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rast
index 5df7507e2de..5df7507e2de 100644
--- a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rast
+++ b/crates/syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rs b/crates/syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rs
index ae26fc45566..ae26fc45566 100644
--- a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rs
+++ b/crates/syntax/test_data/parser/fragments/pattern/err/0000_reserved_word.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rast b/crates/syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rast
index 5df7507e2de..5df7507e2de 100644
--- a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rast
+++ b/crates/syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rs b/crates/syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rs
index 61a391d0846..61a391d0846 100644
--- a/crates/ra_syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rs
+++ b/crates/syntax/test_data/parser/fragments/pattern/err/0001_missing_paren.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast b/crates/syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast
index dcf102339aa..dcf102339aa 100644
--- a/crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast
+++ b/crates/syntax/test_data/parser/fragments/pattern/ok/0000_enum.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rs b/crates/syntax/test_data/parser/fragments/pattern/ok/0000_enum.rs
index 87114dd7881..87114dd7881 100644
--- a/crates/ra_syntax/test_data/parser/fragments/pattern/ok/0000_enum.rs
+++ b/crates/syntax/test_data/parser/fragments/pattern/ok/0000_enum.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/type/err/0000_missing_close.rast b/crates/syntax/test_data/parser/fragments/type/err/0000_missing_close.rast
index 5df7507e2de..5df7507e2de 100644
--- a/crates/ra_syntax/test_data/parser/fragments/type/err/0000_missing_close.rast
+++ b/crates/syntax/test_data/parser/fragments/type/err/0000_missing_close.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/type/err/0000_missing_close.rs b/crates/syntax/test_data/parser/fragments/type/err/0000_missing_close.rs
index caa4d7c0927..caa4d7c0927 100644
--- a/crates/ra_syntax/test_data/parser/fragments/type/err/0000_missing_close.rs
+++ b/crates/syntax/test_data/parser/fragments/type/err/0000_missing_close.rs
diff --git a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast b/crates/syntax/test_data/parser/fragments/type/ok/0000_result.rast
index 38c15b5815e..38c15b5815e 100644
--- a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rast
+++ b/crates/syntax/test_data/parser/fragments/type/ok/0000_result.rast
diff --git a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rs b/crates/syntax/test_data/parser/fragments/type/ok/0000_result.rs
index b50b3bb3bfd..b50b3bb3bfd 100644
--- a/crates/ra_syntax/test_data/parser/fragments/type/ok/0000_result.rs
+++ b/crates/syntax/test_data/parser/fragments/type/ok/0000_result.rs
diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs b/crates/syntax/test_data/parser/fuzz-failures/0000.rs
index f1d0dc34382..f1d0dc34382 100644
--- a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs
+++ b/crates/syntax/test_data/parser/fuzz-failures/0000.rs
diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0001.rs b/crates/syntax/test_data/parser/fuzz-failures/0001.rs
index 099cc5f84aa..f1148058efd 100644
--- a/crates/ra_syntax/test_data/parser/fuzz-failures/0001.rs
+++ b/crates/syntax/test_data/parser/fuzz-failures/0001.rs
@@ -1,4 +1,4 @@
-use ra_syntax::{
+use syntax::{
     File, TextRange, SyntaxNodeRef, TextUnit,
     SyntaxKind::*,
     algo::{find_leaf_at_offset, LeafAtOffset, find_covering_node, ancestors, Direction, siblings},
diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0002.rs b/crates/syntax/test_data/parser/fuzz-failures/0002.rs
index f35dc728948..f35dc728948 100644
--- a/crates/ra_syntax/test_data/parser/fuzz-failures/0002.rs
+++ b/crates/syntax/test_data/parser/fuzz-failures/0002.rs
diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0003.rs b/crates/syntax/test_data/parser/fuzz-failures/0003.rs
index 0f59c472269..0f59c472269 100644
--- a/crates/ra_syntax/test_data/parser/fuzz-failures/0003.rs
+++ b/crates/syntax/test_data/parser/fuzz-failures/0003.rs
diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0004.rs b/crates/syntax/test_data/parser/fuzz-failures/0004.rs
index 003290f52f6..003290f52f6 100644
--- a/crates/ra_syntax/test_data/parser/fuzz-failures/0004.rs
+++ b/crates/syntax/test_data/parser/fuzz-failures/0004.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast b/crates/syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
index 0b9bbec0776..0b9bbec0776 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
+++ b/crates/syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rs b/crates/syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rs
index a9485144320..a9485144320 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rs
+++ b/crates/syntax/test_data/parser/inline/err/0001_array_type_missing_semi.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
index a4271fc87ab..a4271fc87ab 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
+++ b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rs b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rs
index a2164c5105c..a2164c5105c 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0002_misplaced_label_err.rs
+++ b/crates/syntax/test_data/parser/inline/err/0002_misplaced_label_err.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast b/crates/syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
index 0d8bf6dd6b6..0d8bf6dd6b6 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
+++ b/crates/syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rs b/crates/syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rs
index fae70513133..fae70513133 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rs
+++ b/crates/syntax/test_data/parser/inline/err/0003_pointer_type_no_mutability.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast b/crates/syntax/test_data/parser/inline/err/0004_impl_type.rast
index 29d6b397402..29d6b397402 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rast
+++ b/crates/syntax/test_data/parser/inline/err/0004_impl_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rs b/crates/syntax/test_data/parser/inline/err/0004_impl_type.rs
index b8c7b65e31d..b8c7b65e31d 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0004_impl_type.rs
+++ b/crates/syntax/test_data/parser/inline/err/0004_impl_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast b/crates/syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
index 776022fd936..776022fd936 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
+++ b/crates/syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs b/crates/syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs
index f014914ff9f..f014914ff9f 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs
+++ b/crates/syntax/test_data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast b/crates/syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
index cc0f8bcaf9f..cc0f8bcaf9f 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
+++ b/crates/syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rs b/crates/syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rs
index 26141e90491..26141e90491 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rs
+++ b/crates/syntax/test_data/parser/inline/err/0006_unsafe_block_in_mod.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast b/crates/syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
index 2c9570678ed..2c9570678ed 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
+++ b/crates/syntax/test_data/parser/inline/err/0007_async_without_semicolon.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rs b/crates/syntax/test_data/parser/inline/err/0007_async_without_semicolon.rs
index 9a423248c27..9a423248c27 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0007_async_without_semicolon.rs
+++ b/crates/syntax/test_data/parser/inline/err/0007_async_without_semicolon.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast b/crates/syntax/test_data/parser/inline/err/0008_pub_expr.rast
index 63a10127dd9..63a10127dd9 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rast
+++ b/crates/syntax/test_data/parser/inline/err/0008_pub_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rs b/crates/syntax/test_data/parser/inline/err/0008_pub_expr.rs
index 2976f68625f..2976f68625f 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0008_pub_expr.rs
+++ b/crates/syntax/test_data/parser/inline/err/0008_pub_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast b/crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
index 8fd8d5e593a..8fd8d5e593a 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
+++ b/crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rs b/crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rs
index d725a07ce96..d725a07ce96 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rs
+++ b/crates/syntax/test_data/parser/inline/err/0009_attr_on_expr_not_allowed.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast b/crates/syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
index fa14e1e6de5..fa14e1e6de5 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
+++ b/crates/syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rs b/crates/syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rs
index 30cc4913899..30cc4913899 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rs
+++ b/crates/syntax/test_data/parser/inline/err/0010_bad_tuple_index_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast b/crates/syntax/test_data/parser/inline/err/0013_static_underscore.rast
index 8d761b90741..8d761b90741 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rast
+++ b/crates/syntax/test_data/parser/inline/err/0013_static_underscore.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rs b/crates/syntax/test_data/parser/inline/err/0013_static_underscore.rs
index df8cecb4326..df8cecb4326 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0013_static_underscore.rs
+++ b/crates/syntax/test_data/parser/inline/err/0013_static_underscore.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast b/crates/syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
index a81c442c0d8..a81c442c0d8 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
+++ b/crates/syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rs b/crates/syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rs
index a4e5b2f6933..a4e5b2f6933 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rs
+++ b/crates/syntax/test_data/parser/inline/err/0014_record_literal_before_ellipsis_recovery.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast
index 2f59d0606c0..2f59d0606c0 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rast
+++ b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rs b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rs
index 7510664e102..7510664e102 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0015_empty_segment.rs
+++ b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast b/crates/syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
index c7289e4008a..c7289e4008a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0001_trait_item_list.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rs b/crates/syntax/test_data/parser/inline/ok/0001_trait_item_list.rs
index a5ec3239f8f..a5ec3239f8f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0001_trait_item_list.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0001_trait_item_list.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
index 1e80dd7e27f..1e80dd7e27f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rs b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rs
index 381cba1e29e..381cba1e29e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0002_use_tree_list.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
index 62da7b88734..62da7b88734 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rs b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rs
index 423bc105bd7..423bc105bd7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0003_where_pred_for.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0003_where_pred_for.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast b/crates/syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
index b650735ba1d..b650735ba1d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rs b/crates/syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rs
index 93636e926e1..93636e926e1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0004_value_parameters_no_patterns.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast b/crates/syntax/test_data/parser/inline/ok/0005_function_type_params.rast
index 8e0252ce743..8e0252ce743 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0005_function_type_params.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rs b/crates/syntax/test_data/parser/inline/ok/0005_function_type_params.rs
index 9df40ed396c..9df40ed396c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0005_function_type_params.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0005_function_type_params.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast
index d24ad74232e..d24ad74232e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rs b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rs
index 80c0a43f5de..80c0a43f5de 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0006_self_param.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0006_self_param.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
index e95688f56a5..e95688f56a5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rs b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rs
index 919bde0ee92..919bde0ee92 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0007_type_param_bounds.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0007_type_param_bounds.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/syntax/test_data/parser/inline/ok/0008_path_part.rast
index 7d2f7eab05b..7d2f7eab05b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0008_path_part.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rs b/crates/syntax/test_data/parser/inline/ok/0008_path_part.rs
index f6e32c7c149..f6e32c7c149 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0008_path_part.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast b/crates/syntax/test_data/parser/inline/ok/0009_loop_expr.rast
index f62826fd55d..f62826fd55d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0009_loop_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rs b/crates/syntax/test_data/parser/inline/ok/0009_loop_expr.rs
index 9f078fa4816..9f078fa4816 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0009_loop_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0009_loop_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rast b/crates/syntax/test_data/parser/inline/ok/0010_extern_block.rast
index 869875875e1..869875875e1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0010_extern_block.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rs b/crates/syntax/test_data/parser/inline/ok/0010_extern_block.rs
index 26a9ccd1e67..26a9ccd1e67 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0010_extern_block.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0010_extern_block.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast b/crates/syntax/test_data/parser/inline/ok/0011_field_expr.rast
index 66a609346ae..66a609346ae 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0011_field_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rs b/crates/syntax/test_data/parser/inline/ok/0011_field_expr.rs
index b8da2ddc309..b8da2ddc309 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0011_field_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0011_field_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast b/crates/syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
index 28c94bfd64f..28c94bfd64f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rs b/crates/syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rs
index a602d07f03b..a602d07f03b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0012_type_item_where_clause.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast b/crates/syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
index d33215b507c..d33215b507c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rs b/crates/syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rs
index 04b2bb9ba5c..04b2bb9ba5c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0013_pointer_type_mut.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast b/crates/syntax/test_data/parser/inline/ok/0014_never_type.rast
index b1d5106ce9a..b1d5106ce9a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0014_never_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rs b/crates/syntax/test_data/parser/inline/ok/0014_never_type.rs
index de399fcf4a2..de399fcf4a2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0014_never_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0014_never_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast
index 104e153ce69..104e153ce69 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rs b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rs
index 474cc3f0e0c..474cc3f0e0c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0015_continue_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0015_continue_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast b/crates/syntax/test_data/parser/inline/ok/0017_array_type.rast
index c131df1c951..c131df1c951 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0017_array_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rs b/crates/syntax/test_data/parser/inline/ok/0017_array_type.rs
index 27eb22f2238..27eb22f2238 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0017_array_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0017_array_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast b/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
index ddbd665888f..ddbd665888f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rs b/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rs
index 6a170d5ac1d..6a170d5ac1d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0018_arb_self_types.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0018_arb_self_types.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast b/crates/syntax/test_data/parser/inline/ok/0019_unary_expr.rast
index 7db38ea4da5..7db38ea4da5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0019_unary_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rs b/crates/syntax/test_data/parser/inline/ok/0019_unary_expr.rs
index f1c3f7118b2..f1c3f7118b2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0019_unary_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0019_unary_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast b/crates/syntax/test_data/parser/inline/ok/0020_use_star.rast
index b3623c4455d..b3623c4455d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0020_use_star.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rs b/crates/syntax/test_data/parser/inline/ok/0020_use_star.rs
index 6f15769a8c7..6f15769a8c7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0020_use_star.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0020_use_star.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast b/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
index ca0702aba59..ca0702aba59 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rs b/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rs
index f108514879d..f108514879d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0021_impl_item_list.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0021_impl_item_list.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
index 50742cbcf1f..50742cbcf1f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rs b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs
index faeefde94e2..faeefde94e2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0022_crate_visibility.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0022_crate_visibility.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast b/crates/syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
index e4fe2b948b0..e4fe2b948b0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0023_placeholder_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rs b/crates/syntax/test_data/parser/inline/ok/0023_placeholder_type.rs
index 7952dbd57d6..7952dbd57d6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0023_placeholder_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0023_placeholder_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast b/crates/syntax/test_data/parser/inline/ok/0024_slice_pat.rast
index 2dbce34b61e..2dbce34b61e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0024_slice_pat.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rs b/crates/syntax/test_data/parser/inline/ok/0024_slice_pat.rs
index 7955973b952..7955973b952 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0024_slice_pat.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0024_slice_pat.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast b/crates/syntax/test_data/parser/inline/ok/0025_slice_type.rast
index fd819ea370e..fd819ea370e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0025_slice_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rs b/crates/syntax/test_data/parser/inline/ok/0025_slice_type.rs
index 4da1af82705..4da1af82705 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0025_slice_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0025_slice_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast b/crates/syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
index 467a3013469..467a3013469 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rs b/crates/syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rs
index 0dfe6362967..0dfe6362967 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0026_tuple_pat_fields.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast b/crates/syntax/test_data/parser/inline/ok/0027_ref_pat.rast
index 348b54dc9d8..348b54dc9d8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0027_ref_pat.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rs b/crates/syntax/test_data/parser/inline/ok/0027_ref_pat.rs
index de41f5cae0f..de41f5cae0f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0027_ref_pat.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0027_ref_pat.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
index 32b2959bdfc..32b2959bdfc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rs b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rs
index 54c5a7c4604..54c5a7c4604 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0028_impl_trait_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0028_impl_trait_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast b/crates/syntax/test_data/parser/inline/ok/0029_cast_expr.rast
index e096b3a1f64..e096b3a1f64 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0029_cast_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rs b/crates/syntax/test_data/parser/inline/ok/0029_cast_expr.rs
index bfe8e4b362a..bfe8e4b362a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0029_cast_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0029_cast_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast b/crates/syntax/test_data/parser/inline/ok/0030_cond.rast
index 58a97d3ad89..58a97d3ad89 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0030_cond.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rs b/crates/syntax/test_data/parser/inline/ok/0030_cond.rs
index 2552a2621f9..2552a2621f9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0030_cond.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0030_cond.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast b/crates/syntax/test_data/parser/inline/ok/0031_while_expr.rast
index 173cecf6d9d..173cecf6d9d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0031_while_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rs b/crates/syntax/test_data/parser/inline/ok/0031_while_expr.rs
index 2f818816025..2f818816025 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0031_while_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0031_while_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast b/crates/syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
index dda6577eda8..dda6577eda8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rs b/crates/syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rs
index 9493da83d56..9493da83d56 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0032_fn_pointer_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast
index 974df9f9aa1..974df9f9aa1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rs b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rs
index 3ac0badabc5..3ac0badabc5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0033_reference_type;.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0033_reference_type;.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast
index f905def6ff0..f905def6ff0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rs b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rs
index 1b40946365f..1b40946365f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0034_break_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0034_break_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast b/crates/syntax/test_data/parser/inline/ok/0037_qual_paths.rast
index b6379e62f8c..b6379e62f8c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0037_qual_paths.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rs b/crates/syntax/test_data/parser/inline/ok/0037_qual_paths.rs
index d140692e210..d140692e210 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0037_qual_paths.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0037_qual_paths.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast b/crates/syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
index 64e705fb3d2..64e705fb3d2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0038_full_range_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rs b/crates/syntax/test_data/parser/inline/ok/0038_full_range_expr.rs
index ae21ad94cb3..ae21ad94cb3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0038_full_range_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0038_full_range_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
index 69e98b9d6c0..69e98b9d6c0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rs b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs
index 0d07d76514e..0d07d76514e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0039_type_arg.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0039_type_arg.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast b/crates/syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
index db5bd284969..db5bd284969 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rs b/crates/syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rs
index e2b5f2161df..e2b5f2161df 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast b/crates/syntax/test_data/parser/inline/ok/0041_trait_item.rast
index 3638462f8b2..3638462f8b2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0041_trait_item.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rs b/crates/syntax/test_data/parser/inline/ok/0041_trait_item.rs
index 32761dd03d0..32761dd03d0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0041_trait_item.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0041_trait_item.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast b/crates/syntax/test_data/parser/inline/ok/0042_call_expr.rast
index fa38e946673..fa38e946673 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0042_call_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rs b/crates/syntax/test_data/parser/inline/ok/0042_call_expr.rs
index ffbf46d6d1f..ffbf46d6d1f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0042_call_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0042_call_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast b/crates/syntax/test_data/parser/inline/ok/0043_use_alias.rast
index 60b517230e8..60b517230e8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0043_use_alias.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rs b/crates/syntax/test_data/parser/inline/ok/0043_use_alias.rs
index 9be50f87708..9be50f87708 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0043_use_alias.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0043_use_alias.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast b/crates/syntax/test_data/parser/inline/ok/0044_block_items.rast
index 1fd3cd0e783..1fd3cd0e783 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0044_block_items.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rs b/crates/syntax/test_data/parser/inline/ok/0044_block_items.rs
index d9868718c79..d9868718c79 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0044_block_items.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0044_block_items.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
index 6baea6e3ca2..6baea6e3ca2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rs b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rs
index 9b93442c0f2..9b93442c0f2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0045_param_list_opt_patterns.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast b/crates/syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
index e89284c1405..e89284c1405 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rs b/crates/syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rs
index cb66bad2470..cb66bad2470 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0046_singleton_tuple_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
index 4d8404e7c09..4d8404e7c09 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rs b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rs
index 4bb0f63b739..4bb0f63b739 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0048_path_type_with_bounds.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast b/crates/syntax/test_data/parser/inline/ok/0050_fn_decl.rast
index a5bf55131dd..a5bf55131dd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0050_fn_decl.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rs b/crates/syntax/test_data/parser/inline/ok/0050_fn_decl.rs
index c9f74f7f5c8..c9f74f7f5c8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0050_fn_decl.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0050_fn_decl.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast b/crates/syntax/test_data/parser/inline/ok/0051_unit_type.rast
index 6330dbf9e60..6330dbf9e60 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0051_unit_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rs b/crates/syntax/test_data/parser/inline/ok/0051_unit_type.rs
index c039cf7d324..c039cf7d324 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0051_unit_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0051_unit_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast
index 9bc36bea70a..9bc36bea70a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rs b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rs
index bf94f32e196..bf94f32e196 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0052_path_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast b/crates/syntax/test_data/parser/inline/ok/0053_path_expr.rast
index c34cfeb3155..c34cfeb3155 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0053_path_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rs b/crates/syntax/test_data/parser/inline/ok/0053_path_expr.rs
index 333ebabef48..333ebabef48 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0053_path_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0053_path_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
index 9ae271817e9..9ae271817e9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs b/crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs
index 4744d8ac065..4744d8ac065 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast b/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
index 68bb4385256..68bb4385256 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rs b/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rs
index 6dfd67b4ce9..6dfd67b4ce9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0055_literal_pattern.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0055_literal_pattern.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast
index 28129c50c61..28129c50c61 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rs b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rs
index 19d7e571b0c..19d7e571b0c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0056_where_clause.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0056_where_clause.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast b/crates/syntax/test_data/parser/inline/ok/0058_range_pat.rast
index 3e72f9671c3..3e72f9671c3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0058_range_pat.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rs b/crates/syntax/test_data/parser/inline/ok/0058_range_pat.rs
index c12ab6fcea2..c12ab6fcea2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0058_range_pat.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0058_range_pat.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast b/crates/syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
index 984829317e2..984829317e2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0059_match_arms_commas.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rs b/crates/syntax/test_data/parser/inline/ok/0059_match_arms_commas.rs
index 1f25d577a95..1f25d577a95 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0059_match_arms_commas.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0059_match_arms_commas.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast b/crates/syntax/test_data/parser/inline/ok/0060_extern_crate.rast
index 25e1777d1ab..25e1777d1ab 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0060_extern_crate.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rs b/crates/syntax/test_data/parser/inline/ok/0060_extern_crate.rs
index 49af74e1b74..49af74e1b74 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0060_extern_crate.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0060_extern_crate.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast b/crates/syntax/test_data/parser/inline/ok/0061_record_lit.rast
index a9ae1aa5953..a9ae1aa5953 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0061_record_lit.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rs b/crates/syntax/test_data/parser/inline/ok/0061_record_lit.rs
index 6285e554977..6285e554977 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0061_record_lit.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast
index de8217064f1..de8217064f1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rs b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rs
index 24a15c5c5c9..24a15c5c5c9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0062_mod_contents.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast b/crates/syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
index 4368930cc91..4368930cc91 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0063_impl_def_neg.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rs b/crates/syntax/test_data/parser/inline/ok/0063_impl_def_neg.rs
index b7527c8705a..b7527c8705a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0063_impl_def_neg.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0063_impl_def_neg.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/syntax/test_data/parser/inline/ok/0064_if_expr.rast
index 58716000344..58716000344 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0064_if_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rs b/crates/syntax/test_data/parser/inline/ok/0064_if_expr.rs
index 40f227ba3a4..40f227ba3a4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0064_if_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
index 3a7fcfe2487..3a7fcfe2487 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rs b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rs
index c3ecabb992b..c3ecabb992b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0065_dyn_trait_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast b/crates/syntax/test_data/parser/inline/ok/0066_match_arm.rast
index 57d0661a54d..57d0661a54d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0066_match_arm.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rs b/crates/syntax/test_data/parser/inline/ok/0066_match_arm.rs
index 9e009e24f4e..9e009e24f4e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0066_match_arm.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast
index 702f2e0b0aa..702f2e0b0aa 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rs b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rs
index 1bbb5930bf6..1bbb5930bf6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0067_crate_path.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast b/crates/syntax/test_data/parser/inline/ok/0068_union_items.rast
index 6589e479519..6589e479519 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0068_union_items.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rs b/crates/syntax/test_data/parser/inline/ok/0068_union_items.rs
index b7dd610d80a..b7dd610d80a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0068_union_items.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
index c4c5bc51e3e..c4c5bc51e3e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rs b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rs
index c0a3d634e57..c0a3d634e57 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast b/crates/syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
index 36c9cd5bb2b..36c9cd5bb2b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs b/crates/syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs
index 37b8437426d..37b8437426d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0070_stmt_bin_expr_ambiguity.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast b/crates/syntax/test_data/parser/inline/ok/0071_match_expr.rast
index d34d98ced0c..d34d98ced0c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0071_match_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rs b/crates/syntax/test_data/parser/inline/ok/0071_match_expr.rs
index c4021dc1048..c4021dc1048 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0071_match_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0071_match_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast b/crates/syntax/test_data/parser/inline/ok/0072_return_expr.rast
index 437d7ac0424..437d7ac0424 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0072_return_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rs b/crates/syntax/test_data/parser/inline/ok/0072_return_expr.rs
index 5733666b605..5733666b605 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0072_return_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0072_return_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast b/crates/syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
index 00cce69e6c7..00cce69e6c7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0073_type_item_type_params.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rs b/crates/syntax/test_data/parser/inline/ok/0073_type_item_type_params.rs
index defd110c492..defd110c492 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0073_type_item_type_params.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0073_type_item_type_params.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast b/crates/syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
index 3a789b9f510..3a789b9f510 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs b/crates/syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs
index 2edd578f9d7..2edd578f9d7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0074_stmt_postfix_expr_ambiguity.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast b/crates/syntax/test_data/parser/inline/ok/0075_block.rast
index e847ce9b268..e847ce9b268 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0075_block.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rs b/crates/syntax/test_data/parser/inline/ok/0075_block.rs
index 81f44c53307..81f44c53307 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0075_block.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast b/crates/syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
index 96217a7fdb4..96217a7fdb4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0076_function_where_clause.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rs b/crates/syntax/test_data/parser/inline/ok/0076_function_where_clause.rs
index f0920b2a8ad..f0920b2a8ad 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0076_function_where_clause.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0076_function_where_clause.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast b/crates/syntax/test_data/parser/inline/ok/0077_try_expr.rast
index 33e6fb93f7a..33e6fb93f7a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0077_try_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rs b/crates/syntax/test_data/parser/inline/ok/0077_try_expr.rs
index 8b74f7bc814..8b74f7bc814 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0077_try_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0077_try_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast b/crates/syntax/test_data/parser/inline/ok/0078_type_item.rast
index 2befc8388ec..2befc8388ec 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0078_type_item.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rs b/crates/syntax/test_data/parser/inline/ok/0078_type_item.rs
index 04c0344fa36..04c0344fa36 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0078_type_item.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0078_type_item.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast b/crates/syntax/test_data/parser/inline/ok/0079_impl_def.rast
index 209711fc496..209711fc496 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0079_impl_def.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rs b/crates/syntax/test_data/parser/inline/ok/0079_impl_def.rs
index d6337f6b3a7..d6337f6b3a7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0079_impl_def.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0079_impl_def.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast b/crates/syntax/test_data/parser/inline/ok/0080_postfix_range.rast
index b3003577cc0..b3003577cc0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0080_postfix_range.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rs b/crates/syntax/test_data/parser/inline/ok/0080_postfix_range.rs
index e7b7cfc6b1a..e7b7cfc6b1a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0080_postfix_range.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0080_postfix_range.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast
index f319d5141d5..f319d5141d5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rs b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rs
index 8ac7b9e1038..8ac7b9e1038 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0081_for_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0081_for_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast b/crates/syntax/test_data/parser/inline/ok/0082_ref_expr.rast
index 70b975c0b14..70b975c0b14 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0082_ref_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rs b/crates/syntax/test_data/parser/inline/ok/0082_ref_expr.rs
index c5262f4469b..c5262f4469b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0082_ref_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0082_ref_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast b/crates/syntax/test_data/parser/inline/ok/0083_struct_items.rast
index cdbc40fe0b2..cdbc40fe0b2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0083_struct_items.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rs b/crates/syntax/test_data/parser/inline/ok/0083_struct_items.rs
index 693e3f3ee12..693e3f3ee12 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0083_struct_items.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast b/crates/syntax/test_data/parser/inline/ok/0084_paren_type.rast
index ee889496686..ee889496686 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0084_paren_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rs b/crates/syntax/test_data/parser/inline/ok/0084_paren_type.rs
index 6e1b2510124..6e1b2510124 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0084_paren_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0084_paren_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast
index 9a87b5b936d..9a87b5b936d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rs b/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rs
index 2e11a5a6e68..2e11a5a6e68 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0085_expr_literals.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast b/crates/syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
index 70e05a859b1..70e05a859b1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0086_function_ret_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rs b/crates/syntax/test_data/parser/inline/ok/0086_function_ret_type.rs
index d22d8cada69..d22d8cada69 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0086_function_ret_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0086_function_ret_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast b/crates/syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
index f7b839303c3..f7b839303c3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0088_break_ambiguity.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rs b/crates/syntax/test_data/parser/inline/ok/0088_break_ambiguity.rs
index 560eb05b949..560eb05b949 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0088_break_ambiguity.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast b/crates/syntax/test_data/parser/inline/ok/0090_type_param_default.rast
index 2ef026e3709..2ef026e3709 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0090_type_param_default.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rs b/crates/syntax/test_data/parser/inline/ok/0090_type_param_default.rs
index 540eacb0277..540eacb0277 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0090_type_param_default.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0090_type_param_default.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast b/crates/syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
index f80326465fd..f80326465fd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs b/crates/syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs
index e3ba5e87f5d..e3ba5e87f5d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0092_fn_pointer_type_with_ret.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast b/crates/syntax/test_data/parser/inline/ok/0093_index_expr.rast
index 82f03f9c18b..82f03f9c18b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0093_index_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rs b/crates/syntax/test_data/parser/inline/ok/0093_index_expr.rs
index b9ba78a6cbd..b9ba78a6cbd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0093_index_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0093_index_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast b/crates/syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
index c1fdc6e259c..c1fdc6e259c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0095_placeholder_pat.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rs b/crates/syntax/test_data/parser/inline/ok/0095_placeholder_pat.rs
index 4d719c4335b..4d719c4335b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0095_placeholder_pat.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0095_placeholder_pat.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast b/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
index e757249f06d..e757249f06d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rs b/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rs
index 4919665cb57..4919665cb57 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0096_no_semi_after_block.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast b/crates/syntax/test_data/parser/inline/ok/0099_param_list.rast
index f19e9fd5229..f19e9fd5229 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0099_param_list.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rs b/crates/syntax/test_data/parser/inline/ok/0099_param_list.rs
index 9d55bedbba7..9d55bedbba7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0099_param_list.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0099_param_list.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast b/crates/syntax/test_data/parser/inline/ok/0100_for_expr.rast
index 5c4055e44b0..5c4055e44b0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0100_for_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rs b/crates/syntax/test_data/parser/inline/ok/0100_for_expr.rs
index 972197d2a17..972197d2a17 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0100_for_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0100_for_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
index 866e60ed8a1..866e60ed8a1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs b/crates/syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs
index da3412fa8a9..da3412fa8a9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast b/crates/syntax/test_data/parser/inline/ok/0103_array_expr.rast
index c4c0a0568a4..c4c0a0568a4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0103_array_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rs b/crates/syntax/test_data/parser/inline/ok/0103_array_expr.rs
index 4dc1999d140..4dc1999d140 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0103_array_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0103_array_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast b/crates/syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
index 1244a503134..1244a503134 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rs b/crates/syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rs
index 17ed20e5b13..17ed20e5b13 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0104_path_fn_trait_args.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast b/crates/syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
index 9b8381619a2..9b8381619a2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0106_lambda_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rs b/crates/syntax/test_data/parser/inline/ok/0106_lambda_expr.rs
index 0757178239d..0757178239d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0106_lambda_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0106_lambda_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast b/crates/syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
index be8365e0571..be8365e0571 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0107_method_call_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rs b/crates/syntax/test_data/parser/inline/ok/0107_method_call_expr.rs
index 1a3aa35ae8e..1a3aa35ae8e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0107_method_call_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0107_method_call_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast b/crates/syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
index ca7e4a5c361..ca7e4a5c361 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0108_tuple_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rs b/crates/syntax/test_data/parser/inline/ok/0108_tuple_expr.rs
index e4f774280ca..e4f774280ca 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0108_tuple_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0108_tuple_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast b/crates/syntax/test_data/parser/inline/ok/0109_label.rast
index c9588025ce5..c9588025ce5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0109_label.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rs b/crates/syntax/test_data/parser/inline/ok/0109_label.rs
index 48e83f263b9..48e83f263b9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0109_label.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0109_label.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast b/crates/syntax/test_data/parser/inline/ok/0110_use_path.rast
index 82028096f83..82028096f83 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0110_use_path.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rs b/crates/syntax/test_data/parser/inline/ok/0110_use_path.rs
index 328e9473602..328e9473602 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0110_use_path.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0110_use_path.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast b/crates/syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
index b82ed0230b1..b82ed0230b1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0111_tuple_pat.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rs b/crates/syntax/test_data/parser/inline/ok/0111_tuple_pat.rs
index ba719879d4c..ba719879d4c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0111_tuple_pat.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0111_tuple_pat.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast b/crates/syntax/test_data/parser/inline/ok/0112_bind_pat.rast
index 7b9a498c8ee..7b9a498c8ee 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0112_bind_pat.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rs b/crates/syntax/test_data/parser/inline/ok/0112_bind_pat.rs
index 820a9e72ce5..820a9e72ce5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0112_bind_pat.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast b/crates/syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
index d761c1c68e1..d761c1c68e1 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0113_nocontentexpr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rs b/crates/syntax/test_data/parser/inline/ok/0113_nocontentexpr.rs
index bbf09e367cf..bbf09e367cf 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0113_nocontentexpr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0113_nocontentexpr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast b/crates/syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
index 0e1594dc485..0e1594dc485 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rs b/crates/syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rs
index ddd59016dc6..ddd59016dc6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0114_tuple_struct_where.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
index 4d09c9f50f3..4d09c9f50f3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs b/crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs
index 635b9ac21af..635b9ac21af 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
index f3d4ad72c32..f3d4ad72c32 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rs b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rs
index edb470c8999..edb470c8999 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0117_macro_call_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast b/crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
index 141a7b2035f..141a7b2035f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rs b/crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rs
index 4d68cceb710..4d68cceb710 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0118_impl_inner_attributes.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast b/crates/syntax/test_data/parser/inline/ok/0118_match_guard.rast
index 0cf4eb0a5aa..0cf4eb0a5aa 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0118_match_guard.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rs b/crates/syntax/test_data/parser/inline/ok/0118_match_guard.rs
index f1bd72fc4cb..f1bd72fc4cb 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0118_match_guard.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0118_match_guard.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast b/crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
index ec7a00f1db8..ec7a00f1db8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rs b/crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rs
index 54a67c9d7b7..54a67c9d7b7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0120_match_arms_inner_attribute.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast b/crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
index 97924da0526..97924da0526 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rs b/crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rs
index 676db42d1a7..676db42d1a7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
index 570b9520526..570b9520526 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs
index e8fdf741fb9..e8fdf741fb9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0122_generic_lifetime_type_attribute.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast b/crates/syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
index 7cdec663473..7cdec663473 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0123_param_list_vararg.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rs b/crates/syntax/test_data/parser/inline/ok/0123_param_list_vararg.rs
index c59addaf420..c59addaf420 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0123_param_list_vararg.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0123_param_list_vararg.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
index aa4d7a784f4..aa4d7a784f4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rs b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rs
index 0f454d121d6..0f454d121d6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast b/crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
index 54ea2c7c669..54ea2c7c669 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs b/crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs
index a6c7760c767..a6c7760c767 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast b/crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
index 0342e64f396..0342e64f396 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rs b/crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rs
index b28c078f935..b28c078f935 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast b/crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
index 3b46e5b479d..3b46e5b479d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs b/crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs
index 9c5c8eb3615..9c5c8eb3615 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0127_attr_on_last_expr_in_block.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast b/crates/syntax/test_data/parser/inline/ok/0129_marco_pat.rast
index e283966ca23..e283966ca23 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0129_marco_pat.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rs b/crates/syntax/test_data/parser/inline/ok/0129_marco_pat.rs
index 811181d9ba8..811181d9ba8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0129_marco_pat.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0129_marco_pat.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast b/crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rast
index 4c07cefa6d7..4c07cefa6d7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs b/crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rs
index fa8ee49a231..fa8ee49a231 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_let_stmt.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0130_let_stmt.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast b/crates/syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
index ffdffe2f801..ffdffe2f801 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0130_try_block_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rs b/crates/syntax/test_data/parser/inline/ok/0130_try_block_expr.rs
index 0f1b41eb64b..0f1b41eb64b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0130_try_block_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0130_try_block_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast b/crates/syntax/test_data/parser/inline/ok/0131_existential_type.rast
index d47071a911a..d47071a911a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0131_existential_type.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rs b/crates/syntax/test_data/parser/inline/ok/0131_existential_type.rs
index 23baf7145cc..23baf7145cc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0131_existential_type.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0131_existential_type.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast b/crates/syntax/test_data/parser/inline/ok/0132_box_expr.rast
index c5503824729..c5503824729 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0132_box_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rs b/crates/syntax/test_data/parser/inline/ok/0132_box_expr.rs
index fc9923b7137..fc9923b7137 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0132_box_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0132_box_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast b/crates/syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
index 429a0506e1a..429a0506e1a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rs b/crates/syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rs
index eadc7fffb13..eadc7fffb13 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast b/crates/syntax/test_data/parser/inline/ok/0137_await_expr.rast
index 923effe3831..923effe3831 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0137_await_expr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rs b/crates/syntax/test_data/parser/inline/ok/0137_await_expr.rs
index d2ba89ca607..d2ba89ca607 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0137_await_expr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0137_await_expr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast b/crates/syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
index 3870ec1353d..3870ec1353d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rs b/crates/syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rs
index eb21a657b90..eb21a657b90 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast b/crates/syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
index f7c0e0ab0b7..f7c0e0ab0b7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0138_expression_after_block.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rs b/crates/syntax/test_data/parser/inline/ok/0138_expression_after_block.rs
index 76007e3ee77..76007e3ee77 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0138_expression_after_block.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
index 6403ff8d5c7..6403ff8d5c7 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rs b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rs
index 35155057a68..35155057a68 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast b/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
index 495e4c51b58..495e4c51b58 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rs b/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rs
index c238be791bd..c238be791bd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0139_param_outer_arg.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0139_param_outer_arg.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast b/crates/syntax/test_data/parser/inline/ok/0142_for_range_from.rast
index 36e448c94ee..36e448c94ee 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0142_for_range_from.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rs b/crates/syntax/test_data/parser/inline/ok/0142_for_range_from.rs
index af0d40a7aa2..af0d40a7aa2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0142_for_range_from.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0142_for_range_from.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/syntax/test_data/parser/inline/ok/0143_box_pat.rast
index 65887b96216..65887b96216 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0143_box_pat.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rs b/crates/syntax/test_data/parser/inline/ok/0143_box_pat.rs
index 9d458aa1e6b..9d458aa1e6b 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0143_box_pat.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast b/crates/syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
index 8a5bde0b6af..8a5bde0b6af 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rs b/crates/syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rs
index 3262f27e140..3262f27e140 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0144_dot_dot_pat.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast b/crates/syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
index 925409bdfe3..925409bdfe3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0145_record_field_pat.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rs b/crates/syntax/test_data/parser/inline/ok/0145_record_field_pat.rs
index 26b1d5f8952..26b1d5f8952 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0145_record_field_pat.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast b/crates/syntax/test_data/parser/inline/ok/0146_as_precedence.rast
index a36cc8dab36..a36cc8dab36 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0146_as_precedence.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rs b/crates/syntax/test_data/parser/inline/ok/0146_as_precedence.rs
index a06dec1faf3..a06dec1faf3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0146_as_precedence.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0146_as_precedence.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast b/crates/syntax/test_data/parser/inline/ok/0147_const_param.rast
index 9312eab65e4..9312eab65e4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0147_const_param.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rs b/crates/syntax/test_data/parser/inline/ok/0147_const_param.rs
index 8cdb3b70367..8cdb3b70367 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0147_const_param.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0147_const_param.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rast b/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rast
index 6655aeab139..6655aeab139 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rs b/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rs
index 319a4e2aad2..319a4e2aad2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0147_macro_def.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast b/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast
index 1c527f60b9c..1c527f60b9c 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs b/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs
index 3b2be597fd8..3b2be597fd8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0148_pub_macro_def.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rast
index f284aafcdfd..f284aafcdfd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rs b/crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rs
index 2ac310924fd..2ac310924fd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_array_attrs.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0150_array_attrs.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast b/crates/syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
index 12194abdafe..12194abdafe 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0150_impl_type_params.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rs b/crates/syntax/test_data/parser/inline/ok/0150_impl_type_params.rs
index cb0a105c29f..cb0a105c29f 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0150_impl_type_params.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0150_impl_type_params.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_fn.rast b/crates/syntax/test_data/parser/inline/ok/0151_fn.rast
index 23c4269b306..23c4269b306 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0151_fn.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0151_fn.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_fn.rs b/crates/syntax/test_data/parser/inline/ok/0151_fn.rs
index 8f3b7ef112a..8f3b7ef112a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0151_fn.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0151_fn.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast b/crates/syntax/test_data/parser/inline/ok/0151_trait_alias.rast
index dac50410e42..dac50410e42 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0151_trait_alias.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rs b/crates/syntax/test_data/parser/inline/ok/0151_trait_alias.rs
index 4bd428ee469..4bd428ee469 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0151_trait_alias.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0151_trait_alias.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast b/crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
index 2905c5f1a5d..2905c5f1a5d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rs b/crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rs
index 5daf1d7b0be..5daf1d7b0be 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0152_arg_with_attr.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0152_arg_with_attr.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_impl.rast b/crates/syntax/test_data/parser/inline/ok/0152_impl.rast
index 7968cf9ffa0..7968cf9ffa0 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0152_impl.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0152_impl.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0152_impl.rs b/crates/syntax/test_data/parser/inline/ok/0152_impl.rs
index a1a550d8a60..a1a550d8a60 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0152_impl.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0152_impl.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0153_trait.rast b/crates/syntax/test_data/parser/inline/ok/0153_trait.rast
index 9881e5048c8..9881e5048c8 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0153_trait.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0153_trait.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0153_trait.rs b/crates/syntax/test_data/parser/inline/ok/0153_trait.rs
index 8d183dbb5d3..8d183dbb5d3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0153_trait.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0153_trait.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast b/crates/syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
index e6aff7b3735..e6aff7b3735 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rs b/crates/syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rs
index 80a1701fd66..80a1701fd66 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0154_fn_pointer_param_ident_path.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast b/crates/syntax/test_data/parser/inline/ok/0155_closure_params.rast
index 31671b42018..31671b42018 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0155_closure_params.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rs b/crates/syntax/test_data/parser/inline/ok/0155_closure_params.rs
index 6ca8dd2d6a9..6ca8dd2d6a9 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0155_closure_params.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0155_closure_params.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast b/crates/syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
index 508b4aca7d2..508b4aca7d2 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0156_fn_def_param.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rs b/crates/syntax/test_data/parser/inline/ok/0156_fn_def_param.rs
index 7b277c16b15..7b277c16b15 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_fn_def_param.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0156_fn_def_param.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast b/crates/syntax/test_data/parser/inline/ok/0156_or_pattern.rast
index 88a513cee26..88a513cee26 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0156_or_pattern.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rs b/crates/syntax/test_data/parser/inline/ok/0156_or_pattern.rs
index a2631660550..a2631660550 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0156_or_pattern.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0156_or_pattern.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast b/crates/syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
index 6abb4fe5ac4..6abb4fe5ac4 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rs b/crates/syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rs
index 1ebbe5b0355..1ebbe5b0355 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0157_fn_pointer_unnamed_arg.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast b/crates/syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
index a2e05eb2e2a..a2e05eb2e2a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0157_variant_discriminant.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rs b/crates/syntax/test_data/parser/inline/ok/0157_variant_discriminant.rs
index c8c5c0f174e..c8c5c0f174e 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0157_variant_discriminant.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0157_variant_discriminant.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast b/crates/syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
index 8ae24b9c101..8ae24b9c101 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rs b/crates/syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rs
index 05acc30f126..05acc30f126 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0158_binop_resets_statementness.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast b/crates/syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
index aa4099a9293..aa4099a9293 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rs b/crates/syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rs
index 061118d3aab..061118d3aab 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0158_lambda_ret_block.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast b/crates/syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast
index fb46d4ce401..fb46d4ce401 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rs b/crates/syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rs
index 61a6b46a0b3..61a6b46a0b3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0159_try_macro_fallback.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast b/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast
index 05b89d1c369..05b89d1c369 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rs b/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rs
index 2e2ab6e60b6..2e2ab6e60b6 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0160_try_macro_rules.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0160_try_macro_rules.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast
index 9e9a5f9c5b5..9e9a5f9c5b5 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rs
index 18b4ff4b1ba..18b4ff4b1ba 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0161_labeled_block.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0161_labeled_block.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast b/crates/syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
index ca9a1183d6a..ca9a1183d6a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0162_unsafe_block.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs b/crates/syntax/test_data/parser/inline/ok/0162_unsafe_block.rs
index dfb9b2a1c18..dfb9b2a1c18 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0162_unsafe_block.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0162_unsafe_block.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rast b/crates/syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rast
index f2e2014605a..f2e2014605a 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rs b/crates/syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rs
index 96340f84ab3..96340f84ab3 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0163_default_unsafe_item.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0164_default_item.rast b/crates/syntax/test_data/parser/inline/ok/0164_default_item.rast
index 9282772f34d..9282772f34d 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0164_default_item.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0164_default_item.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0164_default_item.rs b/crates/syntax/test_data/parser/inline/ok/0164_default_item.rs
index a6836cbd577..a6836cbd577 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0164_default_item.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0164_default_item.rs
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast b/crates/syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast
index f8910677b46..f8910677b46 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rast
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rs b/crates/syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rs
index ebe26834d88..ebe26834d88 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rs
+++ b/crates/syntax/test_data/parser/inline/ok/0164_type_path_in_pattern.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0000_empty.rast b/crates/syntax/test_data/parser/ok/0000_empty.rast
index 6b234b0b241..6b234b0b241 100644
--- a/crates/ra_syntax/test_data/parser/ok/0000_empty.rast
+++ b/crates/syntax/test_data/parser/ok/0000_empty.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0000_empty.rs b/crates/syntax/test_data/parser/ok/0000_empty.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0000_empty.rs
+++ b/crates/syntax/test_data/parser/ok/0000_empty.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast b/crates/syntax/test_data/parser/ok/0001_struct_item.rast
index a171fe7a86d..a171fe7a86d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rast
+++ b/crates/syntax/test_data/parser/ok/0001_struct_item.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rs b/crates/syntax/test_data/parser/ok/0001_struct_item.rs
index 512aeb3e7a0..512aeb3e7a0 100644
--- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.rs
+++ b/crates/syntax/test_data/parser/ok/0001_struct_item.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast b/crates/syntax/test_data/parser/ok/0002_struct_item_field.rast
index 362892b91f1..362892b91f1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rast
+++ b/crates/syntax/test_data/parser/ok/0002_struct_item_field.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rs b/crates/syntax/test_data/parser/ok/0002_struct_item_field.rs
index cc3866d2511..cc3866d2511 100644
--- a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.rs
+++ b/crates/syntax/test_data/parser/ok/0002_struct_item_field.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0004_file_shebang.rast b/crates/syntax/test_data/parser/ok/0004_file_shebang.rast
index 67e21df13a1..67e21df13a1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0004_file_shebang.rast
+++ b/crates/syntax/test_data/parser/ok/0004_file_shebang.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0004_file_shebang.rs b/crates/syntax/test_data/parser/ok/0004_file_shebang.rs
index 53dc9e61733..53dc9e61733 100644
--- a/crates/ra_syntax/test_data/parser/ok/0004_file_shebang.rs
+++ b/crates/syntax/test_data/parser/ok/0004_file_shebang.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast b/crates/syntax/test_data/parser/ok/0005_fn_item.rast
index a7a2b11a723..a7a2b11a723 100644
--- a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rast
+++ b/crates/syntax/test_data/parser/ok/0005_fn_item.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rs b/crates/syntax/test_data/parser/ok/0005_fn_item.rs
index 03210551cb1..03210551cb1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0005_fn_item.rs
+++ b/crates/syntax/test_data/parser/ok/0005_fn_item.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rast b/crates/syntax/test_data/parser/ok/0006_inner_attributes.rast
index 42587243a96..42587243a96 100644
--- a/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rast
+++ b/crates/syntax/test_data/parser/ok/0006_inner_attributes.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rs b/crates/syntax/test_data/parser/ok/0006_inner_attributes.rs
index e81f8b1e84f..e81f8b1e84f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0006_inner_attributes.rs
+++ b/crates/syntax/test_data/parser/ok/0006_inner_attributes.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast b/crates/syntax/test_data/parser/ok/0007_extern_crate.rast
index 594c2f8f20a..594c2f8f20a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rast
+++ b/crates/syntax/test_data/parser/ok/0007_extern_crate.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rs b/crates/syntax/test_data/parser/ok/0007_extern_crate.rs
index ab81a608cb5..ab81a608cb5 100644
--- a/crates/ra_syntax/test_data/parser/ok/0007_extern_crate.rs
+++ b/crates/syntax/test_data/parser/ok/0007_extern_crate.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast b/crates/syntax/test_data/parser/ok/0008_mod_item.rast
index b2c1d791f14..b2c1d791f14 100644
--- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rast
+++ b/crates/syntax/test_data/parser/ok/0008_mod_item.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rs b/crates/syntax/test_data/parser/ok/0008_mod_item.rs
index d22993bc150..d22993bc150 100644
--- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.rs
+++ b/crates/syntax/test_data/parser/ok/0008_mod_item.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast b/crates/syntax/test_data/parser/ok/0009_use_item.rast
index 6be1cf9fc83..6be1cf9fc83 100644
--- a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rast
+++ b/crates/syntax/test_data/parser/ok/0009_use_item.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rs b/crates/syntax/test_data/parser/ok/0009_use_item.rs
index 05a6aff83fc..05a6aff83fc 100644
--- a/crates/ra_syntax/test_data/parser/ok/0009_use_item.rs
+++ b/crates/syntax/test_data/parser/ok/0009_use_item.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast b/crates/syntax/test_data/parser/ok/0010_use_path_segments.rast
index 4d49e793374..4d49e793374 100644
--- a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rast
+++ b/crates/syntax/test_data/parser/ok/0010_use_path_segments.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rs b/crates/syntax/test_data/parser/ok/0010_use_path_segments.rs
index 1e71b7a6c5d..1e71b7a6c5d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0010_use_path_segments.rs
+++ b/crates/syntax/test_data/parser/ok/0010_use_path_segments.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast b/crates/syntax/test_data/parser/ok/0011_outer_attribute.rast
index 478fdba758a..478fdba758a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rast
+++ b/crates/syntax/test_data/parser/ok/0011_outer_attribute.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rs b/crates/syntax/test_data/parser/ok/0011_outer_attribute.rs
index 3d2e01d5c6f..3d2e01d5c6f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0011_outer_attribute.rs
+++ b/crates/syntax/test_data/parser/ok/0011_outer_attribute.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast b/crates/syntax/test_data/parser/ok/0012_visibility.rast
index 83a93b5a9e5..83a93b5a9e5 100644
--- a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rast
+++ b/crates/syntax/test_data/parser/ok/0012_visibility.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rs b/crates/syntax/test_data/parser/ok/0012_visibility.rs
index 75b1db12134..75b1db12134 100644
--- a/crates/ra_syntax/test_data/parser/ok/0012_visibility.rs
+++ b/crates/syntax/test_data/parser/ok/0012_visibility.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast
index 66ab1366095..66ab1366095 100644
--- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
+++ b/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs b/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rs
index 9d9eb99175b..9d9eb99175b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs
+++ b/crates/syntax/test_data/parser/ok/0013_use_path_self_super.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast b/crates/syntax/test_data/parser/ok/0014_use_tree.rast
index 4389d2d4bce..4389d2d4bce 100644
--- a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rast
+++ b/crates/syntax/test_data/parser/ok/0014_use_tree.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rs b/crates/syntax/test_data/parser/ok/0014_use_tree.rs
index 5e4aa3a3321..5e4aa3a3321 100644
--- a/crates/ra_syntax/test_data/parser/ok/0014_use_tree.rs
+++ b/crates/syntax/test_data/parser/ok/0014_use_tree.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast b/crates/syntax/test_data/parser/ok/0015_use_tree.rast
index d7e93f7eb75..d7e93f7eb75 100644
--- a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rast
+++ b/crates/syntax/test_data/parser/ok/0015_use_tree.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rs b/crates/syntax/test_data/parser/ok/0015_use_tree.rs
index 46a0783a2bd..46a0783a2bd 100644
--- a/crates/ra_syntax/test_data/parser/ok/0015_use_tree.rs
+++ b/crates/syntax/test_data/parser/ok/0015_use_tree.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast b/crates/syntax/test_data/parser/ok/0016_struct_flavors.rast
index b15f41dd7e9..b15f41dd7e9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rast
+++ b/crates/syntax/test_data/parser/ok/0016_struct_flavors.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rs b/crates/syntax/test_data/parser/ok/0016_struct_flavors.rs
index 69638350c46..69638350c46 100644
--- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.rs
+++ b/crates/syntax/test_data/parser/ok/0016_struct_flavors.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast b/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
index a3e091ad369..a3e091ad369 100644
--- a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
+++ b/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rs b/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rs
index fe0a7bb97e3..fe0a7bb97e3 100644
--- a/crates/ra_syntax/test_data/parser/ok/0017_attr_trailing_comma.rs
+++ b/crates/syntax/test_data/parser/ok/0017_attr_trailing_comma.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast b/crates/syntax/test_data/parser/ok/0018_struct_type_params.rast
index 630aa0708bb..630aa0708bb 100644
--- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rast
+++ b/crates/syntax/test_data/parser/ok/0018_struct_type_params.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rs b/crates/syntax/test_data/parser/ok/0018_struct_type_params.rs
index 88c544923b5..88c544923b5 100644
--- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.rs
+++ b/crates/syntax/test_data/parser/ok/0018_struct_type_params.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast b/crates/syntax/test_data/parser/ok/0019_enums.rast
index c3df008146d..c3df008146d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rast
+++ b/crates/syntax/test_data/parser/ok/0019_enums.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.rs b/crates/syntax/test_data/parser/ok/0019_enums.rs
index 7a1afa0e62f..7a1afa0e62f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0019_enums.rs
+++ b/crates/syntax/test_data/parser/ok/0019_enums.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast
index 9bdc50e1e79..9bdc50e1e79 100644
--- a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rast
+++ b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rs b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rs
index 7128989789a..7128989789a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0020_type_param_bounds.rs
+++ b/crates/syntax/test_data/parser/ok/0020_type_param_bounds.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.rast b/crates/syntax/test_data/parser/ok/0022_empty_extern_block.rast
index 26abae3b29d..26abae3b29d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.rast
+++ b/crates/syntax/test_data/parser/ok/0022_empty_extern_block.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.rs b/crates/syntax/test_data/parser/ok/0022_empty_extern_block.rs
index f5fe0e6ef30..f5fe0e6ef30 100644
--- a/crates/ra_syntax/test_data/parser/ok/0022_empty_extern_block.rs
+++ b/crates/syntax/test_data/parser/ok/0022_empty_extern_block.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast b/crates/syntax/test_data/parser/ok/0023_static_items.rast
index 9374cf5e965..9374cf5e965 100644
--- a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rast
+++ b/crates/syntax/test_data/parser/ok/0023_static_items.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rs b/crates/syntax/test_data/parser/ok/0023_static_items.rs
index 5fb92ce33f0..5fb92ce33f0 100644
--- a/crates/ra_syntax/test_data/parser/ok/0023_static_items.rs
+++ b/crates/syntax/test_data/parser/ok/0023_static_items.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast b/crates/syntax/test_data/parser/ok/0024_const_item.rast
index dd1b9c9a0a4..dd1b9c9a0a4 100644
--- a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rast
+++ b/crates/syntax/test_data/parser/ok/0024_const_item.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rs b/crates/syntax/test_data/parser/ok/0024_const_item.rs
index a806a209dc1..a806a209dc1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0024_const_item.rs
+++ b/crates/syntax/test_data/parser/ok/0024_const_item.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast b/crates/syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
index bb6527b484a..bb6527b484a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
+++ b/crates/syntax/test_data/parser/ok/0025_extern_fn_in_block.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rs b/crates/syntax/test_data/parser/ok/0025_extern_fn_in_block.rs
index 289809809a6..289809809a6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0025_extern_fn_in_block.rs
+++ b/crates/syntax/test_data/parser/ok/0025_extern_fn_in_block.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast b/crates/syntax/test_data/parser/ok/0026_const_fn_in_block.rast
index 5bcf54deb69..5bcf54deb69 100644
--- a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rast
+++ b/crates/syntax/test_data/parser/ok/0026_const_fn_in_block.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rs b/crates/syntax/test_data/parser/ok/0026_const_fn_in_block.rs
index 7641a3d28e6..7641a3d28e6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0026_const_fn_in_block.rs
+++ b/crates/syntax/test_data/parser/ok/0026_const_fn_in_block.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast b/crates/syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
index a7cc122951f..a7cc122951f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
+++ b/crates/syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rs b/crates/syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rs
index f3c5ff93863..f3c5ff93863 100644
--- a/crates/ra_syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rs
+++ b/crates/syntax/test_data/parser/ok/0027_unsafe_fn_in_block.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast b/crates/syntax/test_data/parser/ok/0028_operator_binding_power.rast
index 3271a4695d2..3271a4695d2 100644
--- a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rast
+++ b/crates/syntax/test_data/parser/ok/0028_operator_binding_power.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rs b/crates/syntax/test_data/parser/ok/0028_operator_binding_power.rs
index cc9598470d8..cc9598470d8 100644
--- a/crates/ra_syntax/test_data/parser/ok/0028_operator_binding_power.rs
+++ b/crates/syntax/test_data/parser/ok/0028_operator_binding_power.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast b/crates/syntax/test_data/parser/ok/0029_range_forms.rast
index a732f11c430..a732f11c430 100644
--- a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rast
+++ b/crates/syntax/test_data/parser/ok/0029_range_forms.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rs b/crates/syntax/test_data/parser/ok/0029_range_forms.rs
index f9ff444d400..f9ff444d400 100644
--- a/crates/ra_syntax/test_data/parser/ok/0029_range_forms.rs
+++ b/crates/syntax/test_data/parser/ok/0029_range_forms.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast b/crates/syntax/test_data/parser/ok/0030_string_suffixes.rast
index 80f7f5942c0..80f7f5942c0 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rast
+++ b/crates/syntax/test_data/parser/ok/0030_string_suffixes.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rs b/crates/syntax/test_data/parser/ok/0030_string_suffixes.rs
index 261aad1fb6b..261aad1fb6b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_string_suffixes.rs
+++ b/crates/syntax/test_data/parser/ok/0030_string_suffixes.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast b/crates/syntax/test_data/parser/ok/0030_traits.rast
index d07c6683a3d..d07c6683a3d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rast
+++ b/crates/syntax/test_data/parser/ok/0030_traits.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0030_traits.rs b/crates/syntax/test_data/parser/ok/0030_traits.rs
index ac30843eff6..ac30843eff6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0030_traits.rs
+++ b/crates/syntax/test_data/parser/ok/0030_traits.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast b/crates/syntax/test_data/parser/ok/0031_extern.rast
index 8150d445f37..8150d445f37 100644
--- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rast
+++ b/crates/syntax/test_data/parser/ok/0031_extern.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0031_extern.rs b/crates/syntax/test_data/parser/ok/0031_extern.rs
index b33ac273ca6..b33ac273ca6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0031_extern.rs
+++ b/crates/syntax/test_data/parser/ok/0031_extern.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast b/crates/syntax/test_data/parser/ok/0032_where_for.rast
index d59548f2107..d59548f2107 100644
--- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rast
+++ b/crates/syntax/test_data/parser/ok/0032_where_for.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rs b/crates/syntax/test_data/parser/ok/0032_where_for.rs
index 588170fbef5..588170fbef5 100644
--- a/crates/ra_syntax/test_data/parser/ok/0032_where_for.rs
+++ b/crates/syntax/test_data/parser/ok/0032_where_for.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast b/crates/syntax/test_data/parser/ok/0033_label_break.rast
index 88800ca7a3f..88800ca7a3f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rast
+++ b/crates/syntax/test_data/parser/ok/0033_label_break.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rs b/crates/syntax/test_data/parser/ok/0033_label_break.rs
index 728d78137c9..728d78137c9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0033_label_break.rs
+++ b/crates/syntax/test_data/parser/ok/0033_label_break.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast b/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast
index 5ad8c570d26..5ad8c570d26 100644
--- a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rast
+++ b/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rs b/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rs
index f1ed30220ae..f1ed30220ae 100644
--- a/crates/ra_syntax/test_data/parser/ok/0034_crate_path_in_call.rs
+++ b/crates/syntax/test_data/parser/ok/0034_crate_path_in_call.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast
index 7c61b5006de..7c61b5006de 100644
--- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rast
+++ b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rs b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rs
index 8c13231631c..8c13231631c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.rs
+++ b/crates/syntax/test_data/parser/ok/0035_weird_exprs.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast b/crates/syntax/test_data/parser/ok/0036_fully_qualified.rast
index c4da317b9f9..c4da317b9f9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rast
+++ b/crates/syntax/test_data/parser/ok/0036_fully_qualified.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rs b/crates/syntax/test_data/parser/ok/0036_fully_qualified.rs
index 6da27933ece..6da27933ece 100644
--- a/crates/ra_syntax/test_data/parser/ok/0036_fully_qualified.rs
+++ b/crates/syntax/test_data/parser/ok/0036_fully_qualified.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0037_mod.rast b/crates/syntax/test_data/parser/ok/0037_mod.rast
index 1d5d94bdea8..1d5d94bdea8 100644
--- a/crates/ra_syntax/test_data/parser/ok/0037_mod.rast
+++ b/crates/syntax/test_data/parser/ok/0037_mod.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0037_mod.rs b/crates/syntax/test_data/parser/ok/0037_mod.rs
index 7e5a1b8358c..7e5a1b8358c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0037_mod.rs
+++ b/crates/syntax/test_data/parser/ok/0037_mod.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast b/crates/syntax/test_data/parser/ok/0038_where_pred_type.rast
index 22168eaf1ac..22168eaf1ac 100644
--- a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rast
+++ b/crates/syntax/test_data/parser/ok/0038_where_pred_type.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rs b/crates/syntax/test_data/parser/ok/0038_where_pred_type.rs
index 8bfc341a50a..8bfc341a50a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0038_where_pred_type.rs
+++ b/crates/syntax/test_data/parser/ok/0038_where_pred_type.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast b/crates/syntax/test_data/parser/ok/0039_raw_fn_item.rast
index 68a366354e6..68a366354e6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rast
+++ b/crates/syntax/test_data/parser/ok/0039_raw_fn_item.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rs b/crates/syntax/test_data/parser/ok/0039_raw_fn_item.rs
index 8380d1e79bc..8380d1e79bc 100644
--- a/crates/ra_syntax/test_data/parser/ok/0039_raw_fn_item.rs
+++ b/crates/syntax/test_data/parser/ok/0039_raw_fn_item.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast b/crates/syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
index 8cfc14f491c..8cfc14f491c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
+++ b/crates/syntax/test_data/parser/ok/0040_raw_struct_item_field.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rs b/crates/syntax/test_data/parser/ok/0040_raw_struct_item_field.rs
index 098a60a72bf..098a60a72bf 100644
--- a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.rs
+++ b/crates/syntax/test_data/parser/ok/0040_raw_struct_item_field.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast b/crates/syntax/test_data/parser/ok/0041_raw_keywords.rast
index 4035aef6f23..4035aef6f23 100644
--- a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rast
+++ b/crates/syntax/test_data/parser/ok/0041_raw_keywords.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rs b/crates/syntax/test_data/parser/ok/0041_raw_keywords.rs
index d59a6d3476b..d59a6d3476b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0041_raw_keywords.rs
+++ b/crates/syntax/test_data/parser/ok/0041_raw_keywords.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast b/crates/syntax/test_data/parser/ok/0042_ufcs_call_list.rast
index e71e069f1f4..e71e069f1f4 100644
--- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rast
+++ b/crates/syntax/test_data/parser/ok/0042_ufcs_call_list.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rs b/crates/syntax/test_data/parser/ok/0042_ufcs_call_list.rs
index 6c02e65ed7d..6c02e65ed7d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0042_ufcs_call_list.rs
+++ b/crates/syntax/test_data/parser/ok/0042_ufcs_call_list.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast b/crates/syntax/test_data/parser/ok/0043_complex_assignment.rast
index adc4a22e969..adc4a22e969 100644
--- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rast
+++ b/crates/syntax/test_data/parser/ok/0043_complex_assignment.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rs b/crates/syntax/test_data/parser/ok/0043_complex_assignment.rs
index 7e4a28bf74c..7e4a28bf74c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.rs
+++ b/crates/syntax/test_data/parser/ok/0043_complex_assignment.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast b/crates/syntax/test_data/parser/ok/0044_let_attrs.rast
index af44a4dbe2e..af44a4dbe2e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rast
+++ b/crates/syntax/test_data/parser/ok/0044_let_attrs.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rs b/crates/syntax/test_data/parser/ok/0044_let_attrs.rs
index 325a97aebdc..325a97aebdc 100644
--- a/crates/ra_syntax/test_data/parser/ok/0044_let_attrs.rs
+++ b/crates/syntax/test_data/parser/ok/0044_let_attrs.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast b/crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rast
index 0ac56df6d0f..0ac56df6d0f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rast
+++ b/crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rs b/crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rs
index 88df8138edc..88df8138edc 100644
--- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.rs
+++ b/crates/syntax/test_data/parser/ok/0045_block_inner_attrs.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rast b/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast
index 37594769aaa..37594769aaa 100644
--- a/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rast
+++ b/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rs b/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rs
index fe67e2df43c..fe67e2df43c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0046_extern_inner_attributes.rs
+++ b/crates/syntax/test_data/parser/ok/0046_extern_inner_attributes.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast b/crates/syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
index 4f8dff90948..4f8dff90948 100644
--- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
+++ b/crates/syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rs b/crates/syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rs
index bbd6b0f6e7c..bbd6b0f6e7c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rs
+++ b/crates/syntax/test_data/parser/ok/0047_minus_in_inner_pattern.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast b/crates/syntax/test_data/parser/ok/0048_compound_assignment.rast
index eaab478433f..eaab478433f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rast
+++ b/crates/syntax/test_data/parser/ok/0048_compound_assignment.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rs b/crates/syntax/test_data/parser/ok/0048_compound_assignment.rs
index 871720a49a6..871720a49a6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0048_compound_assignment.rs
+++ b/crates/syntax/test_data/parser/ok/0048_compound_assignment.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast b/crates/syntax/test_data/parser/ok/0049_async_block.rast
index 57ecad3cfa5..57ecad3cfa5 100644
--- a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rast
+++ b/crates/syntax/test_data/parser/ok/0049_async_block.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rs b/crates/syntax/test_data/parser/ok/0049_async_block.rs
index 4781b322549..4781b322549 100644
--- a/crates/ra_syntax/test_data/parser/ok/0049_async_block.rs
+++ b/crates/syntax/test_data/parser/ok/0049_async_block.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast b/crates/syntax/test_data/parser/ok/0050_async_block_as_argument.rast
index c7ce12e93a0..c7ce12e93a0 100644
--- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rast
+++ b/crates/syntax/test_data/parser/ok/0050_async_block_as_argument.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rs b/crates/syntax/test_data/parser/ok/0050_async_block_as_argument.rs
index ec4612cff27..ec4612cff27 100644
--- a/crates/ra_syntax/test_data/parser/ok/0050_async_block_as_argument.rs
+++ b/crates/syntax/test_data/parser/ok/0050_async_block_as_argument.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
index d4f05f27924..d4f05f27924 100644
--- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rast
+++ b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rs b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rs
index de350d8587a..de350d8587a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0051_parameter_attrs.rs
+++ b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast b/crates/syntax/test_data/parser/ok/0052_for_range_block.rast
index 350823ba36c..350823ba36c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rast
+++ b/crates/syntax/test_data/parser/ok/0052_for_range_block.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rs b/crates/syntax/test_data/parser/ok/0052_for_range_block.rs
index b51b1963008..b51b1963008 100644
--- a/crates/ra_syntax/test_data/parser/ok/0052_for_range_block.rs
+++ b/crates/syntax/test_data/parser/ok/0052_for_range_block.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
index be60f7a8ed8..be60f7a8ed8 100644
--- a/crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
+++ b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rs b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rs
index b59c23c56a9..b59c23c56a9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rs
+++ b/crates/syntax/test_data/parser/ok/0053_outer_attribute_on_macro_rules.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast b/crates/syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
index f25c9ac36ff..f25c9ac36ff 100644
--- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
+++ b/crates/syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rs b/crates/syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rs
index 0d3f5722a5a..0d3f5722a5a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rs
+++ b/crates/syntax/test_data/parser/ok/0054_qual_path_in_type_arg.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast b/crates/syntax/test_data/parser/ok/0055_dot_dot_dot.rast
index 7447d516ed1..7447d516ed1 100644
--- a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rast
+++ b/crates/syntax/test_data/parser/ok/0055_dot_dot_dot.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rs b/crates/syntax/test_data/parser/ok/0055_dot_dot_dot.rs
index cd204f65ed9..cd204f65ed9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0055_dot_dot_dot.rs
+++ b/crates/syntax/test_data/parser/ok/0055_dot_dot_dot.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast b/crates/syntax/test_data/parser/ok/0056_neq_in_type.rast
index 3ef916e5565..3ef916e5565 100644
--- a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rast
+++ b/crates/syntax/test_data/parser/ok/0056_neq_in_type.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rs b/crates/syntax/test_data/parser/ok/0056_neq_in_type.rs
index 6210683cea3..6210683cea3 100644
--- a/crates/ra_syntax/test_data/parser/ok/0056_neq_in_type.rs
+++ b/crates/syntax/test_data/parser/ok/0056_neq_in_type.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast b/crates/syntax/test_data/parser/ok/0057_loop_in_call.rast
index 76301004a5d..76301004a5d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rast
+++ b/crates/syntax/test_data/parser/ok/0057_loop_in_call.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rs b/crates/syntax/test_data/parser/ok/0057_loop_in_call.rs
index 31c12522ffc..31c12522ffc 100644
--- a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rs
+++ b/crates/syntax/test_data/parser/ok/0057_loop_in_call.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast b/crates/syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
index a1dfd58f26b..a1dfd58f26b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
+++ b/crates/syntax/test_data/parser/ok/0058_unary_expr_precedence.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rs b/crates/syntax/test_data/parser/ok/0058_unary_expr_precedence.rs
index 100fccc641c..100fccc641c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0058_unary_expr_precedence.rs
+++ b/crates/syntax/test_data/parser/ok/0058_unary_expr_precedence.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast b/crates/syntax/test_data/parser/ok/0059_loops_in_parens.rast
index 213f7b3815a..213f7b3815a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rast
+++ b/crates/syntax/test_data/parser/ok/0059_loops_in_parens.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rs b/crates/syntax/test_data/parser/ok/0059_loops_in_parens.rs
index 6e8b718aaf9..6e8b718aaf9 100644
--- a/crates/ra_syntax/test_data/parser/ok/0059_loops_in_parens.rs
+++ b/crates/syntax/test_data/parser/ok/0059_loops_in_parens.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast b/crates/syntax/test_data/parser/ok/0060_as_range.rast
index 1fd1a288845..1fd1a288845 100644
--- a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rast
+++ b/crates/syntax/test_data/parser/ok/0060_as_range.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rs b/crates/syntax/test_data/parser/ok/0060_as_range.rs
index f063ffadb3d..f063ffadb3d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rs
+++ b/crates/syntax/test_data/parser/ok/0060_as_range.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast b/crates/syntax/test_data/parser/ok/0061_match_full_range.rast
index ba49c115b5a..ba49c115b5a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rast
+++ b/crates/syntax/test_data/parser/ok/0061_match_full_range.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rs b/crates/syntax/test_data/parser/ok/0061_match_full_range.rs
index 2c4ed11e1e5..2c4ed11e1e5 100644
--- a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rs
+++ b/crates/syntax/test_data/parser/ok/0061_match_full_range.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast b/crates/syntax/test_data/parser/ok/0062_macro_2.0.rast
index 0c22c31a4f6..0c22c31a4f6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rast
+++ b/crates/syntax/test_data/parser/ok/0062_macro_2.0.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rs b/crates/syntax/test_data/parser/ok/0062_macro_2.0.rs
index 781047ba19a..781047ba19a 100644
--- a/crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.rs
+++ b/crates/syntax/test_data/parser/ok/0062_macro_2.0.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
index 8eda5997627..8eda5997627 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
+++ b/crates/syntax/test_data/parser/ok/0063_trait_fn_patterns.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rs b/crates/syntax/test_data/parser/ok/0063_trait_fn_patterns.rs
index 3b666af8eed..3b666af8eed 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rs
+++ b/crates/syntax/test_data/parser/ok/0063_trait_fn_patterns.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast
index 4009b3ff8d2..4009b3ff8d2 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rast
+++ b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rs b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rs
index a16afbaf386..a16afbaf386 100644
--- a/crates/ra_syntax/test_data/parser/ok/0063_variadic_fun.rs
+++ b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/syntax/test_data/parser/ok/0064_impl_fn_params.rast
index a3c6ed82e15..a3c6ed82e15 100644
--- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast
+++ b/crates/syntax/test_data/parser/ok/0064_impl_fn_params.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rs b/crates/syntax/test_data/parser/ok/0064_impl_fn_params.rs
index b49e872d79d..b49e872d79d 100644
--- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rs
+++ b/crates/syntax/test_data/parser/ok/0064_impl_fn_params.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast b/crates/syntax/test_data/parser/ok/0065_comment_newline.rast
index 29bd38c051f..29bd38c051f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rast
+++ b/crates/syntax/test_data/parser/ok/0065_comment_newline.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rs b/crates/syntax/test_data/parser/ok/0065_comment_newline.rs
index 1fafe216b6e..1fafe216b6e 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_comment_newline.rs
+++ b/crates/syntax/test_data/parser/ok/0065_comment_newline.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast b/crates/syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
index 2c699ffcb6f..2c699ffcb6f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
+++ b/crates/syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rs b/crates/syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rs
index 29f3655e013..29f3655e013 100644
--- a/crates/ra_syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rs
+++ b/crates/syntax/test_data/parser/ok/0065_plus_after_fn_trait_bound.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_modifier.rast b/crates/syntax/test_data/parser/ok/0066_default_modifier.rast
index e9b57ec3b3f..e9b57ec3b3f 100644
--- a/crates/ra_syntax/test_data/parser/ok/0066_default_modifier.rast
+++ b/crates/syntax/test_data/parser/ok/0066_default_modifier.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0066_default_modifier.rs b/crates/syntax/test_data/parser/ok/0066_default_modifier.rs
index e443e3495e3..e443e3495e3 100644
--- a/crates/ra_syntax/test_data/parser/ok/0066_default_modifier.rs
+++ b/crates/syntax/test_data/parser/ok/0066_default_modifier.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast b/crates/syntax/test_data/parser/ok/0067_where_for_pred.rast
index 8f8639a375b..8f8639a375b 100644
--- a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rast
+++ b/crates/syntax/test_data/parser/ok/0067_where_for_pred.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rs b/crates/syntax/test_data/parser/ok/0067_where_for_pred.rs
index 9058c46190c..9058c46190c 100644
--- a/crates/ra_syntax/test_data/parser/ok/0067_where_for_pred.rs
+++ b/crates/syntax/test_data/parser/ok/0067_where_for_pred.rs
diff --git a/crates/ra_syntax/test_data/parser/ok/0068_item_modifiers.rast b/crates/syntax/test_data/parser/ok/0068_item_modifiers.rast
index 50a6d8ee9a6..50a6d8ee9a6 100644
--- a/crates/ra_syntax/test_data/parser/ok/0068_item_modifiers.rast
+++ b/crates/syntax/test_data/parser/ok/0068_item_modifiers.rast
diff --git a/crates/ra_syntax/test_data/parser/ok/0068_item_modifiers.rs b/crates/syntax/test_data/parser/ok/0068_item_modifiers.rs
index 8d697c04b95..8d697c04b95 100644
--- a/crates/ra_syntax/test_data/parser/ok/0068_item_modifiers.rs
+++ b/crates/syntax/test_data/parser/ok/0068_item_modifiers.rs
diff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0000.rs b/crates/syntax/test_data/reparse/fuzz-failures/0000.rs
index 388eb74eda1..388eb74eda1 100644
--- a/crates/ra_syntax/test_data/reparse/fuzz-failures/0000.rs
+++ b/crates/syntax/test_data/reparse/fuzz-failures/0000.rs
diff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0001.rs b/crates/syntax/test_data/reparse/fuzz-failures/0001.rs
index d2d42c6f941..d2d42c6f941 100644
--- a/crates/ra_syntax/test_data/reparse/fuzz-failures/0001.rs
+++ b/crates/syntax/test_data/reparse/fuzz-failures/0001.rs
diff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0002.rs b/crates/syntax/test_data/reparse/fuzz-failures/0002.rs
index 3fbee154810..3fbee154810 100644
--- a/crates/ra_syntax/test_data/reparse/fuzz-failures/0002.rs
+++ b/crates/syntax/test_data/reparse/fuzz-failures/0002.rs
diff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0003.rs b/crates/syntax/test_data/reparse/fuzz-failures/0003.rs
index d2757cd08df..d2757cd08df 100644
--- a/crates/ra_syntax/test_data/reparse/fuzz-failures/0003.rs
+++ b/crates/syntax/test_data/reparse/fuzz-failures/0003.rs
Binary files differdiff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0004.rs b/crates/syntax/test_data/reparse/fuzz-failures/0004.rs
index 481617a701d..481617a701d 100644
--- a/crates/ra_syntax/test_data/reparse/fuzz-failures/0004.rs
+++ b/crates/syntax/test_data/reparse/fuzz-failures/0004.rs
diff --git a/crates/ra_syntax/test_data/reparse/fuzz-failures/0005.rs b/crates/syntax/test_data/reparse/fuzz-failures/0005.rs
index 074d761c7b5..074d761c7b5 100644
--- a/crates/ra_syntax/test_data/reparse/fuzz-failures/0005.rs
+++ b/crates/syntax/test_data/reparse/fuzz-failures/0005.rs
diff --git a/docs/dev/README.md b/docs/dev/README.md
index 33829c59371..4aab6e2b86a 100644
--- a/docs/dev/README.md
+++ b/docs/dev/README.md
@@ -92,7 +92,7 @@ This is primarily useful for performance optimizations, or for bug minimization.
 
 ## Parser Tests
 
-Tests for the parser (`parser`) live in the `ra_syntax` crate (see `test_data` directory).
+Tests for the parser (`parser`) live in the `syntax` crate (see `test_data` directory).
 There are two kinds of tests:
 
 * Manually written test cases in `parser/ok` and `parser/err`
diff --git a/docs/dev/style.md b/docs/dev/style.md
index 1c68f57023e..3bbab6da903 100644
--- a/docs/dev/style.md
+++ b/docs/dev/style.md
@@ -97,13 +97,13 @@ Qualify items from `hir` and `ast`.
 
 ```rust
 // Good
-use ra_syntax::ast;
+use syntax::ast;
 
 fn frobnicate(func: hir::Function, strukt: ast::StructDef) {}
 
 // Not as good
 use hir::Function;
-use ra_syntax::ast::StructDef;
+use syntax::ast::StructDef;
 
 fn frobnicate(func: Function, strukt: StructDef) {}
 ```
diff --git a/xtask/src/codegen.rs b/xtask/src/codegen.rs
index 08e7a10b755..2acd598d1e4 100644
--- a/xtask/src/codegen.rs
+++ b/xtask/src/codegen.rs
@@ -25,12 +25,12 @@ pub use self::{
 };
 
 const GRAMMAR_DIR: &str = "crates/parser/src/grammar";
-const OK_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/ok";
-const ERR_INLINE_TESTS_DIR: &str = "crates/ra_syntax/test_data/parser/inline/err";
+const OK_INLINE_TESTS_DIR: &str = "crates/syntax/test_data/parser/inline/ok";
+const ERR_INLINE_TESTS_DIR: &str = "crates/syntax/test_data/parser/inline/err";
 
 const SYNTAX_KINDS: &str = "crates/parser/src/syntax_kind/generated.rs";
-const AST_NODES: &str = "crates/ra_syntax/src/ast/generated/nodes.rs";
-const AST_TOKENS: &str = "crates/ra_syntax/src/ast/generated/tokens.rs";
+const AST_NODES: &str = "crates/syntax/src/ast/generated/nodes.rs";
+const AST_TOKENS: &str = "crates/syntax/src/ast/generated/tokens.rs";
 
 const ASSISTS_DIR: &str = "crates/ra_assists/src/handlers";
 const ASSISTS_TESTS: &str = "crates/ra_assists/src/tests/generated.rs";
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs
index cafad8070d2..dd1f4d6a2c4 100644
--- a/xtask/src/codegen/gen_syntax.rs
+++ b/xtask/src/codegen/gen_syntax.rs
@@ -1,7 +1,7 @@
 //! This module generates AST datatype used by rust-analyzer.
 //!
 //! Specifically, it generates the `SyntaxKind` enum and a number of newtype
-//! wrappers around `SyntaxNode` which implement `ra_syntax::AstNode`.
+//! wrappers around `SyntaxNode` which implement `syntax::AstNode`.
 
 use std::{
     collections::{BTreeSet, HashSet},
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 2fdb08f2e15..904a9ee715a 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -103,7 +103,7 @@ pub fn run_clippy() -> Result<()> {
 }
 
 pub fn run_fuzzer() -> Result<()> {
-    let _d = pushd("./crates/ra_syntax");
+    let _d = pushd("./crates/syntax");
     let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly");
     if run!("cargo fuzz --help").is_err() {
         run!("cargo install cargo-fuzz")?;
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index f1a7e8288e7..8c608284a42 100644
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -199,7 +199,7 @@ impl TidyDocs {
             "parser",
             "profile",
             "ra_project_model",
-            "ra_syntax",
+            "syntax",
             "tt",
             "ra_hir_ty",
         ];