diff options
-rw-r--r-- | crates/ra_hir/src/nameres.rs | 2 | ||||
-rw-r--r-- | 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 { | |||
192 | CrateDefMap { | 192 | CrateDefMap { |
193 | krate, | 193 | krate, |
194 | edition, | 194 | edition, |
195 | xextern_prelude: FxHashMap::default(), | 195 | extern_prelude: FxHashMap::default(), |
196 | prelude: None, | 196 | prelude: None, |
197 | root, | 197 | root, |
198 | modules, | 198 | 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 @@ | |||
1 | use itertools::Itertools; | 1 | use itertools::Itertools; |
2 | use hir::{source_binder, diagnostics::Diagnostic as _}; | 2 | use hir::{source_binder, diagnostics::{Diagnostic as _, DiagnosticSink}}; |
3 | use ra_db::SourceDatabase; | 3 | use ra_db::SourceDatabase; |
4 | use ra_syntax::{ | 4 | use ra_syntax::{ |
5 | Location, SourceFile, SyntaxKind, TextRange, SyntaxNode, | 5 | Location, SourceFile, SyntaxKind, TextRange, SyntaxNode, |
6 | ast::{self, AstNode}, | 6 | ast::{self, AstNode}, |
7 | |||
8 | }; | 7 | }; |
9 | use ra_text_edit::{TextEdit, TextEditBuilder}; | 8 | use ra_text_edit::{TextEdit, TextEditBuilder}; |
10 | 9 | ||
@@ -129,7 +128,7 @@ fn check_struct_shorthand_initialization( | |||
129 | } | 128 | } |
130 | 129 | ||
131 | fn check_module(acc: &mut Vec<Diagnostic>, db: &RootDatabase, module: hir::Module) { | 130 | fn check_module(acc: &mut Vec<Diagnostic>, db: &RootDatabase, module: hir::Module) { |
132 | let mut diagnostics = hir::diagnostics::DiagnosticSink::default(); | 131 | let mut diagnostics = DiagnosticSink::default(); |
133 | module.diagnostics(db, &mut diagnostics); | 132 | module.diagnostics(db, &mut diagnostics); |
134 | for decl in module.declarations(db) { | 133 | for decl in module.declarations(db) { |
135 | match decl { | 134 | match decl { |