Merge #2658

bors[bot] · edwin0cheng · web-flow · commit 97f01396eda7 · 2019-12-25T20:26:08.000Z
2658: Only add features flags if non-empty r=matklad a=edwin0cheng

This prevent error when disabled  `all-features` in a cargo workspace, because of `--features is not allowed in the root of a virtual workspace` when running `cargo metadata`.

Co-authored-by: Edwin Cheng &lt;edwin0cheng@gmail.com&gt;
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
@@ -165,7 +165,7 @@ impl CargoWorkspace {
             // FIXME: `NoDefaultFeatures` is mutual exclusive with `SomeFeatures`
             // https://github.com/oli-obk/cargo_metadata/issues/79
             meta.features(CargoOpt::NoDefaultFeatures);
-        } else {
+        } else if cargo_features.features.len() > 0 {
             meta.features(CargoOpt::SomeFeatures(cargo_features.features.clone()));
         }
         if let Some(parent) = cargo_toml.parent() {

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ impl CargoWorkspace {`
`165`	`165`	// FIXME: `NoDefaultFeatures` is mutual exclusive with `SomeFeatures`
`166`	`166`	`// https://github.com/oli-obk/cargo_metadata/issues/79`
`167`	`167`	`meta.features(CargoOpt::NoDefaultFeatures);`
`168`		`- } else {`
	`168`	`+ } else if cargo_features.features.len() > 0 {`
`169`	`169`	`meta.features(CargoOpt::SomeFeatures(cargo_features.features.clone()));`
`170`	`170`	`}`
`171`	`171`	`if let Some(parent) = cargo_toml.parent() {`