language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

update cargo_metadata

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-14 16:15:25 +03:00
parent 8caff4e034
commit db43b44f71
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_lsp_server/src/project_model/cargo_workspace.rs
View file

@ -1,6 +1,6 @@
use std::path::{Path, PathBuf};
use cargo_metadata::{metadata_run, CargoOpt};
use cargo_metadata::{MetadataCommand, CargoOpt};
use ra_syntax::SmolStr;
use ra_arena::{Arena, RawId, impl_arena_id};
use rustc_hash::FxHashMap;
@ -117,7 +117,10 @@ impl Target {
impl CargoWorkspace {
pub fn from_cargo_metadata(cargo_toml: &Path) -> Result<CargoWorkspace> {
let meta = metadata_run(Some(cargo_toml), true, Some(CargoOpt::AllFeatures))
let meta = MetadataCommand::new()
.manifest_path(cargo_toml)
.features(CargoOpt::AllFeatures)
.exec()
.map_err(|e| format_err!("cargo metadata failed: {}", e))?;
let mut pkg_by_id = FxHashMap::default();
let mut packages = Arena::default();