4 files changed, 11 insertions, 7 deletions

diff --git a/crates/ra_hir/src/ty/autoderef.rs b/crates/ra_hir/src/ty/autoderef.rs
index caa17f64e..5ba7cf2e0 100644
--- a/crates/ra_hir/src/ty/autoderef.rs
+++ b/crates/ra_hir/src/ty/autoderef.rs
@@ -8,7 +8,7 @@ use std::iter::successors;
 use log::{info, warn};
 
 use super::{traits::Solution, Canonical, Ty, TypeWalk};
-use crate::{name, HasGenericParams, HirDatabase, Resolver};
+use crate::{db::HirDatabase, name, HasGenericParams, Resolver};
 
 const AUTODEREF_RECURSION_LIMIT: usize = 10;
 
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index 0e6ebd365..9244ff3cb 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -35,6 +35,7 @@ use super::{
 use crate::{
     adt::VariantDef,
     code_model::{ModuleDef::Trait, TypeAlias},
+    db::HirDatabase,
     diagnostics::DiagnosticSink,
     expr::{
         self, Array, BinaryOp, BindingAnnotation, Body, Expr, ExprId, Literal, Pat, PatId,
@@ -50,8 +51,8 @@ use crate::{
     },
     ty::infer::diagnostics::InferenceDiagnostic,
     type_ref::{Mutability, TypeRef},
-    AdtDef, ConstData, DefWithBody, FnData, Function, HasBody, HirDatabase, ImplItem, ModuleDef,
-    Name, Path, StructField,
+    AdtDef, ConstData, DefWithBody, FnData, Function, HasBody, ImplItem, ModuleDef, Name, Path,
+    StructField,
 };
 
 mod unify;
@@ -1614,9 +1615,10 @@ impl Expectation {
 
 mod diagnostics {
     use crate::{
+        db::HirDatabase,
         diagnostics::{DiagnosticSink, NoSuchField},
         expr::ExprId,
-        Function, HasSource, HirDatabase,
+        Function, HasSource,
     };
 
     #[derive(Debug, PartialEq, Eq, Clone)]
diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs
index 480bae740..061229842 100644
--- a/crates/ra_hir/src/ty/lower.rs
+++ b/crates/ra_hir/src/ty/lower.rs
@@ -14,6 +14,7 @@ use super::{
 };
 use crate::{
     adt::VariantDef,
+    db::HirDatabase,
     generics::HasGenericParams,
     generics::{GenericDef, WherePredicate},
     nameres::Namespace,
@@ -21,8 +22,8 @@ use crate::{
     resolve::{Resolution, Resolver},
     ty::AdtDef,
     type_ref::{TypeBound, TypeRef},
-    BuiltinType, Const, Enum, EnumVariant, Function, HirDatabase, ModuleDef, Path, Static, Struct,
-    StructField, Trait, TypeAlias, Union,
+    BuiltinType, Const, Enum, EnumVariant, Function, ModuleDef, Path, Static, Struct, StructField,
+    Trait, TypeAlias, Union,
 };
 
 impl Ty {
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index cf787bdaa..be63806d4 100644
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -9,6 +9,7 @@ use rustc_hash::FxHashMap;
 
 use super::{autoderef, lower, Canonical, InEnvironment, TraitEnvironment, TraitRef};
 use crate::{
+    db::HirDatabase,
     generics::HasGenericParams,
     impl_block::{ImplBlock, ImplId, ImplItem},
     nameres::CrateModuleId,
@@ -16,7 +17,7 @@ use crate::{
     traits::TraitItem,
     ty::primitive::{FloatBitness, UncertainFloatTy, UncertainIntTy},
     ty::{Ty, TypeCtor},
-    Crate, Function, HirDatabase, Module, Name, Trait,
+    Crate, Function, Module, Name, Trait,
 };
 
 /// This is used as a key for indexing impls.