aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdwin Cheng <[email protected]>2021-01-22 11:51:14 +0000
committerEdwin Cheng <[email protected]>2021-01-22 11:51:14 +0000
commiteb2cb6b01f9fc35498e809f3905d5149c045876b (patch)
treeb8772cc86724b0e9e44f53eb828e4c9b92883024
parent6403b530bb75f708b44a22e166671917121e625f (diff)
Use AbsPath
-rw-r--r--crates/project_model/src/build_data.rs6
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::{
10use anyhow::Result; 10use anyhow::Result;
11use cargo_metadata::{BuildScript, Message, Package, PackageId}; 11use cargo_metadata::{BuildScript, Message, Package, PackageId};
12use itertools::Itertools; 12use itertools::Itertools;
13use paths::AbsPathBuf; 13use paths::{AbsPath, AbsPathBuf};
14use rustc_hash::FxHashMap; 14use rustc_hash::FxHashMap;
15use stdx::JodChild; 15use stdx::JodChild;
16 16
@@ -37,14 +37,14 @@ pub struct BuildData {
37 37
38impl BuildDataMap { 38impl 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