aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_project_model
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-07-02 15:47:42 +0100
committerAleksey Kladov <[email protected]>2020-07-02 16:39:51 +0100
commit6c7578bd7a67b0f8fd1fdb6a043c8523104c5807 (patch)
tree86523962b1589754abd296536be6cf34e5aa4110 /crates/ra_project_model
parent83f3cdca4f4a3ba612c082bba35c8ecf76abc166 (diff)
Move cargo metadata off the main loop
Diffstat (limited to 'crates/ra_project_model')
-rw-r--r--crates/ra_project_model/src/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 8dbf4e6ea..464c3b2e3 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -150,7 +150,7 @@ impl ProjectManifest {
150impl ProjectWorkspace { 150impl ProjectWorkspace {
151 pub fn load( 151 pub fn load(
152 manifest: ProjectManifest, 152 manifest: ProjectManifest,
153 cargo_features: &CargoConfig, 153 cargo_config: &CargoConfig,
154 with_sysroot: bool, 154 with_sysroot: bool,
155 ) -> Result<ProjectWorkspace> { 155 ) -> Result<ProjectWorkspace> {
156 let res = match manifest { 156 let res = match manifest {
@@ -166,7 +166,7 @@ impl ProjectWorkspace {
166 ProjectWorkspace::Json { project } 166 ProjectWorkspace::Json { project }
167 } 167 }
168 ProjectManifest::CargoToml(cargo_toml) => { 168 ProjectManifest::CargoToml(cargo_toml) => {
169 let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, cargo_features) 169 let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, cargo_config)
170 .with_context(|| { 170 .with_context(|| {
171 format!( 171 format!(
172 "Failed to read Cargo metadata from Cargo.toml file {}", 172 "Failed to read Cargo metadata from Cargo.toml file {}",