From e4756cb4f6e66097638b9d101589358976be2ba8 Mon Sep 17 00:00:00 2001
From: Chetan Khilosiya <chetan.khilosiya@gmail.com>
Date: Tue, 23 Feb 2021 00:17:48 +0530
Subject: 7526: Rename crate assists to ide_assists.

---
 crates/ide/src/fn_references.rs | 2 +-
 crates/ide/src/join_lines.rs    | 2 +-
 crates/ide/src/lib.rs           | 2 +-
 crates/ide/src/runnables.rs     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates/ide/src')

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..eb26d13b9 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,
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::{
-- 
cgit v1.2.3


From eb6cfa7f157690480fca5d55c69dba3fae87ad4f Mon Sep 17 00:00:00 2001
From: Chetan Khilosiya <chetan.khilosiya@gmail.com>
Date: Tue, 23 Feb 2021 00:44:58 +0530
Subject: 7526: Renamed create ssr to ide_ssr.

---
 crates/ide/src/lib.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'crates/ide/src')

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))
-- 
cgit v1.2.3