From 7ee2887d1ec129afed80845c2361ce35f1a0c013 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 23 Mar 2019 21:20:49 +0300
Subject: fixes

---
 crates/ra_hir/src/nameres.rs         | 2 +-
 crates/ra_ide_api/src/diagnostics.rs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index cdf502368..56ed872d5 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -192,7 +192,7 @@ impl CrateDefMap {
             CrateDefMap {
                 krate,
                 edition,
-                xextern_prelude: FxHashMap::default(),
+                extern_prelude: FxHashMap::default(),
                 prelude: None,
                 root,
                 modules,
diff --git a/crates/ra_ide_api/src/diagnostics.rs b/crates/ra_ide_api/src/diagnostics.rs
index e03dcaa8f..5b1a90c82 100644
--- a/crates/ra_ide_api/src/diagnostics.rs
+++ b/crates/ra_ide_api/src/diagnostics.rs
@@ -1,10 +1,9 @@
 use itertools::Itertools;
-use hir::{source_binder, diagnostics::Diagnostic as _};
+use hir::{source_binder, diagnostics::{Diagnostic as _, DiagnosticSink}};
 use ra_db::SourceDatabase;
 use ra_syntax::{
     Location, SourceFile, SyntaxKind, TextRange, SyntaxNode,
     ast::{self, AstNode},
-
 };
 use ra_text_edit::{TextEdit, TextEditBuilder};
 
@@ -129,7 +128,7 @@ fn check_struct_shorthand_initialization(
 }
 
 fn check_module(acc: &mut Vec<Diagnostic>, db: &RootDatabase, module: hir::Module) {
-    let mut diagnostics = hir::diagnostics::DiagnosticSink::default();
+    let mut diagnostics = DiagnosticSink::default();
     module.diagnostics(db, &mut diagnostics);
     for decl in module.declarations(db) {
         match decl {
-- 
cgit v1.2.3