diff options
Diffstat (limited to 'crates/ra_project_model/src')
-rw-r--r-- | crates/ra_project_model/src/cargo_workspace.rs | 14 | ||||
-rw-r--r-- | crates/ra_project_model/src/lib.rs | 4 |
2 files changed, 3 insertions, 15 deletions
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs index 47a1d393d..361fc8eea 100644 --- a/crates/ra_project_model/src/cargo_workspace.rs +++ b/crates/ra_project_model/src/cargo_workspace.rs | |||
@@ -45,7 +45,7 @@ impl ops::Index<Target> for CargoWorkspace { | |||
45 | } | 45 | } |
46 | } | 46 | } |
47 | 47 | ||
48 | #[derive(Clone, Debug, PartialEq, Eq)] | 48 | #[derive(Default, Clone, Debug, PartialEq, Eq)] |
49 | pub struct CargoConfig { | 49 | pub struct CargoConfig { |
50 | /// Do not activate the `default` feature. | 50 | /// Do not activate the `default` feature. |
51 | pub no_default_features: bool, | 51 | pub no_default_features: bool, |
@@ -64,18 +64,6 @@ pub struct CargoConfig { | |||
64 | pub target: Option<String>, | 64 | pub target: Option<String>, |
65 | } | 65 | } |
66 | 66 | ||
67 | impl Default for CargoConfig { | ||
68 | fn default() -> Self { | ||
69 | CargoConfig { | ||
70 | no_default_features: false, | ||
71 | all_features: false, | ||
72 | features: Vec::new(), | ||
73 | load_out_dirs_from_check: false, | ||
74 | target: None, | ||
75 | } | ||
76 | } | ||
77 | } | ||
78 | |||
79 | pub type Package = Idx<PackageData>; | 67 | pub type Package = Idx<PackageData>; |
80 | 68 | ||
81 | pub type Target = Idx<TargetData>; | 69 | pub type Target = Idx<TargetData>; |
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 { | |||
150 | impl ProjectWorkspace { | 150 | impl 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 {}", |