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

Move cargo metadata off the main loop

Browse source
This commit is contained in:
Aleksey Kladov 2020-07-02 16:47:42 +02:00
parent 83f3cdca4f
commit 6c7578bd7a
4 changed files with 56 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_project_model/src/lib.rs
View file

@ -150,7 +150,7 @@ impl ProjectManifest {
impl ProjectWorkspace {
pub fn load(
manifest: ProjectManifest,
cargo_features: &CargoConfig,
cargo_config: &CargoConfig,
with_sysroot: bool,
) -> Result<ProjectWorkspace> {
let res = match manifest {
@ -166,7 +166,7 @@ impl ProjectWorkspace {
ProjectWorkspace::Json { project }
}
ProjectManifest::CargoToml(cargo_toml) => {
let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, cargo_features)
let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, cargo_config)
.with_context(|| {
format!(
"Failed to read Cargo metadata from Cargo.toml file {}",