950 files changed, 308 insertions, 318 deletions

diff --git a/crates/parser/src/grammar.rs b/crates/parser/src/grammar.rs
index 88468bc97..9dbd2ebc4 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 eeb8ad66b..41e62116f 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 e4a5ee6c1..abc290463 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 fcaa1aedc..217f692a4 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 07c978378..4c41c16d8 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 ebdf00e67..8757fa33f 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 135a2ac9c..563cbf505 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 dd1406228..81b61ebf8 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 537322a72..8c7ffae3d 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 3ac4aed7d..1a6fdafda 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 6ec59ec4d..e19b197d9 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 b83c94404..d5a68a24c 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 724daa93f..32dc05378 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 6816a2709..7fd78e9d4 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 eb216a81a..cf34ffaf7 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 ccec688ca..6e9f2d0fc 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 cc62db0c4..d2ae137cd 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 6698d1a27..8f6660637 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 a19dbf33f..b6cc1a320 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 3cd532650..404f06133 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 55a971dc7..5c69db53e 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 1234f4d29..347e79b1d 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 90ece9fab..314504e15 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 4c1aef8a2..302b6b67d 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 acc97e648..b5df44101 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 7162dc184..9989109b5 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 32dfed274..7db10f276 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 3c58020f8..531592320 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 fbaf3c06b..5f623e5f7 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 bbe3f3643..f0e047538 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 c775fe25c..9c5c6eda7 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 563292282..c347eb40e 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 6d394443e..e2e461520 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 4060d34c6..c62ebc306 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 4c797178f..9ddd116e0 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 9430ce1b5..f3dcca534 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 ef55c354e..44f41daa9 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 c9b743a06..013720dfc 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 ecafb74a1..2442f049b 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 e4d436dec..ed6d0c29b 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 da0a860c5..011bf1106 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 d69f2c1b0..9705f11b7 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 4ca5c3ca1..15e67eaa1 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 8b38695a9..2879090b8 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 890996a68..e2ef561fe 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 e73836422..1ae7aaa09 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 0de6fdf3f..6d85661c4 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 13dbe1919..f89c288da 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 770a40742..cb0d2b9d7 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 f48928aee..940091465 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 cd5a0a7b6..7e025143b 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 47a0f6248..156ea1ee4 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 02a1abee0..12a863499 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 795d7d2b6..73ac243d6 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 b4ef93f2b..d42ca62be 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 f910ded9d..d0bf0593f 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 903406e84..ee5622a7d 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 5c0c6184a..98724c146 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 1c691d961..a50d4ff02 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 7e3ec6315..2e0ef4408 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 a6ff8b0bf..ab2fd0957 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 d3d62debf..6b2de3a06 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 1a080a8b4..38129782f 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 896a69ca8..c83219d77 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 050832ce0..36dc8b816 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 1deb1a837..7c33966a7 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 482393006..a26251cde 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 f783e18b5..079f14c29 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 758c12f33..9a8eb4ede 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 1dd4197f8..a925548b5 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 71d177070..2e38a978f 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 2630b3d89..e9a02b11b 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 befe41c2a..c94b3a36f 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 46e70eb48..5099f417d 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 0e06a0b12..4476f0316 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 3a9eec887..431ff30ab 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 104966c7f..e14722cae 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 4523d0fbb..391ab5d39 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 a81497fa8..6c843e339 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 441bdbead..40a5d92b5 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 3631499bf..063eadccb 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 810393739..806ac731f 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 dc239997f..d26c837cc 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 52ee401d9..f7270ec91 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 953961632..316245d6b 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 ae58948c4..1f619787e 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 cc1726e9e..88be07c8a 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 d09fc66e4..07b9723ce 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 794be45e8..53cecb05f 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 6f7884ffe..1a78c1444 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 1abffb4c3..e6e0853a3 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 052330fde..153a70bdf 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 703a85b0f..f63629b30 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 95e6977f2..2d2f8bcb8 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 24dc0b4e7..ae4c84382 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 d83c391a9..c275f6b01 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 b138500e7..59d35debe 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 dc83044ea..bd3409f97 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 aefe47bd3..23b5eac27 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 38f0ffff8..af0cc445f 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 969a2e5b8..4dcaff088 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 380d5e601..6156e4a85 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 55c02c1fe..bf35d2d0e 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 51adcecaf..fb76e2e4e 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 784ae1c3c..03b00b101 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 731b062c2..a2f849d02 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 a1714ff0f..0e2a69eec 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 016e689ff..5f6f8869a 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 24c53eb02..d887c7a79 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 84c25f0b8..8e0fa5917 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 1fcaf4a32..116e6bf83 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 ff602202f..703cbc6b4 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 2faaae974..603d935de 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 406334257..7c63ce58f 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 b62064797..a80708935 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 42087da8d..05e15d464 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 b08f5b9b4..cb7dd23c1 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 b397baf10..d7edd92cf 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 bd9551f35..824227f31 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 0cb57fb1b..b5efb6cd6 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 1c0684f4e..9377cdc57 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 7c4feff6d..ffc97c076 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 59f1b1424..e1b1ea4ce 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 919177745..1452d7e9e 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 54810d5bb..18def6115 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 8fb25de6c..efcd631b3 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 fd42aa435..41b5bdc49 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 fdbf75abd..683088a74 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 010c34705..ea49d9f97 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 043515f54..c25e068d6 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 7230a0ff9..f30df2bff 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 87cab4503..c90247ba6 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 0fbc9babd..7523aec55 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 45389fd23..77f374ea2 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 9912b7142..91a8c1dd1 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 8f52feea6..3ec2ee59d 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 f66f62bfb..37e68ff7a 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 920b04e8d..46ddc528e 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 caf63933a..35cec87f6 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 09cb5faf6..20967ba99 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 742d70c9c..cb6abb0db 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 e3e0c7639..69af0c86a 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 c4eea3a45..e89dca869 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 9c688fb06..a075618e7 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 3b7162b84..54cb3b309 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 009bb662f..797ead1ad 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 ebdf05127..4b41ceb1d 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 a5e7d2867..418122648 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 6046643ef..43f4e6fea 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 a8087635a..594f61e85 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 07217e808..d05ff2214 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 952429cde..c408b1d52 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 c0c5ce3bc..9cd153f94 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 5446a5961..9ed13a13d 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 d46d1fe71..7b5d6ac49 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 d510ce3b7..1d0c20291 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 2ab662098..a381f7fb8 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 d90b830d0..7827cc71c 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 6ca8bb516..896092b46 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::*;