86 files changed, 51 insertions, 50 deletions
diff --git a/Cargo.lock b/Cargo.lock
index f047b4508..e101ce4af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -54,23 +54,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 [[package]]
-name = "assists"
-version = "0.0.0"
-dependencies = [
- "either",
- "expect-test",
- "hir",
- "ide_db",
- "itertools 0.10.0",
- "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"
@@ -602,13 +585,14 @@ dependencies = [
 name = "ide"
 version = "0.0.0"
 dependencies = [
- "assists",
 "cfg",
 "either",
 "expect-test",
 "hir",
+ "ide_assists",
 "ide_completion",
 "ide_db",
+ "ide_ssr",
 "indexmap",
 "itertools 0.10.0",
 "log",
@@ -617,7 +601,6 @@ dependencies = [
 "pulldown-cmark",
 "pulldown-cmark-to-cmark",
 "rustc-hash",
- "ssr",
 "stdx",
 "syntax",
 "test_utils",
@@ -626,6 +609,23 @@ dependencies = [
 ]
 [[package]]
+name = "ide_assists"
+version = "0.0.0"
+dependencies = [
+ "either",
+ "expect-test",
+ "hir",
+ "ide_db",
+ "itertools 0.10.0",
+ "profile",
+ "rustc-hash",
+ "stdx",
+ "syntax",
+ "test_utils",
+ "text_edit",
+]
+[[package]]
 name = "ide_completion"
 version = "0.0.0"
 dependencies = [
@@ -666,6 +666,20 @@ dependencies = [
 ]
 [[package]]
+name = "ide_ssr"
+version = "0.0.0"
+dependencies = [
+ "expect-test",
+ "hir",
+ "ide_db",
+ "itertools 0.10.0",
+ "rustc-hash",
+ "syntax",
+ "test_utils",
+ "text_edit",
+]
+[[package]]
 name = "idna"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1348,6 +1362,7 @@ dependencies = [
 "hir_ty",
 "ide",
 "ide_db",
+ "ide_ssr",
 "itertools 0.10.0",
 "jemallocator",
 "jod-thread",
@@ -1367,7 +1382,6 @@ dependencies = [
 "serde",
 "serde_json",
 "serde_path_to_error",
- "ssr",
 "stdx",
 "syntax",
 "test_utils",
@@ -1573,20 +1587,6 @@ dependencies = [
 ]
 [[package]]
-name = "ssr"
-version = "0.0.0"
-dependencies = [
- "expect-test",
- "hir",
- "ide_db",
- "itertools 0.10.0",
- "rustc-hash",
- "syntax",
- "test_utils",
- "text_edit",
-]
-[[package]]
 name = "stdx"
 version = "0.0.0"
 dependencies = [
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index 3cbe3a397..f6aaaeda4 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -27,8 +27,8 @@ ide_db = { path = "../ide_db", version = "0.0.0" }
 cfg = { path = "../cfg", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 test_utils = { path = "../test_utils", version = "0.0.0" }
-assists = { path = "../assists", version = "0.0.0" }
+ide_assists = { path = "../ide_assists", version = "0.0.0" }
-ssr = { path = "../ssr", version = "0.0.0" }
+ide_ssr = { path = "../ide_ssr", version = "0.0.0" }
 ide_completion = { path = "../ide_completion", version = "0.0.0" }
 # ide should depend only on the top-level `hir` package. if you need
diff --git a/crates/ide/src/fn_references.rs b/crates/ide/src/fn_references.rs
index f6e5a522b..1a99a1f37 100644
--- a/crates/ide/src/fn_references.rs
+++ b/crates/ide/src/fn_references.rs
@@ -1,8 +1,8 @@
 //! This module implements a methods and free functions search in the specified file.
 //! We have to skip tests, so cannot reuse file_structure module.
-use assists::utils::test_related_attribute;
 use hir::Semantics;
+use ide_assists::utils::test_related_attribute;
 use ide_db::RootDatabase;
 use syntax::{ast, ast::NameOwner, AstNode, SyntaxNode};
diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs
index e3f3985d1..2c077ed1f 100644
--- a/crates/ide/src/join_lines.rs
+++ b/crates/ide/src/join_lines.rs
@@ -1,4 +1,4 @@
-use assists::utils::extract_trivial_expression;
+use ide_assists::utils::extract_trivial_expression;
 use itertools::Itertools;
 use syntax::{
    algo::non_trivia_sibling,
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index f47ec61fe..b600178ee 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -82,8 +82,8 @@ pub use crate::{
        HlRange,
    },
 };
-pub use assists::{Assist, AssistConfig, AssistId, AssistKind};
 pub use hir::{Documentation, Semantics};
+pub use ide_assists::{Assist, AssistConfig, AssistId, AssistKind};
 pub use ide_completion::{
    CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit,
    InsertTextFormat,
@@ -101,7 +101,7 @@ pub use ide_db::{
    symbol_index::Query,
    RootDatabase,
 };
-pub use ssr::SsrError;
+pub use ide_ssr::SsrError;
 pub use syntax::{TextRange, TextSize};
 pub use text_edit::{Indel, TextEdit};
@@ -549,8 +549,9 @@ impl Analysis {
        selections: Vec<FileRange>,
    ) -> Cancelable<Result<SourceChange, SsrError>> {
        self.with_db(|db| {
-            let rule: ssr::SsrRule = query.parse()?;
+            let rule: ide_ssr::SsrRule = query.parse()?;
-            let mut match_finder = ssr::MatchFinder::in_context(db, resolve_context, selections);
+            let mut match_finder =
+                ide_ssr::MatchFinder::in_context(db, resolve_context, selections);
            match_finder.add_rule(rule)?;
            let edits = if parse_only { Default::default() } else { match_finder.edits() };
            Ok(SourceChange::from(edits))
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index 33170906d..1e7baed20 100644
--- a/crates/ide/src/runnables.rs
+++ b/crates/ide/src/runnables.rs
@@ -1,8 +1,8 @@
 use std::fmt;
-use assists::utils::test_related_attribute;
 use cfg::CfgExpr;
 use hir::{AsAssocItem, HasAttrs, HasSource, Semantics};
+use ide_assists::utils::test_related_attribute;
 use ide_db::{defs::Definition, RootDatabase, SymbolKind};
 use itertools::Itertools;
 use syntax::{
diff --git a/crates/assists/Cargo.toml b/crates/ide_assists/Cargo.toml
index c78cb99af..a34bdd6c3 100644
--- a/crates/assists/Cargo.toml
+++ b/crates/ide_assists/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "assists"
+name = "ide_assists"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
diff --git a/crates/assists/src/assist_config.rs b/crates/ide_assists/src/assist_config.rs
index 9cabf037c..9cabf037c 100644
--- a/crates/assists/src/assist_config.rs
+++ b/crates/ide_assists/src/assist_config.rs
diff --git a/crates/assists/src/assist_context.rs b/crates/ide_assists/src/assist_context.rs
index bba6c08e0..bba6c08e0 100644
--- a/crates/assists/src/assist_context.rs
+++ b/crates/ide_assists/src/assist_context.rs
diff --git a/crates/assists/src/ast_transform.rs b/crates/ide_assists/src/ast_transform.rs
index 4a3ed7783..4a3ed7783 100644
--- a/crates/assists/src/ast_transform.rs
+++ b/crates/ide_assists/src/ast_transform.rs
diff --git a/crates/assists/src/handlers/add_explicit_type.rs b/crates/ide_assists/src/handlers/add_explicit_type.rs
index cb1548cef..cb1548cef 100644
--- a/crates/assists/src/handlers/add_explicit_type.rs
+++ b/crates/ide_assists/src/handlers/add_explicit_type.rs
diff --git a/crates/assists/src/handlers/add_lifetime_to_type.rs b/crates/ide_assists/src/handlers/add_lifetime_to_type.rs
index 2edf7b204..2edf7b204 100644
--- a/crates/assists/src/handlers/add_lifetime_to_type.rs
+++ b/crates/ide_assists/src/handlers/add_lifetime_to_type.rs
diff --git a/crates/assists/src/handlers/add_missing_impl_members.rs b/crates/ide_assists/src/handlers/add_missing_impl_members.rs
index 63cea754d..63cea754d 100644
--- a/crates/assists/src/handlers/add_missing_impl_members.rs
+++ b/crates/ide_assists/src/handlers/add_missing_impl_members.rs
diff --git a/crates/assists/src/handlers/add_turbo_fish.rs b/crates/ide_assists/src/handlers/add_turbo_fish.rs
index 8e9ea4fad..8e9ea4fad 100644
--- a/crates/assists/src/handlers/add_turbo_fish.rs
+++ b/crates/ide_assists/src/handlers/add_turbo_fish.rs
diff --git a/crates/assists/src/handlers/apply_demorgan.rs b/crates/ide_assists/src/handlers/apply_demorgan.rs
index ed4d11455..ed4d11455 100644
--- a/crates/assists/src/handlers/apply_demorgan.rs
+++ b/crates/ide_assists/src/handlers/apply_demorgan.rs
diff --git a/crates/assists/src/handlers/auto_import.rs b/crates/ide_assists/src/handlers/auto_import.rs
index e93901cb3..e93901cb3 100644
--- a/crates/assists/src/handlers/auto_import.rs
+++ b/crates/ide_assists/src/handlers/auto_import.rs
diff --git a/crates/assists/src/handlers/change_visibility.rs b/crates/ide_assists/src/handlers/change_visibility.rs
index ac8c44124..ac8c44124 100644
--- a/crates/assists/src/handlers/change_visibility.rs
+++ b/crates/ide_assists/src/handlers/change_visibility.rs
diff --git a/crates/assists/src/handlers/convert_integer_literal.rs b/crates/ide_assists/src/handlers/convert_integer_literal.rs
index a8a819cfc..a8a819cfc 100644
--- a/crates/assists/src/handlers/convert_integer_literal.rs
+++ b/crates/ide_assists/src/handlers/convert_integer_literal.rs
diff --git a/crates/assists/src/handlers/early_return.rs b/crates/ide_assists/src/handlers/early_return.rs
index 6b87c3c05..6b87c3c05 100644
--- a/crates/assists/src/handlers/early_return.rs
+++ b/crates/ide_assists/src/handlers/early_return.rs
diff --git a/crates/assists/src/handlers/expand_glob_import.rs b/crates/ide_assists/src/handlers/expand_glob_import.rs
index 5fe617ba4..5fe617ba4 100644
--- a/crates/assists/src/handlers/expand_glob_import.rs
+++ b/crates/ide_assists/src/handlers/expand_glob_import.rs
diff --git a/crates/assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
index 9f34cc725..9f34cc725 100644
--- a/crates/assists/src/handlers/extract_function.rs
+++ b/crates/ide_assists/src/handlers/extract_function.rs
diff --git a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
index 5c7678b53..5c7678b53 100644
--- a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
diff --git a/crates/assists/src/handlers/extract_variable.rs b/crates/ide_assists/src/handlers/extract_variable.rs
index 98f3dc6ca..98f3dc6ca 100644
--- a/crates/assists/src/handlers/extract_variable.rs
+++ b/crates/ide_assists/src/handlers/extract_variable.rs
diff --git a/crates/assists/src/handlers/fill_match_arms.rs b/crates/ide_assists/src/handlers/fill_match_arms.rs
index 7086e47d2..7086e47d2 100644
--- a/crates/assists/src/handlers/fill_match_arms.rs
+++ b/crates/ide_assists/src/handlers/fill_match_arms.rs
diff --git a/crates/assists/src/handlers/fix_visibility.rs b/crates/ide_assists/src/handlers/fix_visibility.rs
index 6c7824e55..6c7824e55 100644
--- a/crates/assists/src/handlers/fix_visibility.rs
+++ b/crates/ide_assists/src/handlers/fix_visibility.rs
diff --git a/crates/assists/src/handlers/flip_binexpr.rs b/crates/ide_assists/src/handlers/flip_binexpr.rs
index 209e5d43c..209e5d43c 100644
--- a/crates/assists/src/handlers/flip_binexpr.rs
+++ b/crates/ide_assists/src/handlers/flip_binexpr.rs
diff --git a/crates/assists/src/handlers/flip_comma.rs b/crates/ide_assists/src/handlers/flip_comma.rs
index 18cf64a34..18cf64a34 100644
--- a/crates/assists/src/handlers/flip_comma.rs
+++ b/crates/ide_assists/src/handlers/flip_comma.rs
diff --git a/crates/assists/src/handlers/flip_trait_bound.rs b/crates/ide_assists/src/handlers/flip_trait_bound.rs
index d419d263e..d419d263e 100644
--- a/crates/assists/src/handlers/flip_trait_bound.rs
+++ b/crates/ide_assists/src/handlers/flip_trait_bound.rs
diff --git a/crates/assists/src/handlers/generate_default_from_enum_variant.rs b/crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs
index 6a2ab9596..6a2ab9596 100644
--- a/crates/assists/src/handlers/generate_default_from_enum_variant.rs
+++ b/crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs
diff --git a/crates/assists/src/handlers/generate_derive.rs b/crates/ide_assists/src/handlers/generate_derive.rs
index adae8ab7e..adae8ab7e 100644
--- a/crates/assists/src/handlers/generate_derive.rs
+++ b/crates/ide_assists/src/handlers/generate_derive.rs
diff --git a/crates/assists/src/handlers/generate_enum_match_method.rs b/crates/ide_assists/src/handlers/generate_enum_match_method.rs
index aeb887e71..aeb887e71 100644
--- a/crates/assists/src/handlers/generate_enum_match_method.rs
+++ b/crates/ide_assists/src/handlers/generate_enum_match_method.rs
diff --git a/crates/assists/src/handlers/generate_from_impl_for_enum.rs b/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs
index d9388a737..d9388a737 100644
--- a/crates/assists/src/handlers/generate_from_impl_for_enum.rs
+++ b/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs
diff --git a/crates/assists/src/handlers/generate_function.rs b/crates/ide_assists/src/handlers/generate_function.rs
index 959824981..959824981 100644
--- a/crates/assists/src/handlers/generate_function.rs
+++ b/crates/ide_assists/src/handlers/generate_function.rs
diff --git a/crates/assists/src/handlers/generate_getter.rs b/crates/ide_assists/src/handlers/generate_getter.rs
index df7d1bb95..df7d1bb95 100644
--- a/crates/assists/src/handlers/generate_getter.rs
+++ b/crates/ide_assists/src/handlers/generate_getter.rs
diff --git a/crates/assists/src/handlers/generate_getter_mut.rs b/crates/ide_assists/src/handlers/generate_getter_mut.rs
index 821c2eed5..821c2eed5 100644
--- a/crates/assists/src/handlers/generate_getter_mut.rs
+++ b/crates/ide_assists/src/handlers/generate_getter_mut.rs
diff --git a/crates/assists/src/handlers/generate_impl.rs b/crates/ide_assists/src/handlers/generate_impl.rs
index a8e3c4fc2..a8e3c4fc2 100644
--- a/crates/assists/src/handlers/generate_impl.rs
+++ b/crates/ide_assists/src/handlers/generate_impl.rs
diff --git a/crates/assists/src/handlers/generate_new.rs b/crates/ide_assists/src/handlers/generate_new.rs
index 8ce5930b7..8ce5930b7 100644
--- a/crates/assists/src/handlers/generate_new.rs
+++ b/crates/ide_assists/src/handlers/generate_new.rs
diff --git a/crates/assists/src/handlers/generate_setter.rs b/crates/ide_assists/src/handlers/generate_setter.rs
index 288cf745d..288cf745d 100644
--- a/crates/assists/src/handlers/generate_setter.rs
+++ b/crates/ide_assists/src/handlers/generate_setter.rs
diff --git a/crates/assists/src/handlers/infer_function_return_type.rs b/crates/ide_assists/src/handlers/infer_function_return_type.rs
index 5279af1f3..5279af1f3 100644
--- a/crates/assists/src/handlers/infer_function_return_type.rs
+++ b/crates/ide_assists/src/handlers/infer_function_return_type.rs
diff --git a/crates/assists/src/handlers/inline_function.rs b/crates/ide_assists/src/handlers/inline_function.rs
index 6ec99b09b..6ec99b09b 100644
--- a/crates/assists/src/handlers/inline_function.rs
+++ b/crates/ide_assists/src/handlers/inline_function.rs
diff --git a/crates/assists/src/handlers/inline_local_variable.rs b/crates/ide_assists/src/handlers/inline_local_variable.rs
index da5522670..da5522670 100644
--- a/crates/assists/src/handlers/inline_local_variable.rs
+++ b/crates/ide_assists/src/handlers/inline_local_variable.rs
diff --git a/crates/assists/src/handlers/introduce_named_lifetime.rs b/crates/ide_assists/src/handlers/introduce_named_lifetime.rs
index 02782eb6d..02782eb6d 100644
--- a/crates/assists/src/handlers/introduce_named_lifetime.rs
+++ b/crates/ide_assists/src/handlers/introduce_named_lifetime.rs
diff --git a/crates/assists/src/handlers/invert_if.rs b/crates/ide_assists/src/handlers/invert_if.rs
index 5b69dafd4..5b69dafd4 100644
--- a/crates/assists/src/handlers/invert_if.rs
+++ b/crates/ide_assists/src/handlers/invert_if.rs
diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/ide_assists/src/handlers/merge_imports.rs
index 7bd7e1e36..7bd7e1e36 100644
--- a/crates/assists/src/handlers/merge_imports.rs
+++ b/crates/ide_assists/src/handlers/merge_imports.rs
diff --git a/crates/assists/src/handlers/merge_match_arms.rs b/crates/ide_assists/src/handlers/merge_match_arms.rs
index 9bf076cb9..9bf076cb9 100644
--- a/crates/assists/src/handlers/merge_match_arms.rs
+++ b/crates/ide_assists/src/handlers/merge_match_arms.rs
diff --git a/crates/assists/src/handlers/move_bounds.rs b/crates/ide_assists/src/handlers/move_bounds.rs
index cf260c6f8..cf260c6f8 100644
--- a/crates/assists/src/handlers/move_bounds.rs
+++ b/crates/ide_assists/src/handlers/move_bounds.rs
diff --git a/crates/assists/src/handlers/move_guard.rs b/crates/ide_assists/src/handlers/move_guard.rs
index 3f22302a9..3f22302a9 100644
--- a/crates/assists/src/handlers/move_guard.rs
+++ b/crates/ide_assists/src/handlers/move_guard.rs
diff --git a/crates/assists/src/handlers/move_module_to_file.rs b/crates/ide_assists/src/handlers/move_module_to_file.rs
index 91c395c1b..91c395c1b 100644
--- a/crates/assists/src/handlers/move_module_to_file.rs
+++ b/crates/ide_assists/src/handlers/move_module_to_file.rs
diff --git a/crates/assists/src/handlers/pull_assignment_up.rs b/crates/ide_assists/src/handlers/pull_assignment_up.rs
index 13e1cb754..13e1cb754 100644
--- a/crates/assists/src/handlers/pull_assignment_up.rs
+++ b/crates/ide_assists/src/handlers/pull_assignment_up.rs
diff --git a/crates/assists/src/handlers/qualify_path.rs b/crates/ide_assists/src/handlers/qualify_path.rs
index b0b0d31b4..b0b0d31b4 100644
--- a/crates/assists/src/handlers/qualify_path.rs
+++ b/crates/ide_assists/src/handlers/qualify_path.rs
diff --git a/crates/assists/src/handlers/raw_string.rs b/crates/ide_assists/src/handlers/raw_string.rs
index d95267607..d95267607 100644
--- a/crates/assists/src/handlers/raw_string.rs
+++ b/crates/ide_assists/src/handlers/raw_string.rs
diff --git a/crates/assists/src/handlers/remove_dbg.rs b/crates/ide_assists/src/handlers/remove_dbg.rs
index 6114091f2..6114091f2 100644
--- a/crates/assists/src/handlers/remove_dbg.rs
+++ b/crates/ide_assists/src/handlers/remove_dbg.rs
diff --git a/crates/assists/src/handlers/remove_mut.rs b/crates/ide_assists/src/handlers/remove_mut.rs
index 30d36dacd..30d36dacd 100644
--- a/crates/assists/src/handlers/remove_mut.rs
+++ b/crates/ide_assists/src/handlers/remove_mut.rs
diff --git a/crates/assists/src/handlers/remove_unused_param.rs b/crates/ide_assists/src/handlers/remove_unused_param.rs
index c961680e2..c961680e2 100644
--- a/crates/assists/src/handlers/remove_unused_param.rs
+++ b/crates/ide_assists/src/handlers/remove_unused_param.rs
diff --git a/crates/assists/src/handlers/reorder_fields.rs b/crates/ide_assists/src/handlers/reorder_fields.rs
index fba7d6ddb..fba7d6ddb 100644
--- a/crates/assists/src/handlers/reorder_fields.rs
+++ b/crates/ide_assists/src/handlers/reorder_fields.rs
diff --git a/crates/assists/src/handlers/reorder_impl.rs b/crates/ide_assists/src/handlers/reorder_impl.rs
index 309f291c8..309f291c8 100644
--- a/crates/assists/src/handlers/reorder_impl.rs
+++ b/crates/ide_assists/src/handlers/reorder_impl.rs
diff --git a/crates/assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
index c69bc5cac..c69bc5cac 100644
--- a/crates/assists/src/handlers/replace_derive_with_manual_impl.rs
+++ b/crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
diff --git a/crates/assists/src/handlers/replace_if_let_with_match.rs b/crates/ide_assists/src/handlers/replace_if_let_with_match.rs
index aee880625..aee880625 100644
--- a/crates/assists/src/handlers/replace_if_let_with_match.rs
+++ b/crates/ide_assists/src/handlers/replace_if_let_with_match.rs
diff --git a/crates/assists/src/handlers/replace_impl_trait_with_generic.rs b/crates/ide_assists/src/handlers/replace_impl_trait_with_generic.rs
index ff25b61ea..ff25b61ea 100644
--- a/crates/assists/src/handlers/replace_impl_trait_with_generic.rs
+++ b/crates/ide_assists/src/handlers/replace_impl_trait_with_generic.rs
diff --git a/crates/assists/src/handlers/replace_let_with_if_let.rs b/crates/ide_assists/src/handlers/replace_let_with_if_let.rs
index 5a27ada6b..5a27ada6b 100644
--- a/crates/assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/ide_assists/src/handlers/replace_let_with_if_let.rs
diff --git a/crates/assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs
index f3bc6cf39..f3bc6cf39 100644
--- a/crates/assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs
diff --git a/crates/assists/src/handlers/replace_string_with_char.rs b/crates/ide_assists/src/handlers/replace_string_with_char.rs
index 317318c24..317318c24 100644
--- a/crates/assists/src/handlers/replace_string_with_char.rs
+++ b/crates/ide_assists/src/handlers/replace_string_with_char.rs
diff --git a/crates/assists/src/handlers/replace_unwrap_with_match.rs b/crates/ide_assists/src/handlers/replace_unwrap_with_match.rs
index a986a6ae8..a986a6ae8 100644
--- a/crates/assists/src/handlers/replace_unwrap_with_match.rs
+++ b/crates/ide_assists/src/handlers/replace_unwrap_with_match.rs
diff --git a/crates/assists/src/handlers/split_import.rs b/crates/ide_assists/src/handlers/split_import.rs
index 9319a4267..9319a4267 100644
--- a/crates/assists/src/handlers/split_import.rs
+++ b/crates/ide_assists/src/handlers/split_import.rs
diff --git a/crates/assists/src/handlers/toggle_ignore.rs b/crates/ide_assists/src/handlers/toggle_ignore.rs
index 33e12a7d0..33e12a7d0 100644
--- a/crates/assists/src/handlers/toggle_ignore.rs
+++ b/crates/ide_assists/src/handlers/toggle_ignore.rs
diff --git a/crates/assists/src/handlers/unmerge_use.rs b/crates/ide_assists/src/handlers/unmerge_use.rs
index 3dbef8e51..3dbef8e51 100644
--- a/crates/assists/src/handlers/unmerge_use.rs
+++ b/crates/ide_assists/src/handlers/unmerge_use.rs
diff --git a/crates/assists/src/handlers/unwrap_block.rs b/crates/ide_assists/src/handlers/unwrap_block.rs
index ed6f6177d..ed6f6177d 100644
--- a/crates/assists/src/handlers/unwrap_block.rs
+++ b/crates/ide_assists/src/handlers/unwrap_block.rs
diff --git a/crates/assists/src/handlers/wrap_return_type_in_result.rs b/crates/ide_assists/src/handlers/wrap_return_type_in_result.rs
index fec16fc49..fec16fc49 100644
--- a/crates/assists/src/handlers/wrap_return_type_in_result.rs
+++ b/crates/ide_assists/src/handlers/wrap_return_type_in_result.rs
diff --git a/crates/assists/src/lib.rs b/crates/ide_assists/src/lib.rs
index 7067cf8b6..7067cf8b6 100644
--- a/crates/assists/src/lib.rs
+++ b/crates/ide_assists/src/lib.rs
diff --git a/crates/assists/src/tests.rs b/crates/ide_assists/src/tests.rs
index 384eb7eee..384eb7eee 100644
--- a/crates/assists/src/tests.rs
+++ b/crates/ide_assists/src/tests.rs
diff --git a/crates/assists/src/tests/generated.rs b/crates/ide_assists/src/tests/generated.rs
index 0516deaff..0516deaff 100644
--- a/crates/assists/src/tests/generated.rs
+++ b/crates/ide_assists/src/tests/generated.rs
diff --git a/crates/assists/src/utils.rs b/crates/ide_assists/src/utils.rs
index 0074da741..0074da741 100644
--- a/crates/assists/src/utils.rs
+++ b/crates/ide_assists/src/utils.rs
diff --git a/crates/ssr/Cargo.toml b/crates/ide_ssr/Cargo.toml
index cc8136d22..edbc1846b 100644
--- a/crates/ssr/Cargo.toml
+++ b/crates/ide_ssr/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ssr"
+name = "ide_ssr"
 version = "0.0.0"
 description = "Structural search and replace of Rust code"
 license = "MIT OR Apache-2.0"
diff --git a/crates/ssr/src/errors.rs b/crates/ide_ssr/src/errors.rs
index c02bacae6..c02bacae6 100644
--- a/crates/ssr/src/errors.rs
+++ b/crates/ide_ssr/src/errors.rs
diff --git a/crates/ssr/src/lib.rs b/crates/ide_ssr/src/lib.rs
index a97fc8bca..a97fc8bca 100644
--- a/crates/ssr/src/lib.rs
+++ b/crates/ide_ssr/src/lib.rs
diff --git a/crates/ssr/src/matching.rs b/crates/ide_ssr/src/matching.rs
index df013bae9..df013bae9 100644
--- a/crates/ssr/src/matching.rs
+++ b/crates/ide_ssr/src/matching.rs
diff --git a/crates/ssr/src/nester.rs b/crates/ide_ssr/src/nester.rs
index 6ac355dfc..6ac355dfc 100644
--- a/crates/ssr/src/nester.rs
+++ b/crates/ide_ssr/src/nester.rs
diff --git a/crates/ssr/src/parsing.rs b/crates/ide_ssr/src/parsing.rs
index 3d5e4feb7..3d5e4feb7 100644
--- a/crates/ssr/src/parsing.rs
+++ b/crates/ide_ssr/src/parsing.rs
diff --git a/crates/ssr/src/replacing.rs b/crates/ide_ssr/src/replacing.rs
index 06a94a46c..06a94a46c 100644
--- a/crates/ssr/src/replacing.rs
+++ b/crates/ide_ssr/src/replacing.rs
diff --git a/crates/ssr/src/resolving.rs b/crates/ide_ssr/src/resolving.rs
index 14e5a3b69..14e5a3b69 100644
--- a/crates/ssr/src/resolving.rs
+++ b/crates/ide_ssr/src/resolving.rs
diff --git a/crates/ssr/src/search.rs b/crates/ide_ssr/src/search.rs
index 836eb94b2..836eb94b2 100644
--- a/crates/ssr/src/search.rs
+++ b/crates/ide_ssr/src/search.rs
diff --git a/crates/ssr/src/tests.rs b/crates/ide_ssr/src/tests.rs
index a3ea44f23..a3ea44f23 100644
--- a/crates/ssr/src/tests.rs
+++ b/crates/ide_ssr/src/tests.rs
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 2a5cd59f9..b881cc229 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -53,7 +53,7 @@ cfg = { path = "../cfg", version = "0.0.0" }
 toolchain = { path = "../toolchain", version = "0.0.0" }
 # This should only be used in CLI
-ssr = { path = "../ssr", version = "0.0.0" }
+ide_ssr = { path = "../ide_ssr", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
 hir_def = { path = "../hir_def", version = "0.0.0" }
 hir_ty = { path = "../hir_ty", version = "0.0.0" }
diff --git a/crates/rust-analyzer/src/bin/args.rs b/crates/rust-analyzer/src/bin/args.rs
index 3a7db6a18..164d94a30 100644
--- a/crates/rust-analyzer/src/bin/args.rs
+++ b/crates/rust-analyzer/src/bin/args.rs
@@ -6,9 +6,9 @@
 use std::{env, path::PathBuf};
 use anyhow::{bail, format_err, Result};
+use ide_ssr::{SsrPattern, SsrRule};
 use pico_args::Arguments;
 use rust_analyzer::cli::{AnalysisStatsCmd, BenchCmd, BenchWhat, Position, Verbosity};
-use ssr::{SsrPattern, SsrRule};
 use vfs::AbsPathBuf;
 pub(crate) struct Args {
diff --git a/crates/rust-analyzer/src/cli/ssr.rs b/crates/rust-analyzer/src/cli/ssr.rs
index 71c61ed58..71a8f8fb9 100644
--- a/crates/rust-analyzer/src/cli/ssr.rs
+++ b/crates/rust-analyzer/src/cli/ssr.rs
@@ -4,7 +4,7 @@ use crate::cli::{
    load_cargo::{load_workspace_at, LoadCargoConfig},
    Result,
 };
-use ssr::{MatchFinder, SsrPattern, SsrRule};
+use ide_ssr::{MatchFinder, SsrPattern, SsrRule};
 pub fn apply_ssr_rules(rules: Vec<SsrRule>) -> Result<()> {
    use ide_db::base_db::SourceDatabaseExt;
diff --git a/xtask/src/codegen/gen_assists_docs.rs b/xtask/src/codegen/gen_assists_docs.rs
index 51f58180c..1ae1343a5 100644
--- a/xtask/src/codegen/gen_assists_docs.rs
+++ b/xtask/src/codegen/gen_assists_docs.rs
@@ -32,7 +32,7 @@ struct Assist {
 impl Assist {
    fn collect() -> Result<Vec<Assist>> {
        let mut res = Vec::new();
-        for path in rust_files_in(&project_root().join("crates/assists/src/handlers")) {
+        for path in rust_files_in(&project_root().join("crates/ide_assists/src/handlers")) {
            collect_file(&mut res, path.as_path())?;
        }
        res.sort_by(|lhs, rhs| lhs.id.cmp(&rhs.id));
@@ -135,7 +135,7 @@ r#####"
        buf.push_str(&test)
    }
    let buf = reformat(&buf)?;
-    codegen::update(&project_root().join("crates/assists/src/tests/generated.rs"), &buf, mode)
+    codegen::update(&project_root().join("crates/ide_assists/src/tests/generated.rs"), &buf, mode)
 }
 fn hide_hash_comments(text: &str) -> String {