Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #5227

Browse source 
5227: AbsPath r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-07-05 09:17:27 +00:00 committed by GitHub
commit 6b74e27ba0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_project_model/src/cargo_workspace.rs
View file

@ -134,12 +134,12 @@ impl PackageData {
impl CargoWorkspace { impl CargoWorkspace {
pub fn from_cargo_metadata( pub fn from_cargo_metadata(
cargo_toml: &Path, cargo_toml: &AbsPath,
cargo_features: &CargoConfig, cargo_features: &CargoConfig,
) -> Result<CargoWorkspace> { ) -> Result<CargoWorkspace> {
let mut meta = MetadataCommand::new(); let mut meta = MetadataCommand::new();
meta.cargo_path(ra_toolchain::cargo()); meta.cargo_path(ra_toolchain::cargo());
meta.manifest_path(cargo_toml); meta.manifest_path(cargo_toml.to_path_buf());
if cargo_features.all_features { if cargo_features.all_features {
meta.features(CargoOpt::AllFeatures); meta.features(CargoOpt::AllFeatures);
} else if cargo_features.no_default_features { } else if cargo_features.no_default_features {
@ -150,7 +150,7 @@ impl CargoWorkspace {
meta.features(CargoOpt::SomeFeatures(cargo_features.features.clone())); meta.features(CargoOpt::SomeFeatures(cargo_features.features.clone()));
} }
if let Some(parent) = cargo_toml.parent() { if let Some(parent) = cargo_toml.parent() {
meta.current_dir(parent); meta.current_dir(parent.to_path_buf());
} }
if let Some(target) = cargo_features.target.as_ref() { if let Some(target) = cargo_features.target.as_ref() {
meta.other_options(vec![String::from("--filter-platform"), target.clone()]); meta.other_options(vec![String::from("--filter-platform"), target.clone()]);