diff options
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
-rw-r--r-- | crates/ra_hir/src/nameres.rs | 12 |
1 files changed, 8 insertions, 4 deletions
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}; | |||
65 | use test_utils::tested_by; | 65 | use test_utils::tested_by; |
66 | 66 | ||
67 | use crate::{ | 67 | use crate::{ |
68 | diagnostics::DiagnosticSink, either::Either, ids::MacroDefId, | 68 | db::{AstDatabase, DefDatabase}, |
69 | nameres::diagnostics::DefDiagnostic, AstDatabase, AstId, BuiltinType, Crate, DefDatabase, | 69 | diagnostics::DiagnosticSink, |
70 | HirFileId, MacroDef, Module, ModuleDef, Name, Path, PathKind, Trait, | 70 | either::Either, |
71 | ids::MacroDefId, | ||
72 | nameres::diagnostics::DefDiagnostic, | ||
73 | AstId, BuiltinType, Crate, HirFileId, MacroDef, Module, ModuleDef, Name, Path, PathKind, Trait, | ||
71 | }; | 74 | }; |
72 | 75 | ||
73 | pub(crate) use self::raw::{ImportSourceMap, RawItems}; | 76 | pub(crate) use self::raw::{ImportSourceMap, RawItems}; |
@@ -516,9 +519,10 @@ mod diagnostics { | |||
516 | use relative_path::RelativePathBuf; | 519 | use relative_path::RelativePathBuf; |
517 | 520 | ||
518 | use crate::{ | 521 | use crate::{ |
522 | db::{AstDatabase, DefDatabase}, | ||
519 | diagnostics::{DiagnosticSink, UnresolvedModule}, | 523 | diagnostics::{DiagnosticSink, UnresolvedModule}, |
520 | nameres::CrateModuleId, | 524 | nameres::CrateModuleId, |
521 | AstDatabase, AstId, DefDatabase, | 525 | AstId, |
522 | }; | 526 | }; |
523 | 527 | ||
524 | #[derive(Debug, PartialEq, Eq)] | 528 | #[derive(Debug, PartialEq, Eq)] |