aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_project_model/src/cargo_workspace.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_project_model/src/cargo_workspace.rs')
-rw-r--r--crates/ra_project_model/src/cargo_workspace.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
index 446ccfda0..1b3c246c7 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/ra_project_model/src/cargo_workspace.rs
@@ -8,7 +8,7 @@ use ra_db::Edition;
8use rustc_hash::FxHashMap; 8use rustc_hash::FxHashMap;
9use serde::Deserialize; 9use serde::Deserialize;
10 10
11use crate::WorkspaceError; 11use crate::Result;
12 12
13/// `CargoWorkspace` represents the logical structure of, well, a Cargo 13/// `CargoWorkspace` represents the logical structure of, well, a Cargo
14/// workspace. It pretty closely mirrors `cargo metadata` output. 14/// workspace. It pretty closely mirrors `cargo metadata` output.
@@ -156,7 +156,7 @@ impl CargoWorkspace {
156 pub fn from_cargo_metadata( 156 pub fn from_cargo_metadata(
157 cargo_toml: &Path, 157 cargo_toml: &Path,
158 cargo_features: &CargoFeatures, 158 cargo_features: &CargoFeatures,
159 ) -> Result<CargoWorkspace, WorkspaceError> { 159 ) -> Result<CargoWorkspace> {
160 let mut meta = MetadataCommand::new(); 160 let mut meta = MetadataCommand::new();
161 meta.manifest_path(cargo_toml); 161 meta.manifest_path(cargo_toml);
162 if cargo_features.all_features { 162 if cargo_features.all_features {
@@ -171,7 +171,7 @@ impl CargoWorkspace {
171 if let Some(parent) = cargo_toml.parent() { 171 if let Some(parent) = cargo_toml.parent() {
172 meta.current_dir(parent); 172 meta.current_dir(parent);
173 } 173 }
174 let meta = meta.exec().map_err(|e| WorkspaceError::CargoMetadataFailed(e))?; 174 let meta = meta.exec().map_err(|e| format!("cargo metadata failed: {}", e))?;
175 let mut pkg_by_id = FxHashMap::default(); 175 let mut pkg_by_id = FxHashMap::default();
176 let mut packages = Arena::default(); 176 let mut packages = Arena::default();
177 let mut targets = Arena::default(); 177 let mut targets = Arena::default();