From 53b9c1c8d898a84a10b86f2fc31a7f6c2dfc46d0 Mon Sep 17 00:00:00 2001 From: Metabaron Date: Tue, 12 Nov 2019 11:53:31 +0100 Subject: return Error instead of panicking in from_cargo_metadata --- crates/ra_project_model/src/cargo_workspace.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'crates/ra_project_model') diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs index ff96bf904..cf88911b7 100644 --- a/crates/ra_project_model/src/cargo_workspace.rs +++ b/crates/ra_project_model/src/cargo_workspace.rs @@ -141,20 +141,21 @@ impl CargoWorkspace { let ws_members = &meta.workspace_members; for meta_pkg in meta.packages { - let is_member = ws_members.contains(&meta_pkg.id); - let name = meta_pkg.name; + 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 pkg = packages.alloc(PackageData { - name: name.clone(), - manifest: meta_pkg.manifest_path.clone(), + name, + manifest: manifest_path, targets: Vec::new(), is_member, - edition: Edition::from_str(&meta_pkg.edition) - .unwrap_or_else(|e| panic!("unknown edition {} for package {:?}", e, &name)), + edition, dependencies: Vec::new(), features: Vec::new(), }); let pkg_data = &mut packages[pkg]; - pkg_by_id.insert(meta_pkg.id.clone(), pkg); + pkg_by_id.insert(id, pkg); for meta_tgt in meta_pkg.targets { let tgt = targets.alloc(TargetData { pkg, -- cgit v1.2.3