diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-22 11:52:23 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-22 11:52:23 +0000 |
commit | 2ca9cb375385fceede55cfacdbadc1c6bf24e2ea (patch) | |
tree | b8772cc86724b0e9e44f53eb828e4c9b92883024 /crates | |
parent | 6403b530bb75f708b44a22e166671917121e625f (diff) | |
parent | eb2cb6b01f9fc35498e809f3905d5149c045876b (diff) |
Merge #7388
7388: Minor fix for #7387 r=edwin0cheng a=edwin0cheng
bors r+
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates')
-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 82fcf23ad..cf32995e0 100644 --- a/crates/project_model/src/build_data.rs +++ b/crates/project_model/src/build_data.rs | |||
@@ -10,7 +10,7 @@ use std::{ | |||
10 | use anyhow::Result; | 10 | use anyhow::Result; |
11 | use cargo_metadata::{BuildScript, Message, Package, PackageId}; | 11 | use cargo_metadata::{BuildScript, Message, Package, PackageId}; |
12 | use itertools::Itertools; | 12 | use itertools::Itertools; |
13 | use paths::AbsPathBuf; | 13 | use paths::{AbsPath, AbsPathBuf}; |
14 | use rustc_hash::FxHashMap; | 14 | use rustc_hash::FxHashMap; |
15 | use stdx::JodChild; | 15 | use stdx::JodChild; |
16 | 16 | ||
@@ -37,14 +37,14 @@ pub struct BuildData { | |||
37 | 37 | ||
38 | impl BuildDataMap { | 38 | impl BuildDataMap { |
39 | pub(crate) fn new( | 39 | pub(crate) fn new( |
40 | cargo_toml: &Path, | 40 | cargo_toml: &AbsPath, |
41 | cargo_features: &CargoConfig, | 41 | cargo_features: &CargoConfig, |
42 | packages: &Vec<Package>, | 42 | packages: &Vec<Package>, |
43 | progress: &dyn Fn(String), | 43 | progress: &dyn Fn(String), |
44 | ) -> Result<BuildDataMap> { | 44 | ) -> Result<BuildDataMap> { |
45 | let mut cmd = Command::new(toolchain::cargo()); | 45 | let mut cmd = Command::new(toolchain::cargo()); |
46 | cmd.args(&["check", "--workspace", "--message-format=json", "--manifest-path"]) | 46 | cmd.args(&["check", "--workspace", "--message-format=json", "--manifest-path"]) |
47 | .arg(cargo_toml); | 47 | .arg(cargo_toml.as_ref()); |
48 | 48 | ||
49 | // --all-targets includes tests, benches and examples in addition to the | 49 | // --all-targets includes tests, benches and examples in addition to the |
50 | // default lib and bins. This is an independent concept from the --targets | 50 | // default lib and bins. This is an independent concept from the --targets |