language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Cleanup errors

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-22 14:08:18 +03:00
parent 2c48fa087b
commit 0861ac061e
2 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
//! FIXME: write short doc here
use std::path::{Path, PathBuf};
use std::str::FromStr;
use cargo_metadata::{CargoOpt, MetadataCommand};
use ra_arena::{impl_arena_id, Arena, RawId};
@ -143,8 +142,7 @@ impl CargoWorkspace {
for meta_pkg in meta.packages {
let cargo_metadata::Package { id, edition, name, manifest_path, .. } = meta_pkg;
let is_member = ws_members.contains(&id);
let edition = Edition::from_str(&edition)
.map_err(|e| (format!("metadata for package {} failed: {}", &name, e.msg)))?;
let edition = edition.parse::<Edition>()?;
let pkg = packages.alloc(PackageData {
name,
manifest: manifest_path,