nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

add working dir to cargo metadata fail messages

Browse Source
This commit is contained in:
lf- 2020-12-31 04:42:59 -08:00
parent 53e2cdf18e
commit 27a0fd23d8
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/project_model/src/cargo_workspace.rs
View File

@ -1,6 +1,7 @@
//! FIXME: write short doc here
use std::{
convert::TryInto,
ffi::OsStr,
ops,
path::{Path, PathBuf},
@ -196,8 +197,23 @@ impl CargoWorkspace {
if let Some(target) = target {
meta.other_options(vec![String::from("--filter-platform"), target]);
}
let mut meta = meta.exec().with_context(|| {
format!("Failed to run `cargo metadata --manifest-path {}`", cargo_toml.display())
let cwd: Option<AbsPathBuf> =
std::env::current_dir().ok().and_then(|p| p.try_into().ok());
let workdir = cargo_toml
.parent()
.map(|p| p.to_path_buf())
.or(cwd)
.map(|dir| dir.to_string_lossy().to_string())
.unwrap_or_else(|| "<failed to get path>".into());
format!(
"Failed to run `cargo metadata --manifest-path {}` in `{}`",
cargo_toml.display(),
workdir
)
})?;
let mut out_dir_by_id = FxHashMap::default();