57 files changed, 34 insertions, 35 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 4d8b74839..621be0832 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,6 +47,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
 
 [[package]]
+name = "assists"
+version = "0.0.0"
+dependencies = [
+ "base_db",
+ "either",
+ "hir",
+ "ide_db",
+ "itertools",
+ "profile",
+ "rustc-hash",
+ "stdx",
+ "syntax",
+ "test_utils",
+ "text_edit",
+]
+
+[[package]]
 name = "atty"
 version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1103,26 +1120,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "ra_assists"
-version = "0.1.0"
-dependencies = [
- "base_db",
- "either",
- "hir",
- "ide_db",
- "itertools",
- "profile",
- "rustc-hash",
- "stdx",
- "syntax",
- "test_utils",
- "text_edit",
-]
-
-[[package]]
 name = "ra_ide"
 version = "0.1.0"
 dependencies = [
+ "assists",
  "base_db",
  "cfg",
  "either",
@@ -1134,7 +1135,6 @@ dependencies = [
  "log",
  "oorandom",
  "profile",
- "ra_assists",
  "rustc-hash",
  "ssr",
  "stdx",
diff --git a/crates/ra_assists/Cargo.toml b/crates/assists/Cargo.toml
index 19e7591f7..a560a35c7 100644
--- a/crates/ra_assists/Cargo.toml
+++ b/crates/assists/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-edition = "2018"
-name = "ra_assists"
-version = "0.1.0"
-authors = ["rust-analyzer developers"]
+name = "assists"
+version = "0.0.0"
 license = "MIT OR Apache-2.0"
+authors = ["rust-analyzer developers"]
+edition = "2018"
 
 [lib]
 doctest = false
@@ -14,7 +14,6 @@ itertools = "0.9.0"
 either = "1.5.3"
 
 stdx = { path = "../stdx" }
-
 syntax = { path = "../syntax" }
 text_edit = { path = "../text_edit" }
 profile = { path = "../profile" }
diff --git a/crates/ra_assists/src/assist_config.rs b/crates/assists/src/assist_config.rs
index cda2abfb9..cda2abfb9 100644
--- a/crates/ra_assists/src/assist_config.rs
+++ b/crates/assists/src/assist_config.rs
diff --git a/crates/ra_assists/src/assist_context.rs b/crates/assists/src/assist_context.rs
index 79574b9ac..79574b9ac 100644
--- a/crates/ra_assists/src/assist_context.rs
+++ b/crates/assists/src/assist_context.rs
diff --git a/crates/ra_assists/src/ast_transform.rs b/crates/assists/src/ast_transform.rs
index 4c41c16d8..4c41c16d8 100644
--- a/crates/ra_assists/src/ast_transform.rs
+++ b/crates/assists/src/ast_transform.rs
diff --git a/crates/ra_assists/src/handlers/add_custom_impl.rs b/crates/assists/src/handlers/add_custom_impl.rs
index 8757fa33f..8757fa33f 100644
--- a/crates/ra_assists/src/handlers/add_custom_impl.rs
+++ b/crates/assists/src/handlers/add_custom_impl.rs
diff --git a/crates/ra_assists/src/handlers/add_explicit_type.rs b/crates/assists/src/handlers/add_explicit_type.rs
index 563cbf505..563cbf505 100644
--- a/crates/ra_assists/src/handlers/add_explicit_type.rs
+++ b/crates/assists/src/handlers/add_explicit_type.rs
diff --git a/crates/ra_assists/src/handlers/add_missing_impl_members.rs b/crates/assists/src/handlers/add_missing_impl_members.rs
index 81b61ebf8..81b61ebf8 100644
--- a/crates/ra_assists/src/handlers/add_missing_impl_members.rs
+++ b/crates/assists/src/handlers/add_missing_impl_members.rs
diff --git a/crates/ra_assists/src/handlers/add_turbo_fish.rs b/crates/assists/src/handlers/add_turbo_fish.rs
index f4f997d8e..f4f997d8e 100644
--- a/crates/ra_assists/src/handlers/add_turbo_fish.rs
+++ b/crates/assists/src/handlers/add_turbo_fish.rs
diff --git a/crates/ra_assists/src/handlers/apply_demorgan.rs b/crates/assists/src/handlers/apply_demorgan.rs
index 1a6fdafda..1a6fdafda 100644
--- a/crates/ra_assists/src/handlers/apply_demorgan.rs
+++ b/crates/assists/src/handlers/apply_demorgan.rs
diff --git a/crates/ra_assists/src/handlers/auto_import.rs b/crates/assists/src/handlers/auto_import.rs
index cce789972..cce789972 100644
--- a/crates/ra_assists/src/handlers/auto_import.rs
+++ b/crates/assists/src/handlers/auto_import.rs
diff --git a/crates/ra_assists/src/handlers/change_return_type_to_result.rs b/crates/assists/src/handlers/change_return_type_to_result.rs
index be480943c..be480943c 100644
--- a/crates/ra_assists/src/handlers/change_return_type_to_result.rs
+++ b/crates/assists/src/handlers/change_return_type_to_result.rs
diff --git a/crates/ra_assists/src/handlers/change_visibility.rs b/crates/assists/src/handlers/change_visibility.rs
index 32dc05378..32dc05378 100644
--- a/crates/ra_assists/src/handlers/change_visibility.rs
+++ b/crates/assists/src/handlers/change_visibility.rs
diff --git a/crates/ra_assists/src/handlers/early_return.rs b/crates/assists/src/handlers/early_return.rs
index 7fd78e9d4..7fd78e9d4 100644
--- a/crates/ra_assists/src/handlers/early_return.rs
+++ b/crates/assists/src/handlers/early_return.rs
diff --git a/crates/ra_assists/src/handlers/expand_glob_import.rs b/crates/assists/src/handlers/expand_glob_import.rs
index f690ec343..f690ec343 100644
--- a/crates/ra_assists/src/handlers/expand_glob_import.rs
+++ b/crates/assists/src/handlers/expand_glob_import.rs
diff --git a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
index 4bcdae7ba..4bcdae7ba 100644
--- a/crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
diff --git a/crates/ra_assists/src/handlers/extract_variable.rs b/crates/assists/src/handlers/extract_variable.rs
index d2ae137cd..d2ae137cd 100644
--- a/crates/ra_assists/src/handlers/extract_variable.rs
+++ b/crates/assists/src/handlers/extract_variable.rs
diff --git a/crates/ra_assists/src/handlers/fill_match_arms.rs b/crates/assists/src/handlers/fill_match_arms.rs
index 3d9bdb2bf..3d9bdb2bf 100644
--- a/crates/ra_assists/src/handlers/fill_match_arms.rs
+++ b/crates/assists/src/handlers/fill_match_arms.rs
diff --git a/crates/ra_assists/src/handlers/fix_visibility.rs b/crates/assists/src/handlers/fix_visibility.rs
index 7cd76ea06..7cd76ea06 100644
--- a/crates/ra_assists/src/handlers/fix_visibility.rs
+++ b/crates/assists/src/handlers/fix_visibility.rs
diff --git a/crates/ra_assists/src/handlers/flip_binexpr.rs b/crates/assists/src/handlers/flip_binexpr.rs
index 404f06133..404f06133 100644
--- a/crates/ra_assists/src/handlers/flip_binexpr.rs
+++ b/crates/assists/src/handlers/flip_binexpr.rs
diff --git a/crates/ra_assists/src/handlers/flip_comma.rs b/crates/assists/src/handlers/flip_comma.rs
index 5c69db53e..5c69db53e 100644
--- a/crates/ra_assists/src/handlers/flip_comma.rs
+++ b/crates/assists/src/handlers/flip_comma.rs
diff --git a/crates/ra_assists/src/handlers/flip_trait_bound.rs b/crates/assists/src/handlers/flip_trait_bound.rs
index 347e79b1d..347e79b1d 100644
--- a/crates/ra_assists/src/handlers/flip_trait_bound.rs
+++ b/crates/assists/src/handlers/flip_trait_bound.rs
diff --git a/crates/ra_assists/src/handlers/generate_derive.rs b/crates/assists/src/handlers/generate_derive.rs
index 314504e15..314504e15 100644
--- a/crates/ra_assists/src/handlers/generate_derive.rs
+++ b/crates/assists/src/handlers/generate_derive.rs
diff --git a/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs b/crates/assists/src/handlers/generate_from_impl_for_enum.rs
index 7f04b9572..7f04b9572 100644
--- a/crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs
+++ b/crates/assists/src/handlers/generate_from_impl_for_enum.rs
diff --git a/crates/ra_assists/src/handlers/generate_function.rs b/crates/assists/src/handlers/generate_function.rs
index b38d64058..b38d64058 100644
--- a/crates/ra_assists/src/handlers/generate_function.rs
+++ b/crates/assists/src/handlers/generate_function.rs
diff --git a/crates/ra_assists/src/handlers/generate_impl.rs b/crates/assists/src/handlers/generate_impl.rs
index 9989109b5..9989109b5 100644
--- a/crates/ra_assists/src/handlers/generate_impl.rs
+++ b/crates/assists/src/handlers/generate_impl.rs
diff --git a/crates/ra_assists/src/handlers/generate_new.rs b/crates/assists/src/handlers/generate_new.rs
index 7db10f276..7db10f276 100644
--- a/crates/ra_assists/src/handlers/generate_new.rs
+++ b/crates/assists/src/handlers/generate_new.rs
diff --git a/crates/ra_assists/src/handlers/inline_local_variable.rs b/crates/assists/src/handlers/inline_local_variable.rs
index 2b52b333b..2b52b333b 100644
--- a/crates/ra_assists/src/handlers/inline_local_variable.rs
+++ b/crates/assists/src/handlers/inline_local_variable.rs
diff --git a/crates/ra_assists/src/handlers/introduce_named_lifetime.rs b/crates/assists/src/handlers/introduce_named_lifetime.rs
index 5f623e5f7..5f623e5f7 100644
--- a/crates/ra_assists/src/handlers/introduce_named_lifetime.rs
+++ b/crates/assists/src/handlers/introduce_named_lifetime.rs
diff --git a/crates/ra_assists/src/handlers/invert_if.rs b/crates/assists/src/handlers/invert_if.rs
index f0e047538..f0e047538 100644
--- a/crates/ra_assists/src/handlers/invert_if.rs
+++ b/crates/assists/src/handlers/invert_if.rs
diff --git a/crates/ra_assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs
index 47d465404..47d465404 100644
--- a/crates/ra_assists/src/handlers/merge_imports.rs
+++ b/crates/assists/src/handlers/merge_imports.rs
diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/assists/src/handlers/merge_match_arms.rs
index c347eb40e..c347eb40e 100644
--- a/crates/ra_assists/src/handlers/merge_match_arms.rs
+++ b/crates/assists/src/handlers/merge_match_arms.rs
diff --git a/crates/ra_assists/src/handlers/move_bounds.rs b/crates/assists/src/handlers/move_bounds.rs
index e2e461520..e2e461520 100644
--- a/crates/ra_assists/src/handlers/move_bounds.rs
+++ b/crates/assists/src/handlers/move_bounds.rs
diff --git a/crates/ra_assists/src/handlers/move_guard.rs b/crates/assists/src/handlers/move_guard.rs
index 452115fe6..452115fe6 100644
--- a/crates/ra_assists/src/handlers/move_guard.rs
+++ b/crates/assists/src/handlers/move_guard.rs
diff --git a/crates/ra_assists/src/handlers/raw_string.rs b/crates/assists/src/handlers/raw_string.rs
index 9ddd116e0..9ddd116e0 100644
--- a/crates/ra_assists/src/handlers/raw_string.rs
+++ b/crates/assists/src/handlers/raw_string.rs
diff --git a/crates/ra_assists/src/handlers/remove_dbg.rs b/crates/assists/src/handlers/remove_dbg.rs
index f3dcca534..f3dcca534 100644
--- a/crates/ra_assists/src/handlers/remove_dbg.rs
+++ b/crates/assists/src/handlers/remove_dbg.rs
diff --git a/crates/ra_assists/src/handlers/remove_mut.rs b/crates/assists/src/handlers/remove_mut.rs
index 44f41daa9..44f41daa9 100644
--- a/crates/ra_assists/src/handlers/remove_mut.rs
+++ b/crates/assists/src/handlers/remove_mut.rs
diff --git a/crates/ra_assists/src/handlers/reorder_fields.rs b/crates/assists/src/handlers/reorder_fields.rs
index 527f457a7..527f457a7 100644
--- a/crates/ra_assists/src/handlers/reorder_fields.rs
+++ b/crates/assists/src/handlers/reorder_fields.rs
diff --git a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs b/crates/assists/src/handlers/replace_if_let_with_match.rs
index 79097621e..79097621e 100644
--- a/crates/ra_assists/src/handlers/replace_if_let_with_match.rs
+++ b/crates/assists/src/handlers/replace_if_let_with_match.rs
diff --git a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs b/crates/assists/src/handlers/replace_let_with_if_let.rs
index ed6d0c29b..ed6d0c29b 100644
--- a/crates/ra_assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/assists/src/handlers/replace_let_with_if_let.rs
diff --git a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs b/crates/assists/src/handlers/replace_qualified_name_with_use.rs
index 011bf1106..011bf1106 100644
--- a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/assists/src/handlers/replace_qualified_name_with_use.rs
diff --git a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs b/crates/assists/src/handlers/replace_unwrap_with_match.rs
index 9705f11b7..9705f11b7 100644
--- a/crates/ra_assists/src/handlers/replace_unwrap_with_match.rs
+++ b/crates/assists/src/handlers/replace_unwrap_with_match.rs
diff --git a/crates/ra_assists/src/handlers/split_import.rs b/crates/assists/src/handlers/split_import.rs
index 15e67eaa1..15e67eaa1 100644
--- a/crates/ra_assists/src/handlers/split_import.rs
+++ b/crates/assists/src/handlers/split_import.rs
diff --git a/crates/ra_assists/src/handlers/unwrap_block.rs b/crates/assists/src/handlers/unwrap_block.rs
index 3851aeb3e..3851aeb3e 100644
--- a/crates/ra_assists/src/handlers/unwrap_block.rs
+++ b/crates/assists/src/handlers/unwrap_block.rs
diff --git a/crates/ra_assists/src/lib.rs b/crates/assists/src/lib.rs
index f0cf35caf..ae90d68a3 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/assists/src/lib.rs
@@ -1,4 +1,4 @@
-//! `ra_assists` crate provides a bunch of code assists, also known as code
+//! `assists` crate provides a bunch of code assists, also known as code
 //! actions (in LSP) or intentions (in IntelliJ).
 //!
 //! An assist is a micro-refactoring, which is automatically activated in
diff --git a/crates/ra_assists/src/tests.rs b/crates/assists/src/tests.rs
index ba1fb543b..ba1fb543b 100644
--- a/crates/ra_assists/src/tests.rs
+++ b/crates/assists/src/tests.rs
diff --git a/crates/ra_assists/src/tests/generated.rs b/crates/assists/src/tests/generated.rs
index d16e6fb0a..d16e6fb0a 100644
--- a/crates/ra_assists/src/tests/generated.rs
+++ b/crates/assists/src/tests/generated.rs
diff --git a/crates/ra_assists/src/utils.rs b/crates/assists/src/utils.rs
index 84ccacafe..84ccacafe 100644
--- a/crates/ra_assists/src/utils.rs
+++ b/crates/assists/src/utils.rs
diff --git a/crates/ra_assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs
index 50a62ee82..50a62ee82 100644
--- a/crates/ra_assists/src/utils/insert_use.rs
+++ b/crates/assists/src/utils/insert_use.rs
diff --git a/crates/ide_db/src/imports_locator.rs b/crates/ide_db/src/imports_locator.rs
index 1d0c20291..ed67e3553 100644
--- a/crates/ide_db/src/imports_locator.rs
+++ b/crates/ide_db/src/imports_locator.rs
@@ -1,5 +1,5 @@
-//! This module contains an import search funcionality that is provided to the ra_assists module.
-//! Later, this should be moved away to a separate crate that is accessible from the ra_assists module.
+//! This module contains an import search funcionality that is provided to the assists module.
+//! Later, this should be moved away to a separate crate that is accessible from the assists module.
 
 use hir::{Crate, MacroDef, ModuleDef, Semantics};
 use syntax::{ast, AstNode, SyntaxKind::NAME};
diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml
index 8519e9cca..2eb86755f 100644
--- a/crates/ra_ide/Cargo.toml
+++ b/crates/ra_ide/Cargo.toml
@@ -28,7 +28,7 @@ ide_db = { path = "../ide_db" }
 cfg = { path = "../cfg" }
 profile = { path = "../profile" }
 test_utils = { path = "../test_utils" }
-ra_assists = { path = "../ra_assists" }
+assists = { path = "../assists" }
 ssr = { path = "../ssr" }
 
 # ra_ide should depend only on the top-level `hir` package. if you need
diff --git a/crates/ra_ide/src/completion/complete_postfix.rs b/crates/ra_ide/src/completion/complete_postfix.rs
index 05e15d464..d50b13c52 100644
--- a/crates/ra_ide/src/completion/complete_postfix.rs
+++ b/crates/ra_ide/src/completion/complete_postfix.rs
@@ -1,5 +1,5 @@
 //! FIXME: write short doc here
-use ra_assists::utils::TryEnum;
+use assists::utils::TryEnum;
 use syntax::{
     ast::{self, AstNode},
     TextRange, TextSize,
diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs
index d7edd92cf..478e31262 100644
--- a/crates/ra_ide/src/completion/complete_trait_impl.rs
+++ b/crates/ra_ide/src/completion/complete_trait_impl.rs
@@ -31,8 +31,8 @@
 //! }
 //! ```
 
+use assists::utils::get_missing_assoc_items;
 use hir::{self, Docs, HasSource};
-use ra_assists::utils::get_missing_assoc_items;
 use syntax::{
     ast::{self, edit, Impl},
     AstNode, SyntaxKind, SyntaxNode, TextRange, T,
diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs
index f5c310701..e37702acd 100644
--- a/crates/ra_ide/src/join_lines.rs
+++ b/crates/ra_ide/src/join_lines.rs
@@ -1,5 +1,5 @@
+use assists::utils::extract_trivial_expression;
 use itertools::Itertools;
-use ra_assists::utils::extract_trivial_expression;
 use syntax::{
     algo::{find_covering_element, non_trivia_sibling},
     ast::{self, AstNode, AstToken},
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index bbc9e4b8a..4321a6b74 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -80,6 +80,7 @@ pub use crate::{
     },
 };
 
+pub use assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist};
 pub use base_db::{
     Canceled, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot,
     SourceRootId,
@@ -93,7 +94,6 @@ pub use ide_db::{
     symbol_index::Query,
     RootDatabase,
 };
-pub use ra_assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist};
 pub use ssr::SsrError;
 pub use text_edit::{Indel, TextEdit};
 
@@ -478,7 +478,7 @@ impl Analysis {
         config: &AssistConfig,
         frange: FileRange,
     ) -> Cancelable<Vec<ResolvedAssist>> {
-        self.with_db(|db| ra_assists::Assist::resolved(db, config, frange))
+        self.with_db(|db| assists::Assist::resolved(db, config, frange))
     }
 
     /// Computes unresolved assists (aka code actions aka intentions) for the given
diff --git a/docs/dev/architecture.md b/docs/dev/architecture.md
index 0ffe61026..917f05c81 100644
--- a/docs/dev/architecture.md
+++ b/docs/dev/architecture.md
@@ -56,7 +56,7 @@ In particular, `cargo xtask codegen` generates:
 2. [`ast/generated`](https://github.com/rust-analyzer/rust-analyzer/blob/a0be39296d2925972cacd9fbf8b5fb258fad6947/crates/ra_syntax/src/ast/generated.rs)
   -- AST data structure.
 
-3. [`doc_tests/generated`](https://github.com/rust-analyzer/rust-analyzer/blob/a0be39296d2925972cacd9fbf8b5fb258fad6947/crates/ra_assists/src/doc_tests/generated.rs),
+3. [`doc_tests/generated`](https://github.com/rust-analyzer/rust-analyzer/blob/a0be39296d2925972cacd9fbf8b5fb258fad6947/crates/assists/src/doc_tests/generated.rs),
   [`test_data/parser/inline`](https://github.com/rust-analyzer/rust-analyzer/tree/a0be39296d2925972cacd9fbf8b5fb258fad6947/crates/ra_syntax/test_data/parser/inline)
   -- tests for assists and the parser.
 
diff --git a/xtask/src/codegen.rs b/xtask/src/codegen.rs
index 2acd598d1..78a84f68d 100644
--- a/xtask/src/codegen.rs
+++ b/xtask/src/codegen.rs
@@ -32,8 +32,8 @@ const SYNTAX_KINDS: &str = "crates/parser/src/syntax_kind/generated.rs";
 const AST_NODES: &str = "crates/syntax/src/ast/generated/nodes.rs";
 const AST_TOKENS: &str = "crates/syntax/src/ast/generated/tokens.rs";
 
-const ASSISTS_DIR: &str = "crates/ra_assists/src/handlers";
-const ASSISTS_TESTS: &str = "crates/ra_assists/src/tests/generated.rs";
+const ASSISTS_DIR: &str = "crates/assists/src/handlers";
+const ASSISTS_TESTS: &str = "crates/assists/src/tests/generated.rs";
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum Mode {