From 6021a2a83a2e229847905c6d06ba412faddd1acb Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 8 Sep 2019 09:53:49 +0300
Subject: cleanup hir db imports

---
 crates/ra_hir/src/nameres.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'crates/ra_hir/src/nameres.rs')

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index fe90879b6..7de422128 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -65,9 +65,12 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use test_utils::tested_by;
 
 use crate::{
-    diagnostics::DiagnosticSink, either::Either, ids::MacroDefId,
-    nameres::diagnostics::DefDiagnostic, AstDatabase, AstId, BuiltinType, Crate, DefDatabase,
-    HirFileId, MacroDef, Module, ModuleDef, Name, Path, PathKind, Trait,
+    db::{AstDatabase, DefDatabase},
+    diagnostics::DiagnosticSink,
+    either::Either,
+    ids::MacroDefId,
+    nameres::diagnostics::DefDiagnostic,
+    AstId, BuiltinType, Crate, HirFileId, MacroDef, Module, ModuleDef, Name, Path, PathKind, Trait,
 };
 
 pub(crate) use self::raw::{ImportSourceMap, RawItems};
@@ -516,9 +519,10 @@ mod diagnostics {
     use relative_path::RelativePathBuf;
 
     use crate::{
+        db::{AstDatabase, DefDatabase},
         diagnostics::{DiagnosticSink, UnresolvedModule},
         nameres::CrateModuleId,
-        AstDatabase, AstId, DefDatabase,
+        AstId,
     };
 
     #[derive(Debug, PartialEq, Eq)]
-- 
cgit v1.2.3