diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-22 11:52:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 11:52:23 +0000 |
| commit | 2ca9cb375385fceede55cfacdbadc1c6bf24e2ea (patch) | |
| tree | b8772cc86724b0e9e44f53eb828e4c9b92883024 | |
| parent | 6403b530bb75f708b44a22e166671917121e625f (diff) | |
| parent | eb2cb6b01f9fc35498e809f3905d5149c045876b (diff) | |
| download | rust-2ca9cb375385fceede55cfacdbadc1c6bf24e2ea.tar.gz rust-2ca9cb375385fceede55cfacdbadc1c6bf24e2ea.zip | |
Merge #7388
7388: Minor fix for #7387 r=edwin0cheng a=edwin0cheng bors r+ Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
| -rw-r--r-- | crates/project_model/src/build_data.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/project_model/src/build_data.rs b/crates/project_model/src/build_data.rs index 82fcf23ada7..cf32995e0e1 100644 --- a/crates/project_model/src/build_data.rs +++ b/crates/project_model/src/build_data.rs @@ -10,7 +10,7 @@ use std::{ use anyhow::Result; use cargo_metadata::{BuildScript, Message, Package, PackageId}; use itertools::Itertools; -use paths::AbsPathBuf; +use paths::{AbsPath, AbsPathBuf}; use rustc_hash::FxHashMap; use stdx::JodChild; @@ -37,14 +37,14 @@ pub struct BuildData { impl BuildDataMap { pub(crate) fn new( - cargo_toml: &Path, + cargo_toml: &AbsPath, cargo_features: &CargoConfig, packages: &Vec<Package>, progress: &dyn Fn(String), ) -> Result<BuildDataMap> { let mut cmd = Command::new(toolchain::cargo()); cmd.args(&["check", "--workspace", "--message-format=json", "--manifest-path"]) - .arg(cargo_toml); + .arg(cargo_toml.as_ref()); // --all-targets includes tests, benches and examples in addition to the // default lib and bins. This is an independent concept from the --targets |
