diff options
author | Florian Diebold <[email protected]> | 2019-02-13 19:31:27 +0000 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2019-02-13 19:31:47 +0000 |
commit | 70839b7ef8217fd019ce5bd3a643a8a16f5fa829 (patch) | |
tree | d6888643048c0cf5738f4ddf756047ad138e500c /crates/ra_project_model/src/lib.rs | |
parent | d5ad38cbb87103d8713855e0ec705fd957249afd (diff) |
Make edition handling a bit nicer and allow specifying edition in crate_graph macro
Diffstat (limited to 'crates/ra_project_model/src/lib.rs')
-rw-r--r-- | crates/ra_project_model/src/lib.rs | 6 |
1 files changed, 1 insertions, 5 deletions
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 { | |||
63 | for tgt in pkg.targets(&self.cargo) { | 63 | for tgt in pkg.targets(&self.cargo) { |
64 | let root = tgt.root(&self.cargo); | 64 | let root = tgt.root(&self.cargo); |
65 | if let Some(file_id) = load(root) { | 65 | if let Some(file_id) = load(root) { |
66 | let edition = if pkg.edition(&self.cargo) == "2015" { | 66 | let edition = pkg.edition(&self.cargo); |
67 | Edition::Edition2015 | ||
68 | } else { | ||
69 | Edition::Edition2018 | ||
70 | }; | ||
71 | let crate_id = crate_graph.add_crate_root(file_id, edition); | 67 | let crate_id = crate_graph.add_crate_root(file_id, edition); |
72 | if tgt.kind(&self.cargo) == TargetKind::Lib { | 68 | if tgt.kind(&self.cargo) == TargetKind::Lib { |
73 | lib_tgt = Some(crate_id); | 69 | lib_tgt = Some(crate_id); |