rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into add-disable-diagnostics

Browse Source
This commit is contained in:
Igor Aleksanov
2020-08-14 07:34:07 +03:00
parent 3c018bf84d f1f73649a6
commit c26c911ec1
1140 changed files with 2355 additions and 2386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/rust-analyzer/src/config.rs
View File

@@ -10,9 +10,9 @@
use std::{collections::HashSet, ffi::OsString, path::PathBuf};
use flycheck::FlycheckConfig;
use ide::{AnalysisConfig, AssistConfig, CompletionConfig, HoverConfig, InlayHintsConfig};
use lsp_types::ClientCapabilities;
use ra_ide::{AnalysisConfig, AssistConfig, CompletionConfig, HoverConfig, InlayHintsConfig};
use ra_project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
use project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
use serde::Deserialize;
use vfs::AbsPathBuf;