From 13735d91a78ba51fb202cb7dde1dfe25420afe9a Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 2 Nov 2019 23:42:38 +0300 Subject: Move diagnostics to hir_expand --- crates/ra_hir/src/nameres.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 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 7ba031827..32a6ab474 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs @@ -55,6 +55,7 @@ mod tests; use std::sync::Arc; use hir_def::{builtin_type::BuiltinType, CrateModuleId}; +use hir_expand::diagnostics::DiagnosticSink; use once_cell::sync::Lazy; use ra_arena::Arena; use ra_db::{Edition, FileId}; @@ -65,7 +66,6 @@ use test_utils::tested_by; use crate::{ db::{AstDatabase, DefDatabase}, - diagnostics::DiagnosticSink, ids::MacroDefId, nameres::diagnostics::DefDiagnostic, Adt, AstId, Crate, HirFileId, MacroDef, Module, ModuleDef, Name, Path, PathKind, Trait, @@ -513,12 +513,13 @@ impl CrateDefMap { } mod diagnostics { + use hir_expand::diagnostics::DiagnosticSink; use ra_syntax::{ast, AstPtr}; use relative_path::RelativePathBuf; use crate::{ db::{AstDatabase, DefDatabase}, - diagnostics::{DiagnosticSink, UnresolvedModule}, + diagnostics::UnresolvedModule, nameres::CrateModuleId, AstId, }; -- cgit v1.2.3