From 1fdbf81181356854b692fe0407bac75aba6ea942 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 14 Jul 2020 10:18:08 +0200 Subject: Consolidate hir diagnostics code in one place --- crates/ra_hir/src/code_model.rs | 8 +++----- crates/ra_hir/src/source_analyzer.rs | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'crates/ra_hir') diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 9222009fe..dbda25d1d 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs @@ -24,12 +24,10 @@ use hir_expand::{ }; use hir_ty::{ autoderef, + diagnostics::{expr::ExprValidator, unsafe_check::UnsafeValidator}, display::{HirDisplayError, HirFormatter}, - expr::ExprValidator, - method_resolution, - unsafe_validation::UnsafeValidator, - ApplicationTy, Canonical, GenericPredicate, InEnvironment, Substs, TraitEnvironment, Ty, - TyDefId, TypeCtor, + method_resolution, ApplicationTy, Canonical, GenericPredicate, InEnvironment, Substs, + TraitEnvironment, Ty, TyDefId, TypeCtor, }; use ra_db::{CrateId, Edition, FileId}; use ra_prof::profile; diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs index f74b78b23..bfa543e5b 100644 --- a/crates/ra_hir/src/source_analyzer.rs +++ b/crates/ra_hir/src/source_analyzer.rs @@ -18,7 +18,7 @@ use hir_def::{ }; use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile}; use hir_ty::{ - expr::{record_literal_missing_fields, record_pattern_missing_fields}, + diagnostics::expr::{record_literal_missing_fields, record_pattern_missing_fields}, InferenceResult, Substs, Ty, }; use ra_syntax::{ -- cgit v1.2.3