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

don't load sysroot in most heavy tests

Browse Source
This commit is contained in:
Aleksey Kladov
2019-08-19 15:41:18 +03:00
parent cef90ce45e
commit 7cd9b1dd7a
7 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/ra_project_model/src/lib.rs
View File

@@ -57,6 +57,10 @@ impl PackageRoot {
impl ProjectWorkspace {
pub fn discover(path: &Path) -> Result<ProjectWorkspace> {
ProjectWorkspace::discover_with_sysroot(path, true)
}
pub fn discover_with_sysroot(path: &Path, with_sysroot: bool) -> Result<ProjectWorkspace> {
match find_rust_project_json(path) {
Some(json_path) => {
let file = File::open(json_path)?;
@@ -65,10 +69,10 @@ impl ProjectWorkspace {
}
None => {
let cargo_toml = find_cargo_toml(path)?;
Ok(ProjectWorkspace::Cargo {
cargo: CargoWorkspace::from_cargo_metadata(&cargo_toml)?,
sysroot: Sysroot::discover(&cargo_toml)?,
})
let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml)?;
let sysroot =
if with_sysroot { Sysroot::discover(&cargo_toml)? } else { Sysroot::default() };
Ok(ProjectWorkspace::Cargo { cargo, sysroot })
}
}
}