aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/assists/Cargo.toml (renamed from crates/ra_assists/Cargo.toml)9
-rw-r--r--crates/assists/src/assist_config.rs (renamed from crates/ra_assists/src/assist_config.rs)0
-rw-r--r--crates/assists/src/assist_context.rs (renamed from crates/ra_assists/src/assist_context.rs)0
-rw-r--r--crates/assists/src/ast_transform.rs (renamed from crates/ra_assists/src/ast_transform.rs)0
-rw-r--r--crates/assists/src/handlers/add_custom_impl.rs (renamed from crates/ra_assists/src/handlers/add_custom_impl.rs)0
-rw-r--r--crates/assists/src/handlers/add_explicit_type.rs (renamed from crates/ra_assists/src/handlers/add_explicit_type.rs)0
-rw-r--r--crates/assists/src/handlers/add_missing_impl_members.rs (renamed from crates/ra_assists/src/handlers/add_missing_impl_members.rs)0
-rw-r--r--crates/assists/src/handlers/add_turbo_fish.rs (renamed from crates/ra_assists/src/handlers/add_turbo_fish.rs)0
-rw-r--r--crates/assists/src/handlers/apply_demorgan.rs (renamed from crates/ra_assists/src/handlers/apply_demorgan.rs)0
-rw-r--r--crates/assists/src/handlers/auto_import.rs (renamed from crates/ra_assists/src/handlers/auto_import.rs)0
-rw-r--r--crates/assists/src/handlers/change_return_type_to_result.rs (renamed from crates/ra_assists/src/handlers/change_return_type_to_result.rs)0
-rw-r--r--crates/assists/src/handlers/change_visibility.rs (renamed from crates/ra_assists/src/handlers/change_visibility.rs)0
-rw-r--r--crates/assists/src/handlers/early_return.rs (renamed from crates/ra_assists/src/handlers/early_return.rs)0
-rw-r--r--crates/assists/src/handlers/expand_glob_import.rs (renamed from crates/ra_assists/src/handlers/expand_glob_import.rs)0
-rw-r--r--crates/assists/src/handlers/extract_struct_from_enum_variant.rs (renamed from crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs)0
-rw-r--r--crates/assists/src/handlers/extract_variable.rs (renamed from crates/ra_assists/src/handlers/extract_variable.rs)0
-rw-r--r--crates/assists/src/handlers/fill_match_arms.rs (renamed from crates/ra_assists/src/handlers/fill_match_arms.rs)0
-rw-r--r--crates/assists/src/handlers/fix_visibility.rs (renamed from crates/ra_assists/src/handlers/fix_visibility.rs)0
-rw-r--r--crates/assists/src/handlers/flip_binexpr.rs (renamed from crates/ra_assists/src/handlers/flip_binexpr.rs)0
-rw-r--r--crates/assists/src/handlers/flip_comma.rs (renamed from crates/ra_assists/src/handlers/flip_comma.rs)0
-rw-r--r--crates/assists/src/handlers/flip_trait_bound.rs (renamed from crates/ra_assists/src/handlers/flip_trait_bound.rs)0
-rw-r--r--crates/assists/src/handlers/generate_derive.rs (renamed from crates/ra_assists/src/handlers/generate_derive.rs)0
-rw-r--r--crates/assists/src/handlers/generate_from_impl_for_enum.rs (renamed from crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs)0
-rw-r--r--crates/assists/src/handlers/generate_function.rs (renamed from crates/ra_assists/src/handlers/generate_function.rs)0
-rw-r--r--crates/assists/src/handlers/generate_impl.rs (renamed from crates/ra_assists/src/handlers/generate_impl.rs)0
-rw-r--r--crates/assists/src/handlers/generate_new.rs (renamed from crates/ra_assists/src/handlers/generate_new.rs)0
-rw-r--r--crates/assists/src/handlers/inline_local_variable.rs (renamed from crates/ra_assists/src/handlers/inline_local_variable.rs)0
-rw-r--r--crates/assists/src/handlers/introduce_named_lifetime.rs (renamed from crates/ra_assists/src/handlers/introduce_named_lifetime.rs)0
-rw-r--r--crates/assists/src/handlers/invert_if.rs (renamed from crates/ra_assists/src/handlers/invert_if.rs)0
-rw-r--r--crates/assists/src/handlers/merge_imports.rs (renamed from crates/ra_assists/src/handlers/merge_imports.rs)0
-rw-r--r--crates/assists/src/handlers/merge_match_arms.rs (renamed from crates/ra_assists/src/handlers/merge_match_arms.rs)0
-rw-r--r--crates/assists/src/handlers/move_bounds.rs (renamed from crates/ra_assists/src/handlers/move_bounds.rs)0
-rw-r--r--crates/assists/src/handlers/move_guard.rs (renamed from crates/ra_assists/src/handlers/move_guard.rs)0
-rw-r--r--crates/assists/src/handlers/raw_string.rs (renamed from crates/ra_assists/src/handlers/raw_string.rs)0
-rw-r--r--crates/assists/src/handlers/remove_dbg.rs (renamed from crates/ra_assists/src/handlers/remove_dbg.rs)0
-rw-r--r--crates/assists/src/handlers/remove_mut.rs (renamed from crates/ra_assists/src/handlers/remove_mut.rs)0
-rw-r--r--crates/assists/src/handlers/reorder_fields.rs (renamed from crates/ra_assists/src/handlers/reorder_fields.rs)0
-rw-r--r--crates/assists/src/handlers/replace_if_let_with_match.rs (renamed from crates/ra_assists/src/handlers/replace_if_let_with_match.rs)0
-rw-r--r--crates/assists/src/handlers/replace_let_with_if_let.rs (renamed from crates/ra_assists/src/handlers/replace_let_with_if_let.rs)0
-rw-r--r--crates/assists/src/handlers/replace_qualified_name_with_use.rs (renamed from crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs)0
-rw-r--r--crates/assists/src/handlers/replace_unwrap_with_match.rs (renamed from crates/ra_assists/src/handlers/replace_unwrap_with_match.rs)0
-rw-r--r--crates/assists/src/handlers/split_import.rs (renamed from crates/ra_assists/src/handlers/split_import.rs)0
-rw-r--r--crates/assists/src/handlers/unwrap_block.rs (renamed from crates/ra_assists/src/handlers/unwrap_block.rs)0
-rw-r--r--crates/assists/src/lib.rs (renamed from crates/ra_assists/src/lib.rs)2
-rw-r--r--crates/assists/src/tests.rs (renamed from crates/ra_assists/src/tests.rs)0
-rw-r--r--crates/assists/src/tests/generated.rs (renamed from crates/ra_assists/src/tests/generated.rs)0
-rw-r--r--crates/assists/src/utils.rs (renamed from crates/ra_assists/src/utils.rs)0
-rw-r--r--crates/assists/src/utils/insert_use.rs (renamed from crates/ra_assists/src/utils/insert_use.rs)0
-rw-r--r--crates/ide_db/src/imports_locator.rs4
-rw-r--r--crates/ra_ide/Cargo.toml2
-rw-r--r--crates/ra_ide/src/completion/complete_postfix.rs2
-rw-r--r--crates/ra_ide/src/completion/complete_trait_impl.rs2
-rw-r--r--crates/ra_ide/src/join_lines.rs2
-rw-r--r--crates/ra_ide/src/lib.rs4
54 files changed, 13 insertions, 14 deletions
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 @@
1[package] 1[package]
2edition = "2018" 2name = "assists"
3name = "ra_assists" 3version = "0.0.0"
4version = "0.1.0"
5authors = ["rust-analyzer developers"]
6license = "MIT OR Apache-2.0" 4license = "MIT OR Apache-2.0"
5authors = ["rust-analyzer developers"]
6edition = "2018"
7 7
8[lib] 8[lib]
9doctest = false 9doctest = false
@@ -14,7 +14,6 @@ itertools = "0.9.0"
14either = "1.5.3" 14either = "1.5.3"
15 15
16stdx = { path = "../stdx" } 16stdx = { path = "../stdx" }
17
18syntax = { path = "../syntax" } 17syntax = { path = "../syntax" }
19text_edit = { path = "../text_edit" } 18text_edit = { path = "../text_edit" }
20profile = { path = "../profile" } 19profile = { 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 @@
1//! `ra_assists` crate provides a bunch of code assists, also known as code 1//! `assists` crate provides a bunch of code assists, also known as code
2//! actions (in LSP) or intentions (in IntelliJ). 2//! actions (in LSP) or intentions (in IntelliJ).
3//! 3//!
4//! An assist is a micro-refactoring, which is automatically activated in 4//! 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 @@
1//! This module contains an import search funcionality that is provided to the ra_assists module. 1//! This module contains an import search funcionality that is provided to the assists module.
2//! Later, this should be moved away to a separate crate that is accessible from the ra_assists module. 2//! Later, this should be moved away to a separate crate that is accessible from the assists module.
3 3
4use hir::{Crate, MacroDef, ModuleDef, Semantics}; 4use hir::{Crate, MacroDef, ModuleDef, Semantics};
5use syntax::{ast, AstNode, SyntaxKind::NAME}; 5use 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" }
28cfg = { path = "../cfg" } 28cfg = { path = "../cfg" }
29profile = { path = "../profile" } 29profile = { path = "../profile" }
30test_utils = { path = "../test_utils" } 30test_utils = { path = "../test_utils" }
31ra_assists = { path = "../ra_assists" } 31assists = { path = "../assists" }
32ssr = { path = "../ssr" } 32ssr = { path = "../ssr" }
33 33
34# ra_ide should depend only on the top-level `hir` package. if you need 34# 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 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2use ra_assists::utils::TryEnum; 2use assists::utils::TryEnum;
3use syntax::{ 3use syntax::{
4 ast::{self, AstNode}, 4 ast::{self, AstNode},
5 TextRange, TextSize, 5 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 @@
31//! } 31//! }
32//! ``` 32//! ```
33 33
34use assists::utils::get_missing_assoc_items;
34use hir::{self, Docs, HasSource}; 35use hir::{self, Docs, HasSource};
35use ra_assists::utils::get_missing_assoc_items;
36use syntax::{ 36use syntax::{
37 ast::{self, edit, Impl}, 37 ast::{self, edit, Impl},
38 AstNode, SyntaxKind, SyntaxNode, TextRange, T, 38 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 @@
1use assists::utils::extract_trivial_expression;
1use itertools::Itertools; 2use itertools::Itertools;
2use ra_assists::utils::extract_trivial_expression;
3use syntax::{ 3use syntax::{
4 algo::{find_covering_element, non_trivia_sibling}, 4 algo::{find_covering_element, non_trivia_sibling},
5 ast::{self, AstNode, AstToken}, 5 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::{
80 }, 80 },
81}; 81};
82 82
83pub use assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist};
83pub use base_db::{ 84pub use base_db::{
84 Canceled, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot, 85 Canceled, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot,
85 SourceRootId, 86 SourceRootId,
@@ -93,7 +94,6 @@ pub use ide_db::{
93 symbol_index::Query, 94 symbol_index::Query,
94 RootDatabase, 95 RootDatabase,
95}; 96};
96pub use ra_assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist};
97pub use ssr::SsrError; 97pub use ssr::SsrError;
98pub use text_edit::{Indel, TextEdit}; 98pub use text_edit::{Indel, TextEdit};
99 99
@@ -478,7 +478,7 @@ impl Analysis {
478 config: &AssistConfig, 478 config: &AssistConfig,
479 frange: FileRange, 479 frange: FileRange,
480 ) -> Cancelable<Vec<ResolvedAssist>> { 480 ) -> Cancelable<Vec<ResolvedAssist>> {
481 self.with_db(|db| ra_assists::Assist::resolved(db, config, frange)) 481 self.with_db(|db| assists::Assist::resolved(db, config, frange))
482 } 482 }
483 483
484 /// Computes unresolved assists (aka code actions aka intentions) for the given 484 /// Computes unresolved assists (aka code actions aka intentions) for the given