diff options
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
-rw-r--r-- | crates/ra_hir/src/nameres.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index 7ba031827..32a6ab474 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs | |||
@@ -55,6 +55,7 @@ mod tests; | |||
55 | use std::sync::Arc; | 55 | use std::sync::Arc; |
56 | 56 | ||
57 | use hir_def::{builtin_type::BuiltinType, CrateModuleId}; | 57 | use hir_def::{builtin_type::BuiltinType, CrateModuleId}; |
58 | use hir_expand::diagnostics::DiagnosticSink; | ||
58 | use once_cell::sync::Lazy; | 59 | use once_cell::sync::Lazy; |
59 | use ra_arena::Arena; | 60 | use ra_arena::Arena; |
60 | use ra_db::{Edition, FileId}; | 61 | use ra_db::{Edition, FileId}; |
@@ -65,7 +66,6 @@ use test_utils::tested_by; | |||
65 | 66 | ||
66 | use crate::{ | 67 | use crate::{ |
67 | db::{AstDatabase, DefDatabase}, | 68 | db::{AstDatabase, DefDatabase}, |
68 | diagnostics::DiagnosticSink, | ||
69 | ids::MacroDefId, | 69 | ids::MacroDefId, |
70 | nameres::diagnostics::DefDiagnostic, | 70 | nameres::diagnostics::DefDiagnostic, |
71 | Adt, AstId, Crate, HirFileId, MacroDef, Module, ModuleDef, Name, Path, PathKind, Trait, | 71 | Adt, AstId, Crate, HirFileId, MacroDef, Module, ModuleDef, Name, Path, PathKind, Trait, |
@@ -513,12 +513,13 @@ impl CrateDefMap { | |||
513 | } | 513 | } |
514 | 514 | ||
515 | mod diagnostics { | 515 | mod diagnostics { |
516 | use hir_expand::diagnostics::DiagnosticSink; | ||
516 | use ra_syntax::{ast, AstPtr}; | 517 | use ra_syntax::{ast, AstPtr}; |
517 | use relative_path::RelativePathBuf; | 518 | use relative_path::RelativePathBuf; |
518 | 519 | ||
519 | use crate::{ | 520 | use crate::{ |
520 | db::{AstDatabase, DefDatabase}, | 521 | db::{AstDatabase, DefDatabase}, |
521 | diagnostics::{DiagnosticSink, UnresolvedModule}, | 522 | diagnostics::UnresolvedModule, |
522 | nameres::CrateModuleId, | 523 | nameres::CrateModuleId, |
523 | AstId, | 524 | AstId, |
524 | }; | 525 | }; |