language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fixes

Browse source
This commit is contained in:
Aleksey Kladov 2019-03-23 21:20:49 +03:00
parent 45fbab2b1a
commit 7ee2887d1e
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_hir/src/nameres.rs
View file

@ -192,7 +192,7 @@ impl CrateDefMap {
CrateDefMap { CrateDefMap {
krate, krate,
edition, edition,
xextern_prelude: FxHashMap::default(), extern_prelude: FxHashMap::default(),
prelude: None, prelude: None,
root, root,
modules, modules,

5
crates/ra_ide_api/src/diagnostics.rs
View file

@ -1,10 +1,9 @@
use itertools::Itertools; use itertools::Itertools;
use hir::{source_binder, diagnostics::Diagnostic as _}; use hir::{source_binder, diagnostics::{Diagnostic as _, DiagnosticSink}};
use ra_db::SourceDatabase; use ra_db::SourceDatabase;
use ra_syntax::{ use ra_syntax::{
Location, SourceFile, SyntaxKind, TextRange, SyntaxNode, Location, SourceFile, SyntaxKind, TextRange, SyntaxNode,
ast::{self, AstNode}, ast::{self, AstNode},
}; };
use ra_text_edit::{TextEdit, TextEditBuilder}; 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) { 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); module.diagnostics(db, &mut diagnostics);
for decl in module.declarations(db) { for decl in module.declarations(db) {
match decl { match decl {