20 files changed, 55 insertions, 49 deletions

diff --git a/crates/ra_assists/src/add_derive.rs b/crates/ra_assists/src/assists/add_derive.rs
index 9c88644df..9c88644df 100644
--- a/crates/ra_assists/src/add_derive.rs
+++ b/crates/ra_assists/src/assists/add_derive.rs
diff --git a/crates/ra_assists/src/add_explicit_type.rs b/crates/ra_assists/src/assists/add_explicit_type.rs
index 78f0f7f28..78f0f7f28 100644
--- a/crates/ra_assists/src/add_explicit_type.rs
+++ b/crates/ra_assists/src/assists/add_explicit_type.rs
diff --git a/crates/ra_assists/src/add_impl.rs b/crates/ra_assists/src/assists/add_impl.rs
index 4b61f4031..4b61f4031 100644
--- a/crates/ra_assists/src/add_impl.rs
+++ b/crates/ra_assists/src/assists/add_impl.rs
diff --git a/crates/ra_assists/src/add_missing_impl_members.rs b/crates/ra_assists/src/assists/add_missing_impl_members.rs
index cbeb7054f..cbeb7054f 100644
--- a/crates/ra_assists/src/add_missing_impl_members.rs
+++ b/crates/ra_assists/src/assists/add_missing_impl_members.rs
diff --git a/crates/ra_assists/src/auto_import.rs b/crates/ra_assists/src/assists/auto_import.rs
index 5aae98546..5aae98546 100644
--- a/crates/ra_assists/src/auto_import.rs
+++ b/crates/ra_assists/src/assists/auto_import.rs
diff --git a/crates/ra_assists/src/change_visibility.rs b/crates/ra_assists/src/assists/change_visibility.rs
index 60c74debc..60c74debc 100644
--- a/crates/ra_assists/src/change_visibility.rs
+++ b/crates/ra_assists/src/assists/change_visibility.rs
diff --git a/crates/ra_assists/src/fill_match_arms.rs b/crates/ra_assists/src/assists/fill_match_arms.rs
index f59062bb9..f59062bb9 100644
--- a/crates/ra_assists/src/fill_match_arms.rs
+++ b/crates/ra_assists/src/assists/fill_match_arms.rs
diff --git a/crates/ra_assists/src/flip_binexpr.rs b/crates/ra_assists/src/assists/flip_binexpr.rs
index b55b36a8e..b55b36a8e 100644
--- a/crates/ra_assists/src/flip_binexpr.rs
+++ b/crates/ra_assists/src/assists/flip_binexpr.rs
diff --git a/crates/ra_assists/src/flip_comma.rs b/crates/ra_assists/src/assists/flip_comma.rs
index 5ee7561bc..5ee7561bc 100644
--- a/crates/ra_assists/src/flip_comma.rs
+++ b/crates/ra_assists/src/assists/flip_comma.rs
diff --git a/crates/ra_assists/src/inline_local_variable.rs b/crates/ra_assists/src/assists/inline_local_variable.rs
index eedb29199..eedb29199 100644
--- a/crates/ra_assists/src/inline_local_variable.rs
+++ b/crates/ra_assists/src/assists/inline_local_variable.rs
diff --git a/crates/ra_assists/src/introduce_variable.rs b/crates/ra_assists/src/assists/introduce_variable.rs
index 470ffe120..470ffe120 100644
--- a/crates/ra_assists/src/introduce_variable.rs
+++ b/crates/ra_assists/src/assists/introduce_variable.rs
diff --git a/crates/ra_assists/src/merge_match_arms.rs b/crates/ra_assists/src/assists/merge_match_arms.rs
index 3b6a99895..3b6a99895 100644
--- a/crates/ra_assists/src/merge_match_arms.rs
+++ b/crates/ra_assists/src/assists/merge_match_arms.rs
diff --git a/crates/ra_assists/src/move_bounds.rs b/crates/ra_assists/src/assists/move_bounds.rs
index 526de1d98..526de1d98 100644
--- a/crates/ra_assists/src/move_bounds.rs
+++ b/crates/ra_assists/src/assists/move_bounds.rs
diff --git a/crates/ra_assists/src/move_guard.rs b/crates/ra_assists/src/assists/move_guard.rs
index 699221e33..699221e33 100644
--- a/crates/ra_assists/src/move_guard.rs
+++ b/crates/ra_assists/src/assists/move_guard.rs
diff --git a/crates/ra_assists/src/raw_string.rs b/crates/ra_assists/src/assists/raw_string.rs
index 965a64c98..965a64c98 100644
--- a/crates/ra_assists/src/raw_string.rs
+++ b/crates/ra_assists/src/assists/raw_string.rs
diff --git a/crates/ra_assists/src/remove_dbg.rs b/crates/ra_assists/src/assists/remove_dbg.rs
index 870133fda..870133fda 100644
--- a/crates/ra_assists/src/remove_dbg.rs
+++ b/crates/ra_assists/src/assists/remove_dbg.rs
diff --git a/crates/ra_assists/src/replace_if_let_with_match.rs b/crates/ra_assists/src/assists/replace_if_let_with_match.rs
index 401835c57..401835c57 100644
--- a/crates/ra_assists/src/replace_if_let_with_match.rs
+++ b/crates/ra_assists/src/assists/replace_if_let_with_match.rs
diff --git a/crates/ra_assists/src/split_import.rs b/crates/ra_assists/src/assists/split_import.rs
index 2c1edddb9..2c1edddb9 100644
--- a/crates/ra_assists/src/split_import.rs
+++ b/crates/ra_assists/src/assists/split_import.rs
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index 756acf415..5e4e8bc92 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -17,6 +17,7 @@ use ra_syntax::{TextRange, TextUnit};
 use ra_text_edit::TextEdit;
 
 pub(crate) use crate::assist_ctx::{Assist, AssistCtx};
