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

Split pub fn cargo_load into pub fn load_workspace_at and pub fn load_workspace

Browse Source
This commit is contained in:
Vincent Esche
2021-02-16 00:26:47 +01:00
parent cc49502ab4
commit 1a44168260
6 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/rust-analyzer/src/cli/diagnostics.rs
View File

@@ -11,7 +11,7 @@ use ide::{DiagnosticsConfig, Severity};
use ide_db::base_db::SourceDatabaseExt;
use crate::cli::{
load_cargo::{load_cargo, LoadCargoConfig},
load_cargo::{load_workspace_at, LoadCargoConfig},
Result,
};
@@ -33,12 +33,9 @@ pub fn diagnostics(
load_out_dirs_from_check: bool,
with_proc_macro: bool,
) -> Result<()> {
let load_cargo_config = LoadCargoConfig {
cargo_config: Default::default(),
load_out_dirs_from_check,
with_proc_macro,
};
let (host, _vfs) = load_cargo(path, &load_cargo_config)?;
let cargo_config = Default::default();
let load_cargo_config = LoadCargoConfig { load_out_dirs_from_check, with_proc_macro };
let (host, _vfs) = load_workspace_at(path, &cargo_config, &load_cargo_config, &|_| {})?;
let db = host.raw_database();
let analysis = host.analysis();