aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-02-22 20:28:17 +0000
committerGitHub <[email protected]>2021-02-22 20:28:17 +0000
commit27ed1ebf8997cea55fb446ce249b390607b84105 (patch)
treea49a763fee848041fd607f449ad13a0b1040636e
parent8687053b118f47ce1a4962d0baa19b22d40d2758 (diff)
parenteb6cfa7f157690480fca5d55c69dba3fae87ad4f (diff)
Merge #7759
7759: 7526: Rename ide related crates r=Veykril a=chetankhilosiya renamed assists -> ide_assists and ssr -> ide_ssr. the completion crate is already renamed. Co-authored-by: Chetan Khilosiya <[email protected]>
-rw-r--r--Cargo.lock68
-rw-r--r--crates/ide/Cargo.toml4
-rw-r--r--crates/ide/src/fn_references.rs2
-rw-r--r--crates/ide/src/join_lines.rs2
-rw-r--r--crates/ide/src/lib.rs9
-rw-r--r--crates/ide/src/runnables.rs2
-rw-r--r--crates/ide_assists/Cargo.toml (renamed from crates/assists/Cargo.toml)2
-rw-r--r--crates/ide_assists/src/assist_config.rs (renamed from crates/assists/src/assist_config.rs)0
-rw-r--r--crates/ide_assists/src/assist_context.rs (renamed from crates/assists/src/assist_context.rs)0
-rw-r--r--crates/ide_assists/src/ast_transform.rs (renamed from crates/assists/src/ast_transform.rs)0
-rw-r--r--crates/ide_assists/src/handlers/add_explicit_type.rs (renamed from crates/assists/src/handlers/add_explicit_type.rs)0
-rw-r--r--crates/ide_assists/src/handlers/add_lifetime_to_type.rs (renamed from crates/assists/src/handlers/add_lifetime_to_type.rs)0
-rw-r--r--crates/ide_assists/src/handlers/add_missing_impl_members.rs (renamed from crates/assists/src/handlers/add_missing_impl_members.rs)0
-rw-r--r--crates/ide_assists/src/handlers/add_turbo_fish.rs (renamed from crates/assists/src/handlers/add_turbo_fish.rs)0
-rw-r--r--crates/ide_assists/src/handlers/apply_demorgan.rs (renamed from crates/assists/src/handlers/apply_demorgan.rs)0
-rw-r--r--crates/ide_assists/src/handlers/auto_import.rs (renamed from crates/assists/src/handlers/auto_import.rs)0
-rw-r--r--crates/ide_assists/src/handlers/change_visibility.rs (renamed from crates/assists/src/handlers/change_visibility.rs)0
-rw-r--r--crates/ide_assists/src/handlers/convert_integer_literal.rs (renamed from crates/assists/src/handlers/convert_integer_literal.rs)0
-rw-r--r--crates/ide_assists/src/handlers/early_return.rs (renamed from crates/assists/src/handlers/early_return.rs)0
-rw-r--r--crates/ide_assists/src/handlers/expand_glob_import.rs (renamed from crates/assists/src/handlers/expand_glob_import.rs)0
-rw-r--r--crates/ide_assists/src/handlers/extract_function.rs (renamed from crates/assists/src/handlers/extract_function.rs)0
-rw-r--r--crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs (renamed from crates/assists/src/handlers/extract_struct_from_enum_variant.rs)0
-rw-r--r--crates/ide_assists/src/handlers/extract_variable.rs (renamed from crates/assists/src/handlers/extract_variable.rs)0
-rw-r--r--crates/ide_assists/src/handlers/fill_match_arms.rs (renamed from crates/assists/src/handlers/fill_match_arms.rs)0
-rw-r--r--crates/ide_assists/src/handlers/fix_visibility.rs (renamed from crates/assists/src/handlers/fix_visibility.rs)0
-rw-r--r--crates/ide_assists/src/handlers/flip_binexpr.rs (renamed from crates/assists/src/handlers/flip_binexpr.rs)0
-rw-r--r--crates/ide_assists/src/handlers/flip_comma.rs (renamed from crates/assists/src/handlers/flip_comma.rs)0
-rw-r--r--crates/ide_assists/src/handlers/flip_trait_bound.rs (renamed from crates/assists/src/handlers/flip_trait_bound.rs)0
-rw-r--r--crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs (renamed from crates/assists/src/handlers/generate_default_from_enum_variant.rs)0
-rw-r--r--crates/ide_assists/src/handlers/generate_derive.rs (renamed from crates/assists/src/handlers/generate_derive.rs)0
-rw-r--r--crates/ide_assists/src/handlers/generate_enum_match_method.rs (renamed from crates/assists/src/handlers/generate_enum_match_method.rs)0
-rw-r--r--crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs (renamed from crates/assists/src/handlers/generate_from_impl_for_enum.rs)0
-rw-r--r--crates/ide_assists/src/handlers/generate_function.rs (renamed from crates/assists/src/handlers/generate_function.rs)0
-rw-r--r--crates/ide_assists/src/handlers/generate_getter.rs (renamed from crates/assists/src/handlers/generate_getter.rs)0
-rw-r--r--crates/ide_assists/src/handlers/generate_getter_mut.rs (renamed from crates/assists/src/handlers/generate_getter_mut.rs)0
-rw-r--r--crates/ide_assists/src/handlers/generate_impl.rs (renamed from crates/assists/src/handlers/generate_impl.rs)0
-rw-r--r--crates/ide_assists/src/handlers/generate_new.rs (renamed from crates/assists/src/handlers/generate_new.rs)0
-rw-r--r--crates/ide_assists/src/handlers/generate_setter.rs (renamed from crates/assists/src/handlers/generate_setter.rs)0
-rw-r--r--crates/ide_assists/src/handlers/infer_function_return_type.rs (renamed from crates/assists/src/handlers/infer_function_return_type.rs)0
-rw-r--r--crates/ide_assists/src/handlers/inline_function.rs (renamed from crates/assists/src/handlers/inline_function.rs)0
-rw-r--r--crates/ide_assists/src/handlers/inline_local_variable.rs (renamed from crates/assists/src/handlers/inline_local_variable.rs)0
-rw-r--r--crates/ide_assists/src/handlers/introduce_named_lifetime.rs (renamed from crates/assists/src/handlers/introduce_named_lifetime.rs)0
-rw-r--r--crates/ide_assists/src/handlers/invert_if.rs (renamed from crates/assists/src/handlers/invert_if.rs)0
-rw-r--r--crates/ide_assists/src/handlers/merge_imports.rs (renamed from crates/assists/src/handlers/merge_imports.rs)0
-rw-r--r--crates/ide_assists/src/handlers/merge_match_arms.rs (renamed from crates/assists/src/handlers/merge_match_arms.rs)0
-rw-r--r--crates/ide_assists/src/handlers/move_bounds.rs (renamed from crates/assists/src/handlers/move_bounds.rs)0
-rw-r--r--crates/ide_assists/src/handlers/move_guard.rs (renamed from crates/assists/src/handlers/move_guard.rs)0
-rw-r--r--crates/ide_assists/src/handlers/move_module_to_file.rs (renamed from crates/assists/src/handlers/move_module_to_file.rs)0
-rw-r--r--crates/ide_assists/src/handlers/pull_assignment_up.rs (renamed from crates/assists/src/handlers/pull_assignment_up.rs)0
-rw-r--r--crates/ide_assists/src/handlers/qualify_path.rs (renamed from crates/assists/src/handlers/qualify_path.rs)0
-rw-r--r--crates/ide_assists/src/handlers/raw_string.rs (renamed from crates/assists/src/handlers/raw_string.rs)0
-rw-r--r--crates/ide_assists/src/handlers/remove_dbg.rs (renamed from crates/assists/src/handlers/remove_dbg.rs)0
-rw-r--r--crates/ide_assists/src/handlers/remove_mut.rs (renamed from crates/assists/src/handlers/remove_mut.rs)0
-rw-r--r--crates/ide_assists/src/handlers/remove_unused_param.rs (renamed from crates/assists/src/handlers/remove_unused_param.rs)0
-rw-r--r--crates/ide_assists/src/handlers/reorder_fields.rs (renamed from crates/assists/src/handlers/reorder_fields.rs)0
-rw-r--r--crates/ide_assists/src/handlers/reorder_impl.rs (renamed from crates/assists/src/handlers/reorder_impl.rs)0
-rw-r--r--crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs (renamed from crates/assists/src/handlers/replace_derive_with_manual_impl.rs)0
-rw-r--r--crates/ide_assists/src/handlers/replace_if_let_with_match.rs (renamed from crates/assists/src/handlers/replace_if_let_with_match.rs)0
-rw-r--r--crates/ide_assists/src/handlers/replace_impl_trait_with_generic.rs (renamed from crates/assists/src/handlers/replace_impl_trait_with_generic.rs)0
-rw-r--r--crates/ide_assists/src/handlers/replace_let_with_if_let.rs (renamed from crates/assists/src/handlers/replace_let_with_if_let.rs)0
-rw-r--r--crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs (renamed from crates/assists/src/handlers/replace_qualified_name_with_use.rs)0
-rw-r--r--crates/ide_assists/src/handlers/replace_string_with_char.rs (renamed from crates/assists/src/handlers/replace_string_with_char.rs)0
-rw-r--r--crates/ide_assists/src/handlers/replace_unwrap_with_match.rs (renamed from crates/assists/src/handlers/replace_unwrap_with_match.rs)0
-rw-r--r--crates/ide_assists/src/handlers/split_import.rs (renamed from crates/assists/src/handlers/split_import.rs)0
-rw-r--r--crates/ide_assists/src/handlers/toggle_ignore.rs (renamed from crates/assists/src/handlers/toggle_ignore.rs)0
-rw-r--r--crates/ide_assists/src/handlers/unmerge_use.rs (renamed from crates/assists/src/handlers/unmerge_use.rs)0
-rw-r--r--crates/ide_assists/src/handlers/unwrap_block.rs (renamed from crates/assists/src/handlers/unwrap_block.rs)0
-rw-r--r--crates/ide_assists/src/handlers/wrap_return_type_in_result.rs (renamed from crates/assists/src/handlers/wrap_return_type_in_result.rs)0
-rw-r--r--crates/ide_assists/src/lib.rs (renamed from crates/assists/src/lib.rs)0
-rw-r--r--crates/ide_assists/src/tests.rs (renamed from crates/assists/src/tests.rs)0
-rw-r--r--crates/ide_assists/src/tests/generated.rs (renamed from crates/assists/src/tests/generated.rs)0
-rw-r--r--crates/ide_assists/src/utils.rs (renamed from crates/assists/src/utils.rs)0
-rw-r--r--crates/ide_ssr/Cargo.toml (renamed from crates/ssr/Cargo.toml)2
-rw-r--r--crates/ide_ssr/src/errors.rs (renamed from crates/ssr/src/errors.rs)0
-rw-r--r--crates/ide_ssr/src/lib.rs (renamed from crates/ssr/src/lib.rs)0
-rw-r--r--crates/ide_ssr/src/matching.rs (renamed from crates/ssr/src/matching.rs)0
-rw-r--r--crates/ide_ssr/src/nester.rs (renamed from crates/ssr/src/nester.rs)0
-rw-r--r--crates/ide_ssr/src/parsing.rs (renamed from crates/ssr/src/parsing.rs)0
-rw-r--r--crates/ide_ssr/src/replacing.rs (renamed from crates/ssr/src/replacing.rs)0
-rw-r--r--crates/ide_ssr/src/resolving.rs (renamed from crates/ssr/src/resolving.rs)0
-rw-r--r--crates/ide_ssr/src/search.rs (renamed from crates/ssr/src/search.rs)0
-rw-r--r--crates/ide_ssr/src/tests.rs (renamed from crates/ssr/src/tests.rs)0
-rw-r--r--crates/rust-analyzer/Cargo.toml2
-rw-r--r--crates/rust-analyzer/src/bin/args.rs2
-rw-r--r--crates/rust-analyzer/src/cli/ssr.rs2
-rw-r--r--xtask/src/codegen/gen_assists_docs.rs4
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"
54checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" 54checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
55 55
56[[package]] 56[[package]]
57name = "assists"
58version = "0.0.0"
59dependencies = [
60 "either",
61 "expect-test",
62 "hir",
63 "ide_db",
64 "itertools 0.10.0",
65 "profile",
66 "rustc-hash",
67 "stdx",
68 "syntax",
69 "test_utils",
70 "text_edit",
71]
72
73[[package]]
74name = "atty" 57name = "atty"
75version = "0.2.14" 58version = "0.2.14"
76source = "registry+https://github.com/rust-lang/crates.io-index" 59source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -602,13 +585,14 @@ dependencies = [
602name = "ide" 585name = "ide"
603version = "0.0.0" 586version = "0.0.0"
604dependencies = [ 587dependencies = [
605 "assists",
606 "cfg", 588 "cfg",
607 "either", 589 "either",
608 "expect-test", 590 "expect-test",
609 "hir", 591 "hir",
592 "ide_assists",
610 "ide_completion", 593 "ide_completion",
611 "ide_db", 594 "ide_db",
595 "ide_ssr",
612 "indexmap", 596 "indexmap",
613 "itertools 0.10.0", 597 "itertools 0.10.0",
614 "log", 598 "log",
@@ -617,7 +601,6 @@ dependencies = [
617 "pulldown-cmark", 601 "pulldown-cmark",
618 "pulldown-cmark-to-cmark", 602 "pulldown-cmark-to-cmark",
619 "rustc-hash", 603 "rustc-hash",
620 "ssr",
621 "stdx", 604 "stdx",
622 "syntax", 605 "syntax",
623 "test_utils", 606 "test_utils",
@@ -626,6 +609,23 @@ dependencies = [
626] 609]
627 610
628[[package]] 611[[package]]
612name = "ide_assists"
613version = "0.0.0"
614dependencies = [
615 "either",
616 "expect-test",
617 "hir",
618 "ide_db",
619 "itertools 0.10.0",
620 "profile",
621 "rustc-hash",
622 "stdx",
623 "syntax",
624 "test_utils",
625 "text_edit",
626]
627
628[[package]]
629name = "ide_completion" 629name = "ide_completion"
630version = "0.0.0" 630version = "0.0.0"
631dependencies = [ 631dependencies = [
@@ -666,6 +666,20 @@ dependencies = [
666] 666]
667 667
668[[package]] 668[[package]]
669name = "ide_ssr"
670version = "0.0.0"
671dependencies = [
672 "expect-test",
673 "hir",
674 "ide_db",
675 "itertools 0.10.0",
676 "rustc-hash",
677 "syntax",
678 "test_utils",
679 "text_edit",
680]
681
682[[package]]
669name = "idna" 683name = "idna"
670version = "0.2.2" 684version = "0.2.2"
671source = "registry+https://github.com/rust-lang/crates.io-index" 685source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1348,6 +1362,7 @@ dependencies = [
1348 "hir_ty", 1362 "hir_ty",
1349 "ide", 1363 "ide",
1350 "ide_db", 1364 "ide_db",
1365 "ide_ssr",
1351 "itertools 0.10.0", 1366 "itertools 0.10.0",
1352 "jemallocator", 1367 "jemallocator",
1353 "jod-thread", 1368 "jod-thread",
@@ -1367,7 +1382,6 @@ dependencies = [
1367 "serde", 1382 "serde",
1368 "serde_json", 1383 "serde_json",
1369 "serde_path_to_error", 1384 "serde_path_to_error",
1370 "ssr",
1371 "stdx", 1385 "stdx",
1372 "syntax", 1386 "syntax",
1373 "test_utils", 1387 "test_utils",
@@ -1573,20 +1587,6 @@ dependencies = [
1573] 1587]
1574 1588
1575[[package]] 1589[[package]]
1576name = "ssr"
1577version = "0.0.0"
1578dependencies = [
1579 "expect-test",
1580 "hir",
1581 "ide_db",
1582 "itertools 0.10.0",
1583 "rustc-hash",
1584 "syntax",
1585 "test_utils",
1586 "text_edit",
1587]
1588
1589[[package]]
1590name = "stdx" 1590name = "stdx"
1591version = "0.0.0" 1591version = "0.0.0"
1592dependencies = [ 1592dependencies = [
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" }
27cfg = { path = "../cfg", version = "0.0.0" } 27cfg = { path = "../cfg", version = "0.0.0" }
28profile = { path = "../profile", version = "0.0.0" } 28profile = { path = "../profile", version = "0.0.0" }
29test_utils = { path = "../test_utils", version = "0.0.0" } 29test_utils = { path = "../test_utils", version = "0.0.0" }
30assists = { path = "../assists", version = "0.0.0" } 30ide_assists = { path = "../ide_assists", version = "0.0.0" }
31ssr = { path = "../ssr", version = "0.0.0" } 31ide_ssr = { path = "../ide_ssr", version = "0.0.0" }
32ide_completion = { path = "../ide_completion", version = "0.0.0" } 32ide_completion = { path = "../ide_completion", version = "0.0.0" }
33 33
34# ide should depend only on the top-level `hir` package. if you need 34# 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 @@
1//! This module implements a methods and free functions search in the specified file. 1//! This module implements a methods and free functions search in the specified file.
2//! We have to skip tests, so cannot reuse file_structure module. 2//! We have to skip tests, so cannot reuse file_structure module.
3 3
4use assists::utils::test_related_attribute;
5use hir::Semantics; 4use hir::Semantics;
5use ide_assists::utils::test_related_attribute;
6use ide_db::RootDatabase; 6use ide_db::RootDatabase;
7use syntax::{ast, ast::NameOwner, AstNode, SyntaxNode}; 7use syntax::{ast, ast::NameOwner, AstNode, SyntaxNode};
8 8
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 @@
1use assists::utils::extract_trivial_expression; 1use ide_assists::utils::extract_trivial_expression;
2use itertools::Itertools; 2use itertools::Itertools;
3use syntax::{ 3use syntax::{
4 algo::non_trivia_sibling, 4 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::{
82 HlRange, 82 HlRange,
83 }, 83 },
84}; 84};
85pub use assists::{Assist, AssistConfig, AssistId, AssistKind};
86pub use hir::{Documentation, Semantics}; 85pub use hir::{Documentation, Semantics};
86pub use ide_assists::{Assist, AssistConfig, AssistId, AssistKind};
87pub use ide_completion::{ 87pub use ide_completion::{
88 CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit, 88 CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit,
89 InsertTextFormat, 89 InsertTextFormat,
@@ -101,7 +101,7 @@ pub use ide_db::{
101 symbol_index::Query, 101 symbol_index::Query,
102 RootDatabase, 102 RootDatabase,
103}; 103};
104pub use ssr::SsrError; 104pub use ide_ssr::SsrError;
105pub use syntax::{TextRange, TextSize}; 105pub use syntax::{TextRange, TextSize};
106pub use text_edit::{Indel, TextEdit}; 106pub use text_edit::{Indel, TextEdit};
107 107
@@ -549,8 +549,9 @@ impl Analysis {
549 selections: Vec<FileRange>, 549 selections: Vec<FileRange>,
550 ) -> Cancelable<Result<SourceChange, SsrError>> { 550 ) -> Cancelable<Result<SourceChange, SsrError>> {
551 self.with_db(|db| { 551 self.with_db(|db| {
552 let rule: ssr::SsrRule = query.parse()?; 552 let rule: ide_ssr::SsrRule = query.parse()?;
553 let mut match_finder = ssr::MatchFinder::in_context(db, resolve_context, selections); 553 let mut match_finder =
554 ide_ssr::MatchFinder::in_context(db, resolve_context, selections);
554 match_finder.add_rule(rule)?; 555 match_finder.add_rule(rule)?;
555 let edits = if parse_only { Default::default() } else { match_finder.edits() }; 556 let edits = if parse_only { Default::default() } else { match_finder.edits() };
556 Ok(SourceChange::from(edits)) 557 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 @@
1use std::fmt; 1use std::fmt;
2 2
3use assists::utils::test_related_attribute;
4use cfg::CfgExpr; 3use cfg::CfgExpr;
5use hir::{AsAssocItem, HasAttrs, HasSource, Semantics}; 4use hir::{AsAssocItem, HasAttrs, HasSource, Semantics};
5use ide_assists::utils::test_related_attribute;
6use ide_db::{defs::Definition, RootDatabase, SymbolKind}; 6use ide_db::{defs::Definition, RootDatabase, SymbolKind};
7use itertools::Itertools; 7use itertools::Itertools;
8use syntax::{ 8use 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 @@
1[package] 1[package]
2name = "assists" 2name = "ide_assists"
3version = "0.0.0" 3version = "0.0.0"
4description = "TBD" 4description = "TBD"
5license = "MIT OR Apache-2.0" 5license = "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 @@
1[package] 1[package]
2name = "ssr" 2name = "ide_ssr"
3version = "0.0.0" 3version = "0.0.0"
4description = "Structural search and replace of Rust code" 4description = "Structural search and replace of Rust code"
5license = "MIT OR Apache-2.0" 5license = "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" }
53toolchain = { path = "../toolchain", version = "0.0.0" } 53toolchain = { path = "../toolchain", version = "0.0.0" }
54 54
55# This should only be used in CLI 55# This should only be used in CLI
56ssr = { path = "../ssr", version = "0.0.0" } 56ide_ssr = { path = "../ide_ssr", version = "0.0.0" }
57hir = { path = "../hir", version = "0.0.0" } 57hir = { path = "../hir", version = "0.0.0" }
58hir_def = { path = "../hir_def", version = "0.0.0" } 58hir_def = { path = "../hir_def", version = "0.0.0" }
59hir_ty = { path = "../hir_ty", version = "0.0.0" } 59hir_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 @@
6use std::{env, path::PathBuf}; 6use std::{env, path::PathBuf};
7 7
8use anyhow::{bail, format_err, Result}; 8use anyhow::{bail, format_err, Result};
9use ide_ssr::{SsrPattern, SsrRule};
9use pico_args::Arguments; 10use pico_args::Arguments;
10use rust_analyzer::cli::{AnalysisStatsCmd, BenchCmd, BenchWhat, Position, Verbosity}; 11use rust_analyzer::cli::{AnalysisStatsCmd, BenchCmd, BenchWhat, Position, Verbosity};
11use ssr::{SsrPattern, SsrRule};
12use vfs::AbsPathBuf; 12use vfs::AbsPathBuf;
13 13
14pub(crate) struct Args { 14pub(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::{
4 load_cargo::{load_workspace_at, LoadCargoConfig}, 4 load_cargo::{load_workspace_at, LoadCargoConfig},
5 Result, 5 Result,
6}; 6};
7use ssr::{MatchFinder, SsrPattern, SsrRule}; 7use ide_ssr::{MatchFinder, SsrPattern, SsrRule};
8 8
9pub fn apply_ssr_rules(rules: Vec<SsrRule>) -> Result<()> { 9pub fn apply_ssr_rules(rules: Vec<SsrRule>) -> Result<()> {
10 use ide_db::base_db::SourceDatabaseExt; 10 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 {
32impl Assist { 32impl Assist {
33 fn collect() -> Result<Vec<Assist>> { 33 fn collect() -> Result<Vec<Assist>> {
34 let mut res = Vec::new(); 34 let mut res = Vec::new();
35 for path in rust_files_in(&project_root().join("crates/assists/src/handlers")) { 35 for path in rust_files_in(&project_root().join("crates/ide_assists/src/handlers")) {
36 collect_file(&mut res, path.as_path())?; 36 collect_file(&mut res, path.as_path())?;
37 } 37 }
38 res.sort_by(|lhs, rhs| lhs.id.cmp(&rhs.id)); 38 res.sort_by(|lhs, rhs| lhs.id.cmp(&rhs.id));
@@ -135,7 +135,7 @@ r#####"
135 buf.push_str(&test) 135 buf.push_str(&test)
136 } 136 }
137 let buf = reformat(&buf)?; 137 let buf = reformat(&buf)?;
138 codegen::update(&project_root().join("crates/assists/src/tests/generated.rs"), &buf, mode) 138 codegen::update(&project_root().join("crates/ide_assists/src/tests/generated.rs"), &buf, mode)
139} 139}
140 140
141fn hide_hash_comments(text: &str) -> String { 141fn hide_hash_comments(text: &str) -> String {