From b69738590ca1c4823a030d317e7fa6e918618a4b Mon Sep 17 00:00:00 2001
From: Metabaron <metabaron@tuta.io>
Date: Mon, 11 Nov 2019 23:16:59 +0100
Subject: Implement FromStr for enum Edition

---
 crates/ra_project_model/src/cargo_workspace.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'crates/ra_project_model/src')

diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs
index 28dadea9d..ff96bf904 100644
--- a/crates/ra_project_model/src/cargo_workspace.rs
+++ b/crates/ra_project_model/src/cargo_workspace.rs
@@ -1,6 +1,7 @@
 //! 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};
@@ -141,12 +142,14 @@ impl CargoWorkspace {
 
         for meta_pkg in meta.packages {
             let is_member = ws_members.contains(&meta_pkg.id);
+            let name = meta_pkg.name;
             let pkg = packages.alloc(PackageData {
-                name: meta_pkg.name,
+                name: name.clone(),
                 manifest: meta_pkg.manifest_path.clone(),
                 targets: Vec::new(),
                 is_member,
-                edition: Edition::from_string(&meta_pkg.edition),
+                edition: Edition::from_str(&meta_pkg.edition)
+                    .unwrap_or_else(|e| panic!("unknown edition {} for package {:?}", e, &name)),
                 dependencies: Vec::new(),
                 features: Vec::new(),
             });
-- 
cgit v1.2.3