+pub use crate::assists::auto_import::auto_import_text_edit;
 
 /// Unique identifier of the assist, should not be shown to the user
 /// directly.
@@ -46,7 +47,7 @@ where
     H: HirDatabase + 'static,
 {
     AssistCtx::with_ctx(db, range, false, |ctx| {
-        all_assists()
+        assists::all()
             .iter()
             .filter_map(|f| f(ctx.clone()))
             .map(|a| match a {
@@ -68,7 +69,7 @@ where
     use std::cmp::Ordering;
 
     AssistCtx::with_ctx(db, range, true, |ctx| {
-        let mut a = all_assists()
+        let mut a = assists::all()
             .iter()
             .filter_map(|f| f(ctx.clone()))
             .map(|a| match a {
@@ -86,51 +87,56 @@ where
     })
 }
 
-mod add_derive;
-mod add_explicit_type;
-mod add_impl;
-mod flip_comma;
-mod flip_binexpr;
-mod change_visibility;
-mod fill_match_arms;
-mod merge_match_arms;
-mod introduce_variable;
-mod inline_local_variable;
-mod raw_string;
-mod replace_if_let_with_match;
-mod split_import;
-mod remove_dbg;
-pub mod auto_import;
-mod add_missing_impl_members;
-mod move_guard;
-mod move_bounds;
-
-fn all_assists<DB: HirDatabase>() -> &'static [fn(AssistCtx<DB>) -> Option<Assist>] {
-    &[
-        add_derive::add_derive,
-        add_explicit_type::add_explicit_type,
-        add_impl::add_impl,
-        change_visibility::change_visibility,
-        fill_match_arms::fill_match_arms,
-        merge_match_arms::merge_match_arms,
-        flip_comma::flip_comma,
-        flip_binexpr::flip_binexpr,
-        introduce_variable::introduce_variable,
-        replace_if_let_with_match::replace_if_let_with_match,
-        split_import::split_import,
-        remove_dbg::remove_dbg,
-        auto_import::auto_import,
-        add_missing_impl_members::add_missing_impl_members,
-        add_missing_impl_members::add_missing_default_members,
-        inline_local_variable::inline_local_varialbe,
-        move_guard::move_guard_to_arm_body,
-        move_guard::move_arm_cond_to_match_guard,
-        move_bounds::move_bounds_to_where_clause,
-        raw_string::add_hash,
-        raw_string::make_raw_string,
-        raw_string::make_usual_string,
-        raw_string::remove_hash,
-    ]
+mod assists {
+    use crate::{Assist, AssistCtx};
+    use hir::db::HirDatabase;
+
+    mod add_derive;
+    mod add_explicit_type;
+    mod add_impl;
+    mod flip_comma;
+    mod flip_binexpr;
+    mod change_visibility;
+    mod fill_match_arms;
+    mod merge_match_arms;
+    mod introduce_variable;
+    mod inline_local_variable;
+    mod raw_string;
+    mod replace_if_let_with_match;
+    mod split_import;
+    mod remove_dbg;
+    pub(crate) mod auto_import;
+    mod add_missing_impl_members;
+    mod move_guard;
+    mod move_bounds;
+
+    pub(crate) fn all<DB: HirDatabase>() -> &'static [fn(AssistCtx<DB>) -> Option<Assist>] {
+        &[
+            add_derive::add_derive,
+            add_explicit_type::add_explicit_type,
+            add_impl::add_impl,
+            change_visibility::change_visibility,
+            fill_match_arms::fill_match_arms,
+            merge_match_arms::merge_match_arms,
+            flip_comma::flip_comma,
+            flip_binexpr::flip_binexpr,
+            introduce_variable::introduce_variable,
+            replace_if_let_with_match::replace_if_let_with_match,
+            split_import::split_import,
+            remove_dbg::remove_dbg,
+            auto_import::auto_import,
+            add_missing_impl_members::add_missing_impl_members,
+            add_missing_impl_members::add_missing_default_members,
+            inline_local_variable::inline_local_varialbe,
+            move_guard::move_guard_to_arm_body,
+            move_guard::move_arm_cond_to_match_guard,
+            move_bounds::move_bounds_to_where_clause,
+            raw_string::add_hash,
+            raw_string::make_raw_string,
+            raw_string::make_usual_string,
+            raw_string::remove_hash,
+        ]
+    }
 }
 
 #[cfg(test)]
diff --git a/crates/ra_ide_api/src/completion/complete_scope.rs b/crates/ra_ide_api/src/completion/complete_scope.rs
index c1f48b026..cb70a1f21 100644
--- a/crates/ra_ide_api/src/completion/complete_scope.rs
+++ b/crates/ra_ide_api/src/completion/complete_scope.rs
@@ -1,4 +1,4 @@
-use ra_assists::auto_import;
+use ra_assists::auto_import_text_edit;
 use ra_syntax::{ast, AstNode, SmolStr};
 use ra_text_edit::TextEditBuilder;
 use rustc_hash::FxHashMap;
@@ -23,7 +23,7 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) {
             let edit = {
                 let mut builder = TextEditBuilder::default();
                 builder.replace(ctx.source_range(), name.to_string());
-                auto_import::auto_import_text_edit(
+                auto_import_text_edit(
                     &ctx.token.parent(),
                     &ctx.token.parent(),
                     &path,