26 files changed, 28 insertions, 53 deletions

diff --git a/crates/assists/Cargo.toml b/crates/assists/Cargo.toml
index 91d9b6e3f..3fd8327d6 100644
--- a/crates/assists/Cargo.toml
+++ b/crates/assists/Cargo.toml
@@ -21,4 +21,3 @@ profile = { path = "../profile", version = "0.0.0" }
 ide_db = { path = "../ide_db", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
 test_utils = { path = "../test_utils", version = "0.0.0" }
-ide_helpers = { path = "../ide_helpers", version = "0.0.0" }
diff --git a/crates/assists/src/assist_config.rs b/crates/assists/src/assist_config.rs
index 6d9934e93..786224cfa 100644
--- a/crates/assists/src/assist_config.rs
+++ b/crates/assists/src/assist_config.rs
@@ -5,7 +5,7 @@
 //! assists if we are allowed to.
 
 use hir::PrefixKind;
-use ide_helpers::insert_use::MergeBehaviour;
+use ide_db::helpers::insert_use::MergeBehaviour;
 
 use crate::AssistKind;
 
diff --git a/crates/assists/src/ast_transform.rs b/crates/assists/src/ast_transform.rs
index 95b060599..66e4634b1 100644
--- a/crates/assists/src/ast_transform.rs
+++ b/crates/assists/src/ast_transform.rs
@@ -1,6 +1,6 @@
 //! `AstTransformer`s are functions that replace nodes in an AST and can be easily combined.
 use hir::{HirDisplay, PathResolution, SemanticsScope};
-use ide_helpers::mod_path_to_ast;
+use ide_db::helpers::mod_path_to_ast;
 use rustc_hash::FxHashMap;
 use syntax::{
     algo::SyntaxRewriter,
diff --git a/crates/assists/src/handlers/auto_import.rs b/crates/assists/src/handlers/auto_import.rs
index 0b2d508d5..bd5bba646 100644
--- a/crates/assists/src/handlers/auto_import.rs
+++ b/crates/assists/src/handlers/auto_import.rs
@@ -1,4 +1,4 @@
-use ide_helpers::{
+use ide_db::helpers::{
     insert_use::{insert_use, ImportScope},
     mod_path_to_ast,
 };
diff --git a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
index fddd5354a..d85767b4e 100644
--- a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -2,11 +2,11 @@ use std::iter;
 
 use either::Either;
 use hir::{AsName, EnumVariant, Module, ModuleDef, Name};
-use ide_db::{defs::Definition, search::Reference, RootDatabase};
-use ide_helpers::{
+use ide_db::helpers::{
     insert_use::{insert_use, ImportScope},
     mod_path_to_ast,
 };
+use ide_db::{defs::Definition, search::Reference, RootDatabase};
 use rustc_hash::{FxHashMap, FxHashSet};
 use syntax::{
     algo::{find_node_at_offset, SyntaxRewriter},
@@ -237,7 +237,7 @@ fn update_reference(
 
 #[cfg(test)]
 mod tests {
-    use ide_helpers::FamousDefs;
+    use ide_db::helpers::FamousDefs;
 
     use crate::tests::{check_assist, check_assist_not_applicable};
 
diff --git a/crates/assists/src/handlers/fill_match_arms.rs b/crates/assists/src/handlers/fill_match_arms.rs
index bd42e0f16..ef12ef0cf 100644
--- a/crates/assists/src/handlers/fill_match_arms.rs
+++ b/crates/assists/src/handlers/fill_match_arms.rs
@@ -1,8 +1,8 @@
 use std::iter;
 
 use hir::{Adt, HasSource, ModuleDef, Semantics};
+use ide_db::helpers::{mod_path_to_ast, FamousDefs};
 use ide_db::RootDatabase;
-use ide_helpers::{mod_path_to_ast, FamousDefs};
 use itertools::Itertools;
 use syntax::ast::{self, make, AstNode, MatchArm, NameOwner, Pat};
 use test_utils::mark;
@@ -213,7 +213,7 @@ fn build_pat(db: &RootDatabase, module: hir::Module, var: hir::EnumVariant) -> O
 
 #[cfg(test)]
 mod tests {
-    use ide_helpers::FamousDefs;
+    use ide_db::helpers::FamousDefs;
     use test_utils::mark;
 
     use crate::tests::{check_assist, check_assist_not_applicable, check_assist_target};
diff --git a/crates/assists/src/handlers/generate_from_impl_for_enum.rs b/crates/assists/src/handlers/generate_from_impl_for_enum.rs
index 01b14d94d..3c374e5d9 100644
--- a/crates/assists/src/handlers/generate_from_impl_for_enum.rs
+++ b/crates/assists/src/handlers/generate_from_impl_for_enum.rs
@@ -1,5 +1,5 @@
+use ide_db::helpers::FamousDefs;
 use ide_db::RootDatabase;
-use ide_helpers::FamousDefs;
 use syntax::ast::{self, AstNode, NameOwner};
 use test_utils::mark;
 
diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs
index 8207f0e6e..b7e853994 100644
--- a/crates/assists/src/handlers/merge_imports.rs
+++ b/crates/assists/src/handlers/merge_imports.rs
@@ -1,4 +1,4 @@
-use ide_helpers::insert_use::{try_merge_imports, try_merge_trees, MergeBehaviour};
+use ide_db::helpers::insert_use::{try_merge_imports, try_merge_trees, MergeBehaviour};
 use syntax::{
     algo::{neighbor, SyntaxRewriter},
     ast, AstNode,
diff --git a/crates/assists/src/handlers/qualify_path.rs b/crates/assists/src/handlers/qualify_path.rs
index c0ee7ea0b..6f9810fe8 100644
--- a/crates/assists/src/handlers/qualify_path.rs
+++ b/crates/assists/src/handlers/qualify_path.rs
@@ -1,8 +1,8 @@
 use std::iter;
 
 use hir::AsName;
+use ide_db::helpers::mod_path_to_ast;
 use ide_db::RootDatabase;
-use ide_helpers::mod_path_to_ast;
 use syntax::{
     ast,
     ast::{make, ArgListOwner},
diff --git a/crates/assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/assists/src/handlers/replace_derive_with_manual_impl.rs
index fe262377c..4d6a1956b 100644
--- a/crates/assists/src/handlers/replace_derive_with_manual_impl.rs
+++ b/crates/assists/src/handlers/replace_derive_with_manual_impl.rs
@@ -1,5 +1,5 @@
+use ide_db::helpers::mod_path_to_ast;
 use ide_db::imports_locator;
-use ide_helpers::mod_path_to_ast;
 use itertools::Itertools;
 use syntax::{
     ast::{self, make, AstNode},
diff --git a/crates/assists/src/handlers/replace_qualified_name_with_use.rs b/crates/assists/src/handlers/replace_qualified_name_with_use.rs
index 5e5c41a6f..8bdf9eea5 100644
--- a/crates/assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/assists/src/handlers/replace_qualified_name_with_use.rs
@@ -1,4 +1,4 @@
-use ide_helpers::insert_use::{insert_use, ImportScope};
+use ide_db::helpers::insert_use::{insert_use, ImportScope};
 use syntax::{algo::SyntaxRewriter, ast, match_ast, AstNode, SyntaxNode};
 use test_utils::mark;
 
diff --git a/crates/completion/Cargo.toml b/crates/completion/Cargo.toml
index 102de33f8..35e169a28 100644
--- a/crates/completion/Cargo.toml
+++ b/crates/completion/Cargo.toml
@@ -22,7 +22,6 @@ base_db = { path = "../base_db", version = "0.0.0" }
 ide_db = { path = "../ide_db", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 test_utils = { path = "../test_utils", version = "0.0.0" }
-ide_helpers = { path = "../ide_helpers", version = "0.0.0" }
 
 # completions crate should depend only on the top-level `hir` package. if you need
 # something from some `hir_xxx` subpackage, reexport the API via `hir`.
diff --git a/crates/completion/src/completions/record.rs b/crates/completion/src/completions/record.rs
index 218a1923c..eaa44c97d 100644
--- a/crates/completion/src/completions/record.rs
+++ b/crates/completion/src/completions/record.rs
@@ -1,5 +1,5 @@
 //! Complete fields in record literals and patterns.
-use ide_helpers::FamousDefs;
+use ide_db::helpers::FamousDefs;
 use syntax::ast::Expr;
 
 use crate::{
@@ -46,7 +46,7 @@ pub(crate) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) ->
 #[cfg(test)]
 mod tests {
     use expect_test::{expect, Expect};
-    use ide_helpers::FamousDefs;
+    use ide_db::helpers::FamousDefs;
 
     use crate::{test_utils::completion_list, CompletionKind};
 
diff --git a/crates/completion/src/completions/unqualified_path.rs b/crates/completion/src/completions/unqualified_path.rs
index db5dbb7dd..81691cd7f 100644
--- a/crates/completion/src/completions/unqualified_path.rs
+++ b/crates/completion/src/completions/unqualified_path.rs
@@ -2,8 +2,8 @@
 
 use either::Either;
 use hir::{Adt, ModuleDef, ScopeDef, Type};
+use ide_db::helpers::insert_use::ImportScope;
 use ide_db::imports_locator;
-use ide_helpers::insert_use::ImportScope;
 use syntax::AstNode;
 use test_utils::mark;
 
diff --git a/crates/completion/src/config.rs b/crates/completion/src/config.rs
index 1995b0754..654a76f7b 100644
--- a/crates/completion/src/config.rs
+++ b/crates/completion/src/config.rs
@@ -4,7 +4,7 @@
 //! module, and we use to statically check that we only produce snippet
 //! completions if we are allowed to.
 
-use ide_helpers::insert_use::MergeBehaviour;
+use ide_db::helpers::insert_use::MergeBehaviour;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CompletionConfig {
diff --git a/crates/completion/src/item.rs b/crates/completion/src/item.rs
index 3bfee1b3f..e85549fef 100644
--- a/crates/completion/src/item.rs
+++ b/crates/completion/src/item.rs
@@ -3,7 +3,7 @@
 use std::fmt;
 
 use hir::{Documentation, ModPath, Mutability};
-use ide_helpers::{
+use ide_db::helpers::{
     insert_use::{self, ImportScope, MergeBehaviour},
     mod_path_to_ast,
 };
diff --git a/crates/completion/src/render.rs b/crates/completion/src/render.rs
index e84aef0e4..504757a6a 100644
--- a/crates/completion/src/render.rs
+++ b/crates/completion/src/render.rs
@@ -10,8 +10,8 @@ pub(crate) mod type_alias;
 mod builder_ext;
 
 use hir::{Documentation, HasAttrs, HirDisplay, ModPath, Mutability, ScopeDef, Type};
+use ide_db::helpers::insert_use::{ImportScope, MergeBehaviour};
 use ide_db::RootDatabase;
-use ide_helpers::insert_use::{ImportScope, MergeBehaviour};
 use syntax::TextRange;
 use test_utils::mark;
 
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index 92d4e5e9f..4d483580d 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -24,7 +24,6 @@ stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
 text_edit = { path = "../text_edit", version = "0.0.0" }
 ide_db = { path = "../ide_db", version = "0.0.0" }
-ide_helpers = { path = "../ide_helpers", 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" }
diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs
index 9c8bb7c45..65df7979c 100644
--- a/crates/ide/src/inlay_hints.rs
+++ b/crates/ide/src/inlay_hints.rs
@@ -1,7 +1,7 @@
 use either::Either;
 use hir::{known, Callable, HirDisplay, Semantics};
+use ide_db::helpers::FamousDefs;
 use ide_db::RootDatabase;
-use ide_helpers::FamousDefs;
 use stdx::to_lower_snake_case;
 use syntax::{
     ast::{self, ArgListOwner, AstNode, NameOwner},
@@ -428,7 +428,7 @@ fn get_callable(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option<hir:
 #[cfg(test)]
 mod tests {
     use expect_test::{expect, Expect};
-    use ide_helpers::FamousDefs;
+    use ide_db::helpers::FamousDefs;
     use test_utils::extract_annotations;
 
     use crate::{fixture, inlay_hints::InlayHintsConfig};
diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml
index 72a9212f1..0ad6e1000 100644
--- a/crates/ide_db/Cargo.toml
+++ b/crates/ide_db/Cargo.toml
@@ -18,7 +18,8 @@ rayon = "1.5.0"
 fst = { version = "0.4", default-features = false }
 rustc-hash = "1.1.0"
 once_cell = "1.3.1"
-either = "1.5.3"
+either = "1.6.1"
+itertools = "0.9.0"
 
 stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
diff --git a/crates/ide_helpers/src/lib.rs b/crates/ide_db/src/helpers.rs
index ad4404b19..d988588ff 100644
--- a/crates/ide_helpers/src/lib.rs
+++ b/crates/ide_db/src/helpers.rs
@@ -1,6 +1,6 @@
 //! A module with ide helpers for high-level ide features.
+use crate::RootDatabase;
 use hir::{Crate, Enum, Module, ScopeDef, Semantics, Trait};
-use ide_db::RootDatabase;
 use syntax::ast::{self, make};
 
 pub mod insert_use;
diff --git a/crates/ide_helpers/src/insert_use.rs b/crates/ide_db/src/helpers/insert_use.rs
index 795009eb1..67e800fad 100644
--- a/crates/ide_helpers/src/insert_use.rs
+++ b/crates/ide_db/src/helpers/insert_use.rs
@@ -1,8 +1,8 @@
 //! Handle syntactic aspects of inserting a new `use`.
 use std::{cmp::Ordering, iter::successors};
 
+use crate::RootDatabase;
 use hir::Semantics;
-use ide_db::RootDatabase;
 use itertools::{EitherOrBoth, Itertools};
 use syntax::{
     algo::SyntaxRewriter,
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index 05139a651..fceaa089a 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -13,6 +13,7 @@ pub mod source_change;
 pub mod ty_filter;
 pub mod traits;
 pub mod call_info;
+pub mod helpers;
 
 use std::{fmt, sync::Arc};
 
diff --git a/crates/ide_helpers/Cargo.toml b/crates/ide_helpers/Cargo.toml
deleted file mode 100644
index c5065b22b..000000000
--- a/crates/ide_helpers/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "ide_helpers"
-version = "0.0.0"
-description = "A set of helper methods shared between various ide-level modules"
-license = "MIT OR Apache-2.0"
-authors = ["rust-analyzer developers"]
-edition = "2018"
-
-[lib]
-doctest = false
-
-[features]
-wasm = []
-
-[dependencies]
-either = "1.6.1"
-itertools = "0.9.0"
-
-syntax = { path = "../syntax", version = "0.0.0" }
-ide_db = { path = "../ide_db", version = "0.0.0" }
-hir = { path = "../hir", version = "0.0.0" }
-profile = { path = "../profile", version = "0.0.0" }
-test_utils = { path = "../test_utils", version = "0.0.0" }
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 3afcd2eda..08559b53a 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -39,7 +39,7 @@ tracing-tree = { version = "0.1.4" }
 stdx = { path = "../stdx", version = "0.0.0" }
 flycheck = { path = "../flycheck", version = "0.0.0" }
 ide = { path = "../ide", version = "0.0.0" }
-ide_helpers = { path = "../ide_helpers", version = "0.0.0" }
+ide_db = { path = "../ide_db", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 project_model = { path = "../project_model", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
@@ -50,7 +50,6 @@ cfg = { path = "../cfg", version = "0.0.0" }
 toolchain = { path = "../toolchain", version = "0.0.0" }
 
 # This should only be used in CLI
-ide_db = { path = "../ide_db", version = "0.0.0" }
 ssr = { path = "../ssr", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
 hir_def = { path = "../hir_def", version = "0.0.0" }
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index d7b711f94..30299a465 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -12,7 +12,7 @@ use std::{convert::TryFrom, ffi::OsString, path::PathBuf};
 use flycheck::FlycheckConfig;
 use hir::PrefixKind;
 use ide::{AssistConfig, CompletionConfig, DiagnosticsConfig, HoverConfig, InlayHintsConfig};
-use ide_helpers::insert_use::MergeBehaviour;
+use ide_db::helpers::insert_use::MergeBehaviour;
 use lsp_types::{ClientCapabilities, MarkupKind};
 use project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
 use rustc_hash::FxHashSet;