From 70839b7ef8217fd019ce5bd3a643a8a16f5fa829 Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Wed, 13 Feb 2019 20:31:27 +0100
Subject: Make edition handling a bit nicer and allow specifying edition in
 crate_graph macro

---
 crates/ra_project_model/src/lib.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'crates/ra_project_model/src/lib.rs')

diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index e5c93fd85..1b18ac836 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -63,11 +63,7 @@ impl ProjectWorkspace {
             for tgt in pkg.targets(&self.cargo) {
                 let root = tgt.root(&self.cargo);
                 if let Some(file_id) = load(root) {
-                    let edition = if pkg.edition(&self.cargo) == "2015" {
-                        Edition::Edition2015
-                    } else {
-                        Edition::Edition2018
-                    };
+                    let edition = pkg.edition(&self.cargo);
                     let crate_id = crate_graph.add_crate_root(file_id, edition);
                     if tgt.kind(&self.cargo) == TargetKind::Lib {
                         lib_tgt = Some(crate_id);
-- 
cgit v1.2.3