16 files changed, 25 insertions, 24 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 477440f5f..e101ce4af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -592,6 +592,7 @@ dependencies = [
  "ide_assists",
  "ide_completion",
  "ide_db",
+ "ide_ssr",
  "indexmap",
  "itertools 0.10.0",
  "log",
@@ -600,7 +601,6 @@ dependencies = [
  "pulldown-cmark",
  "pulldown-cmark-to-cmark",
  "rustc-hash",
- "ssr",
  "stdx",
  "syntax",
  "test_utils",
@@ -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 b7152c839..f6aaaeda4 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -28,7 +28,7 @@ cfg = { path = "../cfg", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 test_utils = { path = "../test_utils", 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/lib.rs b/crates/ide/src/lib.rs
index eb26d13b9..b600178ee 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -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 mut match_finder = ssr::MatchFinder::in_context(db, resolve_context, selections);
+            let rule: ide_ssr::SsrRule = query.parse()?;
+            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/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;