77 files changed, 337 insertions, 381 deletions

diff --git a/crates/ra_cfg/Cargo.toml b/crates/cfg/Cargo.toml
index cb0d2b9d7..d2ea551d1 100644
--- a/crates/ra_cfg/Cargo.toml
+++ b/crates/cfg/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-edition = "2018"
-name = "ra_cfg"
-version = "0.1.0"
-authors = ["rust-analyzer developers"]
+name = "cfg"
+version = "0.0.0"
 license = "MIT OR Apache-2.0"
+authors = ["rust-analyzer developers"]
+edition = "2018"
 
 [lib]
 doctest = false
@@ -11,8 +11,8 @@ doctest = false
 [dependencies]
 rustc-hash = "1.1.0"
 
-syntax = { path = "../syntax" }
 tt = { path = "../tt" }
 
 [dev-dependencies]
-mbe = { path = "../ra_mbe", package = "ra_mbe" }
+mbe = { path = "../mbe" }
+syntax = { path = "../syntax" }
diff --git a/crates/ra_cfg/src/cfg_expr.rs b/crates/cfg/src/cfg_expr.rs
index 940091465..336fe25bc 100644
--- a/crates/ra_cfg/src/cfg_expr.rs
+++ b/crates/cfg/src/cfg_expr.rs
@@ -4,7 +4,7 @@
 
 use std::slice::Iter as SliceIter;
 
-use syntax::SmolStr;
+use tt::SmolStr;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum CfgExpr {
@@ -86,17 +86,15 @@ fn next_cfg_expr(it: &mut SliceIter<tt::TokenTree>) -> Option<CfgExpr> {
 mod tests {
     use super::*;
 
-    use mbe::{ast_to_token_tree, TokenMap};
+    use mbe::ast_to_token_tree;
     use syntax::ast::{self, AstNode};
 
-    fn get_token_tree_generated(input: &str) -> (tt::Subtree, TokenMap) {
-        let source_file = ast::SourceFile::parse(input).ok().unwrap();
-        let tt = source_file.syntax().descendants().find_map(ast::TokenTree::cast).unwrap();
-        ast_to_token_tree(&tt).unwrap()
-    }
-
     fn assert_parse_result(input: &str, expected: CfgExpr) {
-        let (tt, _) = get_token_tree_generated(input);
+        let (tt, _) = {
+            let source_file = ast::SourceFile::parse(input).ok().unwrap();
+            let tt = source_file.syntax().descendants().find_map(ast::TokenTree::cast).unwrap();
+            ast_to_token_tree(&tt).unwrap()
+        };
         let cfg = CfgExpr::parse(&tt);
         assert_eq!(cfg, expected);
     }
diff --git a/crates/ra_cfg/src/lib.rs b/crates/cfg/src/lib.rs
index 7e025143b..a9d50e698 100644
--- a/crates/ra_cfg/src/lib.rs
+++ b/crates/cfg/src/lib.rs
@@ -1,9 +1,9 @@
-//! ra_cfg defines conditional compiling options, `cfg` attibute parser and evaluator
+//! cfg defines conditional compiling options, `cfg` attibute parser and evaluator
 
 mod cfg_expr;
 
 use rustc_hash::FxHashSet;
-use syntax::SmolStr;
+use tt::SmolStr;
 
 pub use cfg_expr::CfgExpr;
 
diff --git a/crates/ra_mbe/Cargo.toml b/crates/mbe/Cargo.toml
index 4a4be65eb..1aba8b7c4 100644
--- a/crates/ra_mbe/Cargo.toml
+++ b/crates/mbe/Cargo.toml
@@ -1,20 +1,21 @@
 [package]
-edition = "2018"
-name = "ra_mbe"
-version = "0.1.0"
-authors = ["rust-analyzer developers"]
+name = "mbe"
+version = "0.0.0"
 license = "MIT OR Apache-2.0"
+authors = ["rust-analyzer developers"]
+edition = "2018"
 
 [lib]
 doctest = false
 
 [dependencies]
-syntax = { path = "../syntax" }
-parser = { path = "../parser" }
-tt = { path = "../tt" }
 rustc-hash = "1.1.0"
 smallvec = "1.2.0"
 log = "0.4.8"
 
+syntax = { path = "../syntax" }
+parser = { path = "../parser" }
+tt = { path = "../tt" }
+
 [dev-dependencies]
 test_utils = { path = "../test_utils" }
diff --git a/crates/ra_mbe/src/lib.rs b/crates/mbe/src/lib.rs
index f854ca09a..f854ca09a 100644
--- a/crates/ra_mbe/src/lib.rs
+++ b/crates/mbe/src/lib.rs
diff --git a/crates/ra_mbe/src/mbe_expander.rs b/crates/mbe/src/mbe_expander.rs
index 1ad8b9f8a..1ad8b9f8a 100644
--- a/crates/ra_mbe/src/mbe_expander.rs
+++ b/crates/mbe/src/mbe_expander.rs
diff --git a/crates/ra_mbe/src/mbe_expander/matcher.rs b/crates/mbe/src/mbe_expander/matcher.rs
index b698b9832..b698b9832 100644
--- a/crates/ra_mbe/src/mbe_expander/matcher.rs
+++ b/crates/mbe/src/mbe_expander/matcher.rs
diff --git a/crates/ra_mbe/src/mbe_expander/transcriber.rs b/crates/mbe/src/mbe_expander/transcriber.rs
index c9525c5bf..c9525c5bf 100644
--- a/crates/ra_mbe/src/mbe_expander/transcriber.rs
+++ b/crates/mbe/src/mbe_expander/transcriber.rs
diff --git a/crates/ra_mbe/src/parser.rs b/crates/mbe/src/parser.rs
index 6b46a1673..6b46a1673 100644
--- a/crates/ra_mbe/src/parser.rs
+++ b/crates/mbe/src/parser.rs
diff --git a/crates/ra_mbe/src/subtree_source.rs b/crates/mbe/src/subtree_source.rs
index 41461b315..41461b315 100644
--- a/crates/ra_mbe/src/subtree_source.rs
+++ b/crates/mbe/src/subtree_source.rs
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/mbe/src/syntax_bridge.rs
index a8ad917fb..a8ad917fb 100644
--- a/crates/ra_mbe/src/syntax_bridge.rs
+++ b/crates/mbe/src/syntax_bridge.rs
diff --git a/crates/ra_mbe/src/tests.rs b/crates/mbe/src/tests.rs
index 0796ceee1..0796ceee1 100644
--- a/crates/ra_mbe/src/tests.rs
+++ b/crates/mbe/src/tests.rs
diff --git a/crates/ra_mbe/src/tt_iter.rs b/crates/mbe/src/tt_iter.rs
index 46c420718..46c420718 100644
--- a/crates/ra_mbe/src/tt_iter.rs
+++ b/crates/mbe/src/tt_iter.rs
diff --git a/crates/ra_proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
index 1c25e7229..0954ffb66 100644
--- a/crates/ra_proc_macro_srv/Cargo.toml
+++ b/crates/proc_macro_srv/Cargo.toml
@@ -1,21 +1,21 @@
 [package]
-edition = "2018"
-name = "ra_proc_macro_srv"
-version = "0.1.0"
-authors = ["rust-analyzer developers"]
-publish = false
+name = "proc_macro_srv"
+version = "0.0.0"
 license = "MIT OR Apache-2.0"
+authors = ["rust-analyzer developers"]
+edition = "2018"
 
 [lib]
 doctest = false
 
 [dependencies]
-tt = { path = "../tt" }
-ra_mbe = { path = "../ra_mbe" }
-ra_proc_macro = { path = "../ra_proc_macro" }
 goblin = "0.2.1"
 libloading = "0.6.0"
 memmap = "0.7"
+
+tt = { path = "../tt" }
+mbe = { path = "../mbe" }
+ra_proc_macro = { path = "../ra_proc_macro" }
 test_utils = { path = "../test_utils" }
 
 [dev-dependencies]
@@ -23,4 +23,5 @@ cargo_metadata = "0.11.1"
 difference = "2.0.0"
 # used as proc macro test target
 serde_derive = "1.0.106"
+
 toolchain = { path = "../toolchain" }
diff --git a/crates/ra_proc_macro_srv/src/cli.rs b/crates/proc_macro_srv/src/cli.rs
index 1437794c9..1437794c9 100644
--- a/crates/ra_proc_macro_srv/src/cli.rs
+++ b/crates/proc_macro_srv/src/cli.rs
diff --git a/crates/ra_proc_macro_srv/src/dylib.rs b/crates/proc_macro_srv/src/dylib.rs
index 9b6cc91ef..9b6cc91ef 100644
--- a/crates/ra_proc_macro_srv/src/dylib.rs
+++ b/crates/proc_macro_srv/src/dylib.rs
diff --git a/crates/ra_proc_macro_srv/src/lib.rs b/crates/proc_macro_srv/src/lib.rs
index 1fc2eef82..1fc2eef82 100644
--- a/crates/ra_proc_macro_srv/src/lib.rs
+++ b/crates/proc_macro_srv/src/lib.rs
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/buffer.rs b/crates/proc_macro_srv/src/proc_macro/bridge/buffer.rs
index dae6ff1d1..dae6ff1d1 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/buffer.rs
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/buffer.rs
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/client.rs b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs
index cb4b3bdb0..cb4b3bdb0 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/client.rs
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/client.rs
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/closure.rs b/crates/proc_macro_srv/src/proc_macro/bridge/closure.rs
index 273a97715..273a97715 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/closure.rs
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/closure.rs
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/handle.rs b/crates/proc_macro_srv/src/proc_macro/bridge/handle.rs
index a2f77b5ac..a2f77b5ac 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/handle.rs
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/handle.rs
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/mod.rs b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs
index aeb05aad4..aeb05aad4 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/mod.rs
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/mod.rs
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/rpc.rs b/crates/proc_macro_srv/src/proc_macro/bridge/rpc.rs
index 3528d5c99..3528d5c99 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/rpc.rs
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/rpc.rs
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs b/crates/proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs
index 6ef7ea43c..6ef7ea43c 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/scoped_cell.rs
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/bridge/server.rs b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs
index 45d41ac02..45d41ac02 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/bridge/server.rs
+++ b/crates/proc_macro_srv/src/proc_macro/bridge/server.rs
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/diagnostic.rs b/crates/proc_macro_srv/src/proc_macro/diagnostic.rs
index 55d93917c..55d93917c 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/diagnostic.rs
+++ b/crates/proc_macro_srv/src/proc_macro/diagnostic.rs
diff --git a/crates/ra_proc_macro_srv/src/proc_macro/mod.rs b/crates/proc_macro_srv/src/proc_macro/mod.rs
index ee0dc9722..ee0dc9722 100644
--- a/crates/ra_proc_macro_srv/src/proc_macro/mod.rs
+++ b/crates/proc_macro_srv/src/proc_macro/mod.rs
diff --git a/crates/ra_proc_macro_srv/src/rustc_server.rs b/crates/proc_macro_srv/src/rustc_server.rs
index d534d1337..7d1695c86 100644
--- a/crates/ra_proc_macro_srv/src/rustc_server.rs
+++ b/crates/proc_macro_srv/src/rustc_server.rs
@@ -182,7 +182,7 @@ pub mod token_stream {
 
         fn from_str(src: &str) -> Result<TokenStream, LexError> {
             let (subtree, _token_map) =
-                ra_mbe::parse_to_token_tree(src).ok_or("Failed to parse from mbe")?;
+                mbe::parse_to_token_tree(src).ok_or("Failed to parse from mbe")?;
 
             let tt: tt::TokenTree = subtree.into();
             Ok(tt.into())
diff --git a/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt b/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
index e6fd21610..e6fd21610 100644
--- a/crates/ra_proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
+++ b/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
diff --git a/crates/ra_proc_macro_srv/src/tests/mod.rs b/crates/proc_macro_srv/src/tests/mod.rs
index 8e6f28abd..8e6f28abd 100644
--- a/crates/ra_proc_macro_srv/src/tests/mod.rs
+++ b/crates/proc_macro_srv/src/tests/mod.rs
diff --git a/crates/ra_proc_macro_srv/src/tests/utils.rs b/crates/proc_macro_srv/src/tests/utils.rs
index 1b6a0b6fb..1b6a0b6fb 100644
--- a/crates/ra_proc_macro_srv/src/tests/utils.rs
+++ b/crates/proc_macro_srv/src/tests/utils.rs
diff --git a/crates/ra_project_model/Cargo.toml b/crates/project_model/Cargo.toml
index 171fe8626..8d8d09387 100644
--- a/crates/ra_project_model/Cargo.toml
+++ b/crates/project_model/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-edition = "2018"
-name = "ra_project_model"
-version = "0.1.0"
-authors = ["rust-analyzer developers"]
+name = "project_model"
+version = "0.0.0"
 license = "MIT OR Apache-2.0"
+authors = ["rust-analyzer developers"]
+edition = "2018"
 
 [lib]
 doctest = false
@@ -11,18 +11,15 @@ doctest = false
 [dependencies]
 log = "0.4.8"
 rustc-hash = "1.1.0"
-
 cargo_metadata = "0.11.1"
+serde = { version = "1.0.106", features = ["derive"] }
+serde_json = "1.0.48"
+anyhow = "1.0.26"
 
 arena = { path = "../arena" }
-ra_cfg = { path = "../ra_cfg" }
+cfg = { path = "../cfg" }
 ra_db = { path = "../ra_db" }
 toolchain = { path = "../toolchain" }
 ra_proc_macro =  { path = "../ra_proc_macro" }
 paths =  { path = "../paths" }
 stdx =  { path = "../stdx" }
-
-serde = { version = "1.0.106", features = ["derive"] }
-serde_json = "1.0.48"
-
-anyhow = "1.0.26"
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs
index abf8dca96..abf8dca96 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/project_model/src/cargo_workspace.rs
diff --git a/crates/ra_project_model/src/cfg_flag.rs b/crates/project_model/src/cfg_flag.rs
index bd50056c6..e92962cf6 100644
--- a/crates/ra_project_model/src/cfg_flag.rs
+++ b/crates/project_model/src/cfg_flag.rs
@@ -3,7 +3,7 @@
 //! rustc main.rs --cfg foo --cfg 'feature="bar"'
 use std::str::FromStr;
 
-use ra_cfg::CfgOptions;
+use cfg::CfgOptions;
 use stdx::split_once;
 
 #[derive(Clone, Eq, PartialEq, Debug)]
diff --git a/crates/ra_project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 46f44910c..ee42198f3 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -12,8 +12,8 @@ use std::{
 };
 
 use anyhow::{bail, Context, Result};
+use cfg::CfgOptions;
 use paths::{AbsPath, AbsPathBuf};
-use ra_cfg::CfgOptions;
 use ra_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId};
 use rustc_hash::{FxHashMap, FxHashSet};
 
diff --git a/crates/ra_project_model/src/project_json.rs b/crates/project_model/src/project_json.rs
index e3f3163f6..e3f3163f6 100644
--- a/crates/ra_project_model/src/project_json.rs
+++ b/crates/project_model/src/project_json.rs
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/project_model/src/sysroot.rs
index 8239797b6..8239797b6 100644
--- a/crates/ra_project_model/src/sysroot.rs
+++ b/crates/project_model/src/sysroot.rs
diff --git a/crates/ra_assists/Cargo.toml b/crates/ra_assists/Cargo.toml
index abc290463..83e44c124 100644
--- a/crates/ra_assists/Cargo.toml
+++ b/crates/ra_assists/Cargo.toml
@@ -17,7 +17,6 @@ stdx = { path = "../stdx" }
 
 syntax = { path = "../syntax" }
 text_edit = { path = "../text_edit" }
-ra_fmt = { path = "../ra_fmt" }
 profile = { path = "../profile" }
 ra_db = { path = "../ra_db" }
 ra_ide_db = { path = "../ra_ide_db" }
diff --git a/crates/ra_assists/src/assist_context.rs b/crates/ra_assists/src/assist_context.rs
index 217f692a4..368d48a71 100644
--- a/crates/ra_assists/src/assist_context.rs
+++ b/crates/ra_assists/src/assist_context.rs
@@ -5,14 +5,13 @@ use std::mem;
 use algo::find_covering_element;
 use hir::Semantics;
 use ra_db::{FileId, FileRange};
-use ra_fmt::{leading_indent, reindent};
 use ra_ide_db::{
     source_change::{SourceChange, SourceFileEdit},
     RootDatabase,
 };
 use syntax::{
     algo::{self, find_node_at_offset, SyntaxRewriter},
-    AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize,
+    AstNode, SourceFile, SyntaxElement, SyntaxKind, SyntaxToken, TextRange, TextSize,
     TokenAtOffset,
 };
 use text_edit::{TextEdit, TextEditBuilder};
@@ -269,20 +268,6 @@ impl AssistBuilder {
     pub(crate) fn replace_ast<N: AstNode>(&mut self, old: N, new: N) {
         algo::diff(old.syntax(), new.syntax()).into_text_edit(&mut self.edit)
     }
-    /// Replaces specified `node` of text with a given string, reindenting the
-    /// string to maintain `node`'s existing indent.
-    // FIXME: remove in favor of syntax::edit::IndentLevel::increase_indent
-    pub(crate) fn replace_node_and_indent(
-        &mut self,
-        node: &SyntaxNode,
-        replace_with: impl Into<String>,
-    ) {
-        let mut replace_with = replace_with.into();
-        if let Some(indent) = leading_indent(node) {
-            replace_with = reindent(&replace_with, &indent)
-        }
-        self.replace(node.text_range(), replace_with)
-    }
     pub(crate) fn rewrite(&mut self, rewriter: SyntaxRewriter) {
         let node = rewriter.rewrite_root().unwrap();
         let new = rewriter.rewrite(&node);
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 d5a68a24c..be480943c 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,10 +1,12 @@
+use std::iter;
+
 use syntax::{
-    ast::{self, BlockExpr, Expr, LoopBodyOwner},
+    ast::{self, make, BlockExpr, Expr, LoopBodyOwner},
     AstNode, SyntaxNode,
 };
+use test_utils::mark;
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
-use test_utils::mark;
 
 // Assist: change_return_type_to_result
 //
@@ -44,7 +46,13 @@ pub(crate) fn change_return_type_to_result(acc: &mut Assists, ctx: &AssistContex
             tail_return_expr_collector.collect_tail_exprs(block_expr);
 
             for ret_expr_arg in tail_return_expr_collector.exprs_to_wrap {
-                builder.replace_node_and_indent(&ret_expr_arg, format!("Ok({})", ret_expr_arg));
+                let ok_wrapped = make::expr_call(
+                    make::expr_path(make::path_unqualified(make::path_segment(make::name_ref(
+                        "Ok",
+                    )))),
+                    make::arg_list(iter::once(ret_expr_arg.clone())),
+                );
+                builder.replace_ast(ret_expr_arg, ok_wrapped);
             }
 
             match ctx.config.snippet_cap {
@@ -60,7 +68,7 @@ pub(crate) fn change_return_type_to_result(acc: &mut Assists, ctx: &AssistContex
 }
 
 struct TailReturnCollector {
-    exprs_to_wrap: Vec<SyntaxNode>,
+    exprs_to_wrap: Vec<ast::Expr>,
 }
 
 impl TailReturnCollector {
@@ -86,7 +94,8 @@ impl TailReturnCollector {
             if let Some(last_exprs) = get_tail_expr_from_block(&expr) {
                 for last_expr in last_exprs {
                     let last_expr = match last_expr {
-                        NodeType::Node(expr) | NodeType::Leaf(expr) => expr,
+                        NodeType::Node(expr) => expr,
+                        NodeType::Leaf(expr) => expr.syntax().clone(),
                     };
 
                     if let Some(last_expr) = Expr::cast(last_expr.clone()) {
@@ -113,12 +122,12 @@ impl TailReturnCollector {
             }
             Expr::ReturnExpr(ret_expr) => {
                 if let Some(ret_expr_arg) = &ret_expr.expr() {
-                    self.exprs_to_wrap.push(ret_expr_arg.syntax().clone());
+                    self.exprs_to_wrap.push(ret_expr_arg.clone());
                 }
             }
             Expr::BreakExpr(break_expr) if collect_break => {
                 if let Some(break_expr_arg) = &break_expr.expr() {
-                    self.exprs_to_wrap.push(break_expr_arg.syntax().clone());
+                    self.exprs_to_wrap.push(break_expr_arg.clone());
                 }
             }
             Expr::IfExpr(if_expr) => {
@@ -166,14 +175,11 @@ impl TailReturnCollector {
                     NodeType::Leaf(expr) => {
                         self.exprs_to_wrap.push(expr.clone());
                     }
-                    NodeType::Node(expr) => match &Expr::cast(expr.clone()) {
-                        Some(last_expr) => {
-                            self.fetch_tail_exprs(last_expr);
-                        }
-                        None => {
-                            self.exprs_to_wrap.push(expr.clone());
+                    NodeType::Node(expr) => {
+                        if let Some(last_expr) = Expr::cast(expr.clone()) {
+                            self.fetch_tail_exprs(&last_expr);
                         }
-                    },
+                    }
                 }
             }
         }
@@ -182,7 +188,7 @@ impl TailReturnCollector {
 
 #[derive(Debug)]
 enum NodeType {
-    Leaf(SyntaxNode),
+    Leaf(ast::Expr),
     Node(SyntaxNode),
 }
 
@@ -233,25 +239,26 @@ fn get_tail_expr_from_block(expr: &Expr) -> Option<Vec<NodeType>> {
 
             Some(arms)
         }
-        Expr::BreakExpr(expr) => expr.expr().map(|e| vec![NodeType::Leaf(e.syntax().clone())]),
+        Expr::BreakExpr(expr) => expr.expr().map(|e| vec![NodeType::Leaf(e)]),
         Expr::ReturnExpr(ret_expr) => Some(vec![NodeType::Node(ret_expr.syntax().clone())]),
-        Expr::CallExpr(call_expr) => Some(vec![NodeType::Leaf(call_expr.syntax().clone())]),
-        Expr::Literal(lit_expr) => Some(vec![NodeType::Leaf(lit_expr.syntax().clone())]),
-        Expr::TupleExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::ArrayExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::ParenExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::PathExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::RecordExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::IndexExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::MethodCallExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::AwaitExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::CastExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::RefExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::PrefixExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::RangeExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::BinExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::MacroCall(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
-        Expr::BoxExpr(expr) => Some(vec![NodeType::Leaf(expr.syntax().clone())]),
+
+        Expr::CallExpr(_)
+        | Expr::Literal(_)
+        | Expr::TupleExpr(_)
+        | Expr::ArrayExpr(_)
+        | Expr::ParenExpr(_)
+        | Expr::PathExpr(_)
+        | Expr::RecordExpr(_)
+        | Expr::IndexExpr(_)
+        | Expr::MethodCallExpr(_)
+        | Expr::AwaitExpr(_)
+        | Expr::CastExpr(_)
+        | Expr::RefExpr(_)
+        | Expr::PrefixExpr(_)
+        | Expr::RangeExpr(_)
+        | Expr::BinExpr(_)
+        | Expr::MacroCall(_)
+        | Expr::BoxExpr(_) => Some(vec![NodeType::Leaf(expr.clone())]),
         _ => None,
     }
 }
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 6e9f2d0fc..497f887cd 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
@@ -1,12 +1,11 @@
 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 rustc_hash::FxHashSet;
 use syntax::{
     algo::find_node_at_offset,
-    ast::{self, ArgListOwner, AstNode, NameOwner, VisibilityOwner},
-    SourceFile, SyntaxNode, TextRange, TextSize,
+    ast::{self, edit::IndentLevel, ArgListOwner, AstNode, NameOwner, VisibilityOwner},
+    SourceFile, TextRange, TextSize,
 };
 
 use crate::{
@@ -72,7 +71,7 @@ pub(crate) fn extract_struct_from_enum_variant(
             }
             extract_struct_def(
                 builder,
-                enum_ast.syntax(),
+                &enum_ast,
                 &variant_name,
                 &field_list.to_string(),
                 start_offset,
@@ -112,9 +111,10 @@ fn insert_import(
     Some(())
 }
 
+// FIXME: this should use strongly-typed `make`, rather than string manipulation.
 fn extract_struct_def(
     builder: &mut AssistBuilder,
-    enum_ast: &SyntaxNode,
+    enum_: &ast::Enum,
     variant_name: &str,
     variant_list: &str,
     start_offset: TextSize,
@@ -126,11 +126,7 @@ fn extract_struct_def(
     } else {
         "".to_string()
     };
-    let indent = if let Some(indent) = leading_indent(enum_ast) {
-        indent.to_string()
-    } else {
-        "".to_string()
-    };
+    let indent = IndentLevel::from_node(enum_.syntax());
     let struct_def = format!(
         r#"{}struct {}{};
 
diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/ra_assists/src/handlers/move_guard.rs
index c62ebc306..452115fe6 100644
--- a/crates/ra_assists/src/handlers/move_guard.rs
+++ b/crates/ra_assists/src/handlers/move_guard.rs
@@ -1,5 +1,5 @@
 use syntax::{
-    ast::{AstNode, IfExpr, MatchArm},
+    ast::{edit::AstNodeEdit, make, AstNode, IfExpr, MatchArm},
     SyntaxKind::WHITESPACE,
 };
 
@@ -25,7 +25,9 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 //
 // fn handle(action: Action) {
 //     match action {
-//         Action::Move { distance } => if distance > 10 { foo() },
+//         Action::Move { distance } => if distance > 10 {
+//             foo()
+//         },
 //         _ => (),
 //     }
 // }
@@ -35,9 +37,13 @@ pub(crate) fn move_guard_to_arm_body(acc: &mut Assists, ctx: &AssistContext) ->
     let guard = match_arm.guard()?;
     let space_before_guard = guard.syntax().prev_sibling_or_token();
 
-    let guard_conditions = guard.expr()?;
+    let guard_condition = guard.expr()?;
     let arm_expr = match_arm.expr()?;
-    let buf = format!("if {} {{ {} }}", guard_conditions.syntax().text(), arm_expr.syntax().text());
+    let if_expr = make::expr_if(
+        make::condition(guard_condition, None),
+        make::block_expr(None, Some(arm_expr.clone())),
+    )
+    .indent(arm_expr.indent_level());
 
     let target = guard.syntax().text_range();
     acc.add(
@@ -53,7 +59,7 @@ pub(crate) fn move_guard_to_arm_body(acc: &mut Assists, ctx: &AssistContext) ->
             };
 
             edit.delete(guard.syntax().text_range());
-            edit.replace_node_and_indent(arm_expr.syntax(), buf);
+            edit.replace_ast(arm_expr, if_expr);
         },
     )
 }
@@ -134,16 +140,14 @@ mod tests {
         check_assist_target(
             move_guard_to_arm_body,
             r#"
-            fn f() {
-                let t = 'a';
-                let chars = "abcd";
-                match t {
-                    '\r' <|>if chars.clone().next() == Some('\n') => false,
-                    _ => true
-                }
-            }
-            "#,
-            r#"if chars.clone().next() == Some('\n')"#,
+fn main() {
+    match 92 {
+        x <|>if x > 10 => false,
+        _ => true
+    }
+}
+"#,
+            r#"if x > 10"#,
         );
     }
 
@@ -152,25 +156,23 @@ mod tests {
         check_assist(
             move_guard_to_arm_body,
             r#"
-            fn f() {
-                let t = 'a';
-                let chars = "abcd";
-                match t {
-                    '\r' <|>if chars.clone().next() == Some('\n') => false,
-                    _ => true
-                }
-            }
-            "#,
+fn main() {
+    match 92 {
+        x <|>if x > 10 => false,
+        _ => true
+    }
+}
+"#,
             r#"
-            fn f() {
-                let t = 'a';
-                let chars = "abcd";
-                match t {
-                    '\r' => if chars.clone().next() == Some('\n') { false },
-                    _ => true
-                }
-            }
-            "#,
+fn main() {
+    match 92 {
+        x => if x > 10 {
+            false
+        },
+        _ => true
+    }
+}
+"#,
         );
     }
 
@@ -179,21 +181,23 @@ mod tests {
         check_assist(
             move_guard_to_arm_body,
             r#"
-            fn f() {
-                match x {
-                    <|>y @ 4 | y @ 5    if y > 5 => true,
-                    _ => false
-                }
-            }
-            "#,
+fn main() {
+    match 92 {
+        <|>x @ 4 | x @ 5    if x > 5 => true,
+        _ => false
+    }
+}
+"#,
             r#"
-            fn f() {
-                match x {
-                    y @ 4 | y @ 5 => if y > 5 { true },
-                    _ => false
-                }
-            }
-            "#,
+fn main() {
+    match 92 {
+        x @ 4 | x @ 5 => if x > 5 {
+            true
+        },
+        _ => false
+    }
+}
+"#,
         );
     }
 
@@ -202,25 +206,21 @@ mod tests {
         check_assist(
             move_arm_cond_to_match_guard,
             r#"
-            fn f() {
-                let t = 'a';
-                let chars = "abcd";
-                match t {
-                    '\r' => if chars.clone().next() == Some('\n') { <|>false },
-                    _ => true
-                }
-            }
-            "#,
+fn main() {
+    match 92 {
+        x => if x > 10 { <|>false },
+        _ => true
+    }
+}
+"#,
             r#"
-            fn f() {
-                let t = 'a';
-                let chars = "abcd";
-                match t {
-                    '\r' if chars.clone().next() == Some('\n') => false,
-                    _ => true
-                }
-            }
-            "#,
+fn main() {
+    match 92 {
+        x if x > 10 => false,
+        _ => true
+    }
+}
+"#,
         );
     }
 
@@ -229,15 +229,13 @@ mod tests {
         check_assist_not_applicable(
             move_arm_cond_to_match_guard,
             r#"
-            fn f() {
-                let t = 'a';
-                let chars = "abcd";
-                match t {
-                    '\r' => if let Some(_) = chars.clone().next() { <|>false },
-                    _ => true
-                }
-            }
-            "#,
+fn main() {
+    match 92 {
+        x => if let 62 = x { <|>false },
+        _ => true
+    }
+}
+"#,
         );
     }
 
@@ -246,25 +244,21 @@ mod tests {
         check_assist(
             move_arm_cond_to_match_guard,
             r#"
-            fn f() {
-                let t = 'a';
-                let chars = "abcd";
-                match t {
-                    '\r' => if chars.clone().next().is_some() { <|> },
-                    _ => true
-                }
-            }
-            "#,
+fn main() {
+    match 92 {
+        x => if x > 10 { <|> },
+        _ => true
+    }
+}
+"#,
             r#"
-            fn f() {
-                let t = 'a';
-                let chars = "abcd";
-                match t {
-                    '\r' if chars.clone().next().is_some() => {  },
-                    _ => true
-                }
-            }
-            "#,
+fn main() {
+    match 92 {
+        x if x > 10 => {  },
+        _ => true
+    }
+}
+"#,
         );
     }
 
@@ -273,31 +267,27 @@ mod tests {
         check_assist(
             move_arm_cond_to_match_guard,
             r#"
-            fn f() {
-                let mut t = 'a';
-                let chars = "abcd";
-                match t {
-                    '\r' => if chars.clone().next().is_some() {
-                        t = 'e';<|>
-                        false
-                    },
-                    _ => true
-                }
-            }
-            "#,
+fn main() {
+    match 92 {
+        x => if x > 10 {
+            92;<|>
+            false
+        },
+        _ => true
+    }
+}
+"#,
             r#"
-            fn f() {
-                let mut t = 'a';
-                let chars = "abcd";
-                match t {
-                    '\r' if chars.clone().next().is_some() => {
-                        t = 'e';
-                        false
-                    },
-                    _ => true
-                }
-            }
-            "#,
+fn main() {
+    match 92 {
+        x if x > 10 => {
+            92;
+            false
+        },
+        _ => true
+    }
+}
+"#,
         );
     }
 }
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 2442f049b..79097621e 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,4 +1,3 @@
-use ra_fmt::unwrap_trivial_block;
 use syntax::{
     ast::{
         self,
@@ -8,7 +7,10 @@ use syntax::{
     AstNode,
 };
 
-use crate::{utils::TryEnum, AssistContext, AssistId, AssistKind, Assists};
+use crate::{
+    utils::{unwrap_trivial_block, TryEnum},
+    AssistContext, AssistId, AssistKind, Assists,
+};
 
 // Assist: replace_if_let_with_match
 //
diff --git a/crates/ra_assists/src/handlers/unwrap_block.rs b/crates/ra_assists/src/handlers/unwrap_block.rs
index 2879090b8..3851aeb3e 100644
--- a/crates/ra_assists/src/handlers/unwrap_block.rs
+++ b/crates/ra_assists/src/handlers/unwrap_block.rs
@@ -1,4 +1,3 @@
-use ra_fmt::unwrap_trivial_block;
 use syntax::{
     ast::{
         self,
@@ -7,7 +6,7 @@ use syntax::{
     AstNode, TextRange, T,
 };
 
-use crate::{AssistContext, AssistId, AssistKind, Assists};
+use crate::{utils::unwrap_trivial_block, AssistContext, AssistId, AssistKind, Assists};
 
 // Assist: unwrap_block
 //
diff --git a/crates/ra_assists/src/tests/generated.rs b/crates/ra_assists/src/tests/generated.rs
index 97978e7a2..d16e6fb0a 100644
--- a/crates/ra_assists/src/tests/generated.rs
+++ b/crates/ra_assists/src/tests/generated.rs
@@ -690,7 +690,9 @@ enum Action { Move { distance: u32 }, Stop }
 
 fn handle(action: Action) {
     match action {
-        Action::Move { distance } => if distance > 10 { foo() },
+        Action::Move { distance } => if distance > 10 {
+            foo()
+        },
         _ => (),
     }
 }
diff --git a/crates/ra_assists/src/utils.rs b/crates/ra_assists/src/utils.rs
index 6d85661c4..a20453dd8 100644
--- a/crates/ra_assists/src/utils.rs
+++ b/crates/ra_assists/src/utils.rs
@@ -4,6 +4,7 @@ pub(crate) mod insert_use;
 use std::{iter, ops};
 
 use hir::{Adt, Crate, Enum, ScopeDef, Semantics, Trait, Type};
+use itertools::Itertools;
 use ra_ide_db::RootDatabase;
 use rustc_hash::FxHashSet;
 use syntax::{
@@ -17,6 +18,43 @@ use crate::assist_config::SnippetCap;
 
 pub(crate) use insert_use::{find_insert_use_container, insert_use_statement};
 
+pub(crate) fn unwrap_trivial_block(block: ast::BlockExpr) -> ast::Expr {
+    extract_trivial_expression(&block)
+        .filter(|expr| !expr.syntax().text().contains_char('\n'))
+        .unwrap_or_else(|| block.into())
+}
+
+pub fn extract_trivial_expression(block: &ast::BlockExpr) -> Option<ast::Expr> {
+    let has_anything_else = |thing: &SyntaxNode| -> bool {
+        let mut non_trivial_children =
+            block.syntax().children_with_tokens().filter(|it| match it.kind() {
+                WHITESPACE | T!['{'] | T!['}'] => false,
+                _ => it.as_node() != Some(thing),
+            });
+        non_trivial_children.next().is_some()
+    };
+
+    if let Some(expr) = block.expr() {
+        if has_anything_else(expr.syntax()) {
+            return None;
+        }
+        return Some(expr);
+    }
+    // Unwrap `{ continue; }`
+    let (stmt,) = block.statements().next_tuple()?;
+    if let ast::Stmt::ExprStmt(expr_stmt) = stmt {
+        if has_anything_else(expr_stmt.syntax()) {
+            return None;
+        }
+        let expr = expr_stmt.expr()?;
+        match expr.syntax().kind() {
+            CONTINUE_EXPR | BREAK_EXPR | RETURN_EXPR => return Some(expr),
+            _ => (),
+        }
+    }
+    None
+}
+
 #[derive(Clone, Copy, Debug)]
 pub(crate) enum Cursor<'a> {
     Replace(&'a SyntaxNode),
diff --git a/crates/ra_assists/src/utils/insert_use.rs b/crates/ra_assists/src/utils/insert_use.rs
index f89c288da..50a62ee82 100644
--- a/crates/ra_assists/src/utils/insert_use.rs
+++ b/crates/ra_assists/src/utils/insert_use.rs
@@ -2,13 +2,15 @@
 // FIXME: rewrite according to the plan, outlined in
 // https://github.com/rust-analyzer/rust-analyzer/issues/3301#issuecomment-592931553
 
+use std::iter::successors;
+
 use either::Either;
 use hir::{self, ModPath};
 use syntax::{
     ast::{self, NameOwner, VisibilityOwner},
-    AstNode, Direction, SmolStr,
+    AstNode, AstToken, Direction, SmolStr,
     SyntaxKind::{PATH, PATH_SEGMENT},
-    SyntaxNode, T,
+    SyntaxNode, SyntaxToken, T,
 };
 use text_edit::TextEditBuilder;
 
@@ -442,7 +444,7 @@ fn make_assist_add_new_use(
     edit: &mut TextEditBuilder,
 ) {
     if let Some(anchor) = anchor {
-        let indent = ra_fmt::leading_indent(anchor);
+        let indent = leading_indent(anchor);
         let mut buf = String::new();
         if after {
             buf.push_str("\n");
@@ -524,3 +526,22 @@ fn make_assist_add_nested_import(
         edit.insert(end, "}".to_string());
     }
 }
+
+/// If the node is on the beginning of the line, calculate indent.
+fn leading_indent(node: &SyntaxNode) -> Option<SmolStr> {
+    for token in prev_tokens(node.first_token()?) {
+        if let Some(ws) = ast::Whitespace::cast(token.clone()) {
+            let ws_text = ws.text();
+            if let Some(pos) = ws_text.rfind('\n') {
+                return Some(ws_text[pos + 1..].into());
+            }
+        }
+        if token.text().contains('\n') {
+            break;
+        }
+    }
+    return None;
+    fn prev_tokens(token: SyntaxToken) -> impl Iterator<Item = SyntaxToken> {
+        successors(token.prev_token(), |token| token.prev_token())
+    }
+}
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 156ea1ee4..ad432f096 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -13,7 +13,7 @@ salsa = "0.15.2"
 rustc-hash = "1.1.0"
 
 syntax = { path = "../syntax" }
-ra_cfg = { path = "../ra_cfg" }
+cfg = { path = "../cfg" }
 profile = { path = "../profile" }
 tt = { path = "../tt" }
 test_utils = { path = "../test_utils" }
diff --git a/crates/ra_db/src/fixture.rs b/crates/ra_db/src/fixture.rs
index 2aafb9965..5ff8ead0e 100644
--- a/crates/ra_db/src/fixture.rs
+++ b/crates/ra_db/src/fixture.rs
@@ -59,7 +59,7 @@
 //! ```
 use std::{str::FromStr, sync::Arc};
 
-use ra_cfg::CfgOptions;
+use cfg::CfgOptions;
 use rustc_hash::FxHashMap;
 use test_utils::{extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER};
 use vfs::{file_set::FileSet, VfsPath};
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index 12a863499..f3d65cdf0 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -8,7 +8,7 @@
 
 use std::{fmt, iter::FromIterator, ops, str::FromStr, sync::Arc};
 
-use ra_cfg::CfgOptions;
+use cfg::CfgOptions;
 use rustc_hash::{FxHashMap, FxHashSet};
 use syntax::SmolStr;
 use tt::TokenExpander;
diff --git a/crates/ra_fmt/Cargo.toml b/crates/ra_fmt/Cargo.toml
deleted file mode 100644
index d42ca62be..000000000
--- a/crates/ra_fmt/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-edition = "2018"
-name = "ra_fmt"
-version = "0.1.0"
-authors = ["rust-analyzer developers"]
-publish = false
-license = "MIT OR Apache-2.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-itertools = "0.9.0"
-
-syntax = { path = "../syntax" }
diff --git a/crates/ra_fmt/src/lib.rs b/crates/ra_fmt/src/lib.rs
deleted file mode 100644
index d0bf0593f..000000000
--- a/crates/ra_fmt/src/lib.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-//! This crate provides some utilities for indenting rust code.
-
-use std::iter::successors;
-
-use itertools::Itertools;
-use syntax::{
-    ast::{self, AstNode, AstToken},
-    SmolStr, SyntaxKind,
-    SyntaxKind::*,
-    SyntaxNode, SyntaxToken, T,
-};
-
-pub fn reindent(text: &str, indent: &str) -> String {
-    let indent = format!("\n{}", indent);
-    text.lines().intersperse(&indent).collect()
-}
-
-/// If the node is on the beginning of the line, calculate indent.
-pub fn leading_indent(node: &SyntaxNode) -> Option<SmolStr> {
-    for token in prev_tokens(node.first_token()?) {
-        if let Some(ws) = ast::Whitespace::cast(token.clone()) {
-            let ws_text = ws.text();
-            if let Some(pos) = ws_text.rfind('\n') {
-                return Some(ws_text[pos + 1..].into());
-            }
-        }
-        if token.text().contains('\n') {
-            break;
-        }
-    }
-    None
-}
-
-fn prev_tokens(token: SyntaxToken) -> impl Iterator<Item = SyntaxToken> {
-    successors(token.prev_token(), |token| token.prev_token())
-}
-
-pub fn unwrap_trivial_block(block: ast::BlockExpr) -> ast::Expr {
-    extract_trivial_expression(&block)
-        .filter(|expr| !expr.syntax().text().contains_char('\n'))
-        .unwrap_or_else(|| block.into())
-}
-
-pub fn extract_trivial_expression(block: &ast::BlockExpr) -> Option<ast::Expr> {
-    let has_anything_else = |thing: &SyntaxNode| -> bool {
-        let mut non_trivial_children =
-            block.syntax().children_with_tokens().filter(|it| match it.kind() {
-                WHITESPACE | T!['{'] | T!['}'] => false,
-                _ => it.as_node() != Some(thing),
-            });
-        non_trivial_children.next().is_some()
-    };
-
-    if let Some(expr) = block.expr() {
-        if has_anything_else(expr.syntax()) {
-            return None;
-        }
-        return Some(expr);
-    }
-    // Unwrap `{ continue; }`
-    let (stmt,) = block.statements().next_tuple()?;
-    if let ast::Stmt::ExprStmt(expr_stmt) = stmt {
-        if has_anything_else(expr_stmt.syntax()) {
-            return None;
-        }
-        let expr = expr_stmt.expr()?;
-        match expr.syntax().kind() {
-            CONTINUE_EXPR | BREAK_EXPR | RETURN_EXPR => return Some(expr),
-            _ => (),
-        }
-    }
-    None
-}
-
-pub fn compute_ws(left: SyntaxKind, right: SyntaxKind) -> &'static str {
-    match left {
-        T!['('] | T!['['] => return "",
-        T!['{'] => {
-            if let USE_TREE = right {
-                return "";
-            }
-        }
-        _ => (),
-    }
-    match right {
-        T![')'] | T![']'] => return "",
-        T!['}'] => {
-            if let USE_TREE = left {
-                return "";
-            }
-        }
-        T![.] => return "",
-        _ => (),
-    }
-    " "
-}
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_def/Cargo.toml
index 38129782f..e7d3c4d5b 100644
--- a/crates/ra_hir_def/Cargo.toml
+++ b/crates/ra_hir_def/Cargo.toml
@@ -28,8 +28,8 @@ syntax = { path = "../syntax" }
 profile = { path = "../profile" }
 hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
 test_utils = { path = "../test_utils" }
-mbe = { path = "../ra_mbe", package = "ra_mbe" }
-ra_cfg = { path = "../ra_cfg" }
+mbe = { path = "../mbe" }
+cfg = { path = "../cfg" }
 tt = { path = "../tt" }
 
 [dev-dependencies]
diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs
index c83219d77..d69ff2fc7 100644
--- a/crates/ra_hir_def/src/adt.rs
+++ b/crates/ra_hir_def/src/adt.rs
@@ -23,7 +23,7 @@ use crate::{
     EnumId, HasModule, LocalEnumVariantId, LocalFieldId, Lookup, ModuleId, StructId, UnionId,
     VariantId,
 };
-use ra_cfg::CfgOptions;
+use cfg::CfgOptions;
 
 /// Note that we use `StructData` for unions as well!
 #[derive(Debug, Clone, PartialEq, Eq)]
diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs
index 36dc8b816..dea552a60 100644
--- a/crates/ra_hir_def/src/attr.rs
+++ b/crates/ra_hir_def/src/attr.rs
@@ -2,10 +2,10 @@
 
 use std::{ops, sync::Arc};
 
+use cfg::{CfgExpr, CfgOptions};
 use either::Either;
 use hir_expand::{hygiene::Hygiene, AstId, InFile};
 use mbe::ast_to_token_tree;
-use ra_cfg::{CfgExpr, CfgOptions};
 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 7c33966a7..fe659386a 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/ra_hir_def/src/body.rs
@@ -6,10 +6,10 @@ pub mod scope;
 use std::{mem, ops::Index, sync::Arc};
 
 use arena::{map::ArenaMap, Arena};
+use cfg::CfgOptions;
 use drop_bomb::DropBomb;
 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 rustc_hash::FxHashMap;
 use syntax::{ast, AstNode, AstPtr};
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index f7270ec91..6a5891936 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -3,6 +3,7 @@
 //! `DefCollector::collect` contains the fixed-point iteration loop which
 //! resolves imports and expands macros.
 
+use cfg::CfgOptions;
 use hir_expand::{
     ast_id_map::FileAstId,
     builtin_derive::find_builtin_derive,
@@ -11,7 +12,6 @@ use hir_expand::{
     proc_macro::ProcMacroExpander,
     HirFileId, MacroCallId, MacroDefId, MacroDefKind,
 };
-use ra_cfg::CfgOptions;
 use ra_db::{CrateId, FileId, ProcMacroId};
 use rustc_hash::FxHashMap;
 use syntax::ast;
diff --git a/crates/ra_hir_expand/Cargo.toml b/crates/ra_hir_expand/Cargo.toml
index 153a70bdf..cbb0ac29b 100644
--- a/crates/ra_hir_expand/Cargo.toml
+++ b/crates/ra_hir_expand/Cargo.toml
@@ -19,5 +19,5 @@ syntax = { path = "../syntax" }
 parser = { path = "../parser" }
 profile = { path = "../profile" }
 tt = { path = "../tt" }
-mbe = { path = "../ra_mbe", package = "ra_mbe" }
+mbe = { path = "../mbe" }
 test_utils = { path = "../test_utils"}
diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml
index 8e0fa5917..938398a41 100644
--- a/crates/ra_ide/Cargo.toml
+++ b/crates/ra_ide/Cargo.toml
@@ -25,8 +25,7 @@ syntax = { path = "../syntax" }
 text_edit = { path = "../text_edit" }
 ra_db = { path = "../ra_db" }
 ra_ide_db = { path = "../ra_ide_db" }
-ra_cfg = { path = "../ra_cfg" }
-ra_fmt = { path = "../ra_fmt" }
+cfg = { path = "../cfg" }
 profile = { path = "../profile" }
 test_utils = { path = "../test_utils" }
 ra_assists = { path = "../ra_assists" }
diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs
index 35cec87f6..f5c310701 100644
--- a/crates/ra_ide/src/join_lines.rs
+++ b/crates/ra_ide/src/join_lines.rs
@@ -1,10 +1,10 @@
 use itertools::Itertools;
-use ra_fmt::{compute_ws, extract_trivial_expression};
+use ra_assists::utils::extract_trivial_expression;
 use syntax::{
     algo::{find_covering_element, non_trivia_sibling},
     ast::{self, AstNode, AstToken},
     Direction, NodeOrToken, SourceFile,
-    SyntaxKind::{self, WHITESPACE},
+    SyntaxKind::{self, USE_TREE, WHITESPACE},
     SyntaxNode, SyntaxToken, TextRange, TextSize, T,
 };
 use text_edit::{TextEdit, TextEditBuilder};
@@ -168,6 +168,29 @@ fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool {
     matches!((left, right), (T![,], T![')']) | (T![,], T![']']))
 }
 
+fn compute_ws(left: SyntaxKind, right: SyntaxKind) -> &'static str {
+    match left {
+        T!['('] | T!['['] => return "",
+        T!['{'] => {
+            if let USE_TREE = right {
+                return "";
+            }
+        }
+        _ => (),
+    }
+    match right {
+        T![')'] | T![']'] => return "",
+        T!['}'] => {
+            if let USE_TREE = left {
+                return "";
+            }
+        }
+        T![.] => return "",
+        _ => (),
+    }
+    " "
+}
+
 #[cfg(test)]
 mod tests {
     use syntax::SourceFile;
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 20967ba99..1fdf17800 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -47,7 +47,7 @@ mod typing;
 
 use std::sync::Arc;
 
-use ra_cfg::CfgOptions;
+use cfg::CfgOptions;
 use ra_db::{
     salsa::{self, ParallelDatabase},
     CheckCanceled, Env, FileLoader, FileSet, SourceDatabase, VfsPath,
diff --git a/crates/ra_ide/src/mock_analysis.rs b/crates/ra_ide/src/mock_analysis.rs
index c7e0f4b58..a4691f028 100644
--- a/crates/ra_ide/src/mock_analysis.rs
+++ b/crates/ra_ide/src/mock_analysis.rs
@@ -1,7 +1,7 @@
 //! FIXME: write short doc here
 use std::sync::Arc;
 
-use ra_cfg::CfgOptions;
+use cfg::CfgOptions;
 use ra_db::{CrateName, FileSet, SourceRoot, VfsPath};
 use test_utils::{
     extract_annotations, extract_range_or_offset, Fixture, RangeOrOffset, CURSOR_MARKER,
diff --git a/crates/ra_ide/src/parent_module.rs b/crates/ra_ide/src/parent_module.rs
index 69af0c86a..b78388e6b 100644
--- a/crates/ra_ide/src/parent_module.rs
+++ b/crates/ra_ide/src/parent_module.rs
@@ -63,7 +63,7 @@ pub(crate) fn crate_for(db: &RootDatabase, file_id: FileId) -> Vec<CrateId> {
 
 #[cfg(test)]
 mod tests {
-    use ra_cfg::CfgOptions;
+    use cfg::CfgOptions;
     use ra_db::Env;
     use test_utils::mark;
 
diff --git a/crates/ra_ide/src/runnables.rs b/crates/ra_ide/src/runnables.rs
index 54cb3b309..fb40762cf 100644
--- a/crates/ra_ide/src/runnables.rs
+++ b/crates/ra_ide/src/runnables.rs
@@ -1,8 +1,8 @@
 use std::fmt;
 
+use cfg::CfgExpr;
 use hir::{AsAssocItem, Attrs, HirFileId, InFile, Semantics};
 use itertools::Itertools;
-use ra_cfg::CfgExpr;
 use ra_ide_db::RootDatabase;
 use syntax::{
     ast::{self, AstNode, AttrsOwner, DocCommentsOwner, ModuleItemOwner, NameOwner},
diff --git a/crates/ra_ide/src/typing.rs b/crates/ra_ide/src/typing.rs
index c408b1d52..7897c57b7 100644
--- a/crates/ra_ide/src/typing.rs
+++ b/crates/ra_ide/src/typing.rs
@@ -16,11 +16,10 @@
 mod on_enter;
 
 use ra_db::{FilePosition, SourceDatabase};
-use ra_fmt::leading_indent;
 use ra_ide_db::{source_change::SourceFileEdit, RootDatabase};
 use syntax::{
     algo::find_node_at_offset,
-    ast::{self, AstToken},
+    ast::{self, edit::IndentLevel, AstToken},
     AstNode, SourceFile,
     SyntaxKind::{FIELD_EXPR, METHOD_CALL_EXPR},
     TextRange, TextSize,
@@ -104,7 +103,7 @@ fn on_dot_typed(file: &SourceFile, offset: TextSize) -> Option<TextEdit> {
     if !matches!(parent.kind(), FIELD_EXPR | METHOD_CALL_EXPR) {
         return None;
     }
-    let prev_indent = leading_indent(&parent)?;
+    let prev_indent = IndentLevel::from_node(&parent);
     let target_indent = format!("    {}", prev_indent);
     let target_indent_len = TextSize::of(&target_indent);
     if current_indent_len == target_indent_len {
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 86c786e25..c6102bf27 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -37,12 +37,12 @@ lsp-server = "0.3.3"
 flycheck = { path = "../flycheck" }
 ra_ide = { path = "../ra_ide" }
 profile = { path = "../profile" }
-ra_project_model = { path = "../ra_project_model" }
+project_model = { path = "../project_model" }
 syntax = { path = "../syntax" }
 text_edit = { path = "../text_edit" }
 vfs = { path = "../vfs" }
 vfs-notify = { path = "../vfs-notify" }
-ra_cfg = { path = "../ra_cfg" }
+cfg = { path = "../cfg" }
 toolchain = { path = "../toolchain" }
 
 # This should only be used in CLI
@@ -52,7 +52,7 @@ ra_ssr = { path = "../ra_ssr" }
 hir = { path = "../ra_hir", package = "ra_hir" }
 hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
 hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" }
-ra_proc_macro_srv = { path = "../ra_proc_macro_srv" }
+proc_macro_srv = { path = "../proc_macro_srv" }
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3.8"
@@ -60,5 +60,5 @@ winapi = "0.3.8"
 [dev-dependencies]
 expect = { path = "../expect" }
 test_utils = { path = "../test_utils" }
-mbe = { path = "../ra_mbe", package = "ra_mbe" }
+mbe = { path = "../mbe" }
 tt = { path = "../tt" }
diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
index 9622d71c0..bade31ca2 100644
--- a/crates/rust-analyzer/src/bin/main.rs
+++ b/crates/rust-analyzer/src/bin/main.rs
@@ -6,7 +6,7 @@ mod args;
 use std::{convert::TryFrom, process};
 
 use lsp_server::Connection;
-use ra_project_model::ProjectManifest;
+use project_model::ProjectManifest;
 use rust_analyzer::{
     cli,
     config::{Config, LinkedProject},
@@ -30,7 +30,7 @@ fn try_main() -> Result<()> {
     let args = args::Args::parse()?;
     match args.command {
         args::Command::RunServer => run_server()?,
-        args::Command::ProcMacro => ra_proc_macro_srv::cli::run()?,
+        args::Command::ProcMacro => proc_macro_srv::cli::run()?,
 
         args::Command::Parse { no_dump } => cli::parse(no_dump)?,
         args::Command::Symbols => cli::symbols()?,
diff --git a/crates/rust-analyzer/src/cargo_target_spec.rs b/crates/rust-analyzer/src/cargo_target_spec.rs
index 7929368c0..5ba30dbad 100644
--- a/crates/rust-analyzer/src/cargo_target_spec.rs
+++ b/crates/rust-analyzer/src/cargo_target_spec.rs
@@ -1,8 +1,8 @@
 //! See `CargoTargetSpec`
 
-use ra_cfg::CfgExpr;
+use cfg::CfgExpr;
+use project_model::{self, TargetKind};
 use ra_ide::{FileId, RunnableKind, TestId};
-use ra_project_model::{self, TargetKind};
 use vfs::AbsPathBuf;
 
 use crate::{global_state::GlobalStateSnapshot, Result};
@@ -177,8 +177,8 @@ fn required_features(cfg_expr: &CfgExpr, features: &mut Vec<String>) {
 mod tests {
     use super::*;
 
+    use cfg::CfgExpr;
     use mbe::ast_to_token_tree;
-    use ra_cfg::CfgExpr;
     use syntax::{
         ast::{self, AstNode},
         SmolStr,
diff --git a/crates/rust-analyzer/src/cli/load_cargo.rs b/crates/rust-analyzer/src/cli/load_cargo.rs
index a43bf2244..f6cb144c6 100644
--- a/crates/rust-analyzer/src/cli/load_cargo.rs
+++ b/crates/rust-analyzer/src/cli/load_cargo.rs
@@ -4,9 +4,9 @@ use std::{path::Path, sync::Arc};
 
 use anyhow::Result;
 use crossbeam_channel::{unbounded, Receiver};
+use project_model::{CargoConfig, ProcMacroClient, ProjectManifest, ProjectWorkspace};
 use ra_db::CrateGraph;
 use ra_ide::{AnalysisChange, AnalysisHost};
-use ra_project_model::{CargoConfig, ProcMacroClient, ProjectManifest, ProjectWorkspace};
 use vfs::{loader::Handle, AbsPath, AbsPathBuf};
 
 use crate::reload::{ProjectFolders, SourceRootConfig};
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 70b4512d0..bfc84147c 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -11,8 +11,8 @@ use std::{ffi::OsString, path::PathBuf};
 
 use flycheck::FlycheckConfig;
 use lsp_types::ClientCapabilities;
+use project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
 use ra_ide::{AssistConfig, CompletionConfig, HoverConfig, InlayHintsConfig};
-use ra_project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
 use serde::Deserialize;
 use vfs::AbsPathBuf;
 
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs
index 8c115c8a6..2e8b708d0 100644
--- a/crates/rust-analyzer/src/global_state.rs
+++ b/crates/rust-analyzer/src/global_state.rs
@@ -9,9 +9,9 @@ use crossbeam_channel::{unbounded, Receiver, Sender};
 use flycheck::FlycheckHandle;
 use lsp_types::{SemanticTokens, Url};
 use parking_lot::{Mutex, RwLock};
+use project_model::{CargoWorkspace, ProcMacroClient, ProjectWorkspace, Target};
 use ra_db::{CrateId, VfsPath};
 use ra_ide::{Analysis, AnalysisChange, AnalysisHost, FileId};
-use ra_project_model::{CargoWorkspace, ProcMacroClient, ProjectWorkspace, Target};
 use rustc_hash::FxHashMap;
 
 use crate::{
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
index 86e7833f2..4b5ca7eec 100644
--- a/crates/rust-analyzer/src/handlers.rs
+++ b/crates/rust-analyzer/src/handlers.rs
@@ -18,11 +18,11 @@ use lsp_types::{
     SemanticTokensRangeResult, SemanticTokensResult, SymbolInformation, SymbolTag,
     TextDocumentIdentifier, Url, WorkspaceEdit,
 };
+use project_model::TargetKind;
 use ra_ide::{
     FileId, FilePosition, FileRange, HoverAction, HoverGotoTypeData, NavigationTarget, Query,
     RangeInfo, Runnable, RunnableKind, SearchScope, TextEdit,
 };
-use ra_project_model::TargetKind;
 use serde::{Deserialize, Serialize};
 use serde_json::to_value;
 use stdx::{format_to, split_once};
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 32962b088..9a779cb14 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -21,7 +21,7 @@ use crate::{
     lsp_utils::{apply_document_changes, is_canceled, notification_is, Progress},
     Result,
 };
-use ra_project_model::ProjectWorkspace;
+use project_model::ProjectWorkspace;
 use vfs::ChangeKind;
 
 pub fn main_loop(config: Config, connection: Connection) -> Result<()> {
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index f74f2c02c..640417dc6 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -2,9 +2,9 @@
 use std::{mem, sync::Arc};
 
 use flycheck::FlycheckHandle;
+use project_model::{ProcMacroClient, ProjectWorkspace};
 use ra_db::{CrateGraph, SourceRoot, VfsPath};
 use ra_ide::AnalysisChange;
-use ra_project_model::{ProcMacroClient, ProjectWorkspace};
 use vfs::{file_set::FileSetConfig, AbsPath, AbsPathBuf, ChangeKind};
 
 use crate::{
@@ -98,14 +98,14 @@ impl GlobalState {
                     .iter()
                     .map(|project| match project {
                         LinkedProject::ProjectManifest(manifest) => {
-                            ra_project_model::ProjectWorkspace::load(
+                            project_model::ProjectWorkspace::load(
                                 manifest.clone(),
                                 &cargo_config,
                                 with_sysroot,
                             )
                         }
                         LinkedProject::InlineJsonProject(it) => {
-                            Ok(ra_project_model::ProjectWorkspace::Json { project: it.clone() })
+                            Ok(project_model::ProjectWorkspace::Json { project: it.clone() })
                         }
                     })
                     .collect::<Vec<_>>();
@@ -176,7 +176,7 @@ impl GlobalState {
                 Ok(it) => it,
                 Err(err) => {
                     log::error!(
-                        "Failed to run ra_proc_macro_srv from path {}, error: {:?}",
+                        "Failed to run proc_macro_srv from path {}, error: {:?}",
                         path.display(),
                         err
                     );
diff --git a/crates/rust-analyzer/tests/heavy_tests/support.rs b/crates/rust-analyzer/tests/heavy_tests/support.rs
index 15866fbb1..5bafeba79 100644
--- a/crates/rust-analyzer/tests/heavy_tests/support.rs
+++ b/crates/rust-analyzer/tests/heavy_tests/support.rs
@@ -12,7 +12,7 @@ use lsp_types::{
     notification::Exit, request::Shutdown, TextDocumentIdentifier, Url, WorkDoneProgress,
 };
 use lsp_types::{ProgressParams, ProgressParamsValue};
-use ra_project_model::ProjectManifest;
+use project_model::ProjectManifest;
 use rust_analyzer::{
     config::{ClientCapsConfig, Config, FilesConfig, FilesWatcher, LinkedProject},
     main_loop,
diff --git a/crates/syntax/src/ast/edit.rs b/crates/syntax/src/ast/edit.rs
index 2667d9af4..190746e09 100644
--- a/crates/syntax/src/ast/edit.rs
+++ b/crates/syntax/src/ast/edit.rs
@@ -601,6 +601,9 @@ pub trait AstNodeEdit: AstNode + Clone + Sized {
         }
         rewriter.rewrite_ast(self)
     }
+    fn indent_level(&self) -> IndentLevel {
+        IndentLevel::from_node(self.syntax())
+    }
     #[must_use]
     fn indent(&self, level: IndentLevel) -> Self {
         Self::cast(level.increase_indent(self.syntax().clone())).unwrap()
diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs
index 3009faed7..d20c085aa 100644
--- a/crates/syntax/src/ast/make.rs
+++ b/crates/syntax/src/ast/make.rs
@@ -134,6 +134,9 @@ pub fn expr_prefix(op: SyntaxKind, expr: ast::Expr) -> ast::Expr {
     let token = token(op);
     expr_from_text(&format!("{}{}", token, expr))
 }
+pub fn expr_call(f: ast::Expr, arg_list: ast::ArgList) -> ast::Expr {
+    expr_from_text(&format!("{}{}", f, arg_list))
+}
 fn expr_from_text(text: &str) -> ast::Expr {
     ast_from_text(&format!("const C: () = {};", text))
 }
@@ -151,6 +154,10 @@ pub fn condition(expr: ast::Expr, pattern: Option<ast::Pat>) -> ast::Condition {
     }
 }
 
+pub fn arg_list(args: impl IntoIterator<Item = ast::Expr>) -> ast::ArgList {
+    ast_from_text(&format!("fn main() {{ ()({}) }}", args.into_iter().format(", ")))
+}
+
 pub fn ident_pat(name: ast::Name) -> ast::IdentPat {
     return from_text(name.text());