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/expr/lower.rs      | 5 +++--
 crates/ra_hir/src/expr/scope.rs      | 3 ++-
 crates/ra_hir/src/expr/validation.rs | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'crates/ra_hir/src/expr')

diff --git a/crates/ra_hir/src/expr/lower.rs b/crates/ra_hir/src/expr/lower.rs
index 6afd80989..8bd041ff0 100644
--- a/crates/ra_hir/src/expr/lower.rs
+++ b/crates/ra_hir/src/expr/lower.rs
@@ -9,12 +9,13 @@ use ra_syntax::{
 use test_utils::tested_by;
 
 use crate::{
+    db::HirDatabase,
     name::{AsName, Name, SELF_PARAM},
     path::GenericArgs,
     ty::primitive::{FloatTy, IntTy, UncertainFloatTy, UncertainIntTy},
     type_ref::TypeRef,
-    DefWithBody, Either, HirDatabase, HirFileId, MacroCallLoc, MacroFileKind, Mutability, Path,
-    Resolver, Source,
+    DefWithBody, Either, HirFileId, MacroCallLoc, MacroFileKind, Mutability, Path, Resolver,
+    Source,
 };
 
 use super::{
diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs
index b6d7f3fc1..de0983a7e 100644
--- a/crates/ra_hir/src/expr/scope.rs
+++ b/crates/ra_hir/src/expr/scope.rs
@@ -4,8 +4,9 @@ use ra_arena::{impl_arena_id, Arena, RawId};
 use rustc_hash::FxHashMap;
 
 use crate::{
+    db::HirDatabase,
     expr::{Body, Expr, ExprId, Pat, PatId, Statement},
-    DefWithBody, HirDatabase, Name,
+    DefWithBody, Name,
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
diff --git a/crates/ra_hir/src/expr/validation.rs b/crates/ra_hir/src/expr/validation.rs
index 1202913e2..6a22e1318 100644
--- a/crates/ra_hir/src/expr/validation.rs
+++ b/crates/ra_hir/src/expr/validation.rs
@@ -5,12 +5,13 @@ use rustc_hash::FxHashSet;
 
 use crate::{
     adt::AdtDef,
+    db::HirDatabase,
     diagnostics::{DiagnosticSink, MissingFields, MissingOkInTailExpr},
     expr::AstPtr,
     name,
     path::{PathKind, PathSegment},
     ty::{ApplicationTy, InferenceResult, Ty, TypeCtor},
-    Function, HirDatabase, ModuleDef, Name, Path, PerNs, Resolution,
+    Function, ModuleDef, Name, Path, PerNs, Resolution,
 };
 
 use super::{Expr, ExprId, RecordLitField};
-- 
cgit v1.2.3