Make edition handling a bit nicer and allow specifying edition in crate_graph macro

2 files changed, 13 insertions, 16 deletions

diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
index 145ed39a1..f1cad77c5 100644
--- a/crates/ra_hir/src/mock.rs
+++ b/crates/ra_hir/src/mock.rs
@@ -59,12 +59,12 @@ impl MockDatabase {
     pub fn set_crate_graph_from_fixture(&mut self, graph: CrateGraphFixture) {
         let mut ids = FxHashMap::default();
         let mut crate_graph = CrateGraph::default();
-        for (crate_name, (crate_root, _)) in graph.0.iter() {
+        for (crate_name, (crate_root, edition, _)) in graph.0.iter() {
             let crate_root = self.file_id_of(&crate_root);
-            let crate_id = crate_graph.add_crate_root(crate_root, Edition::Edition2018);
+            let crate_id = crate_graph.add_crate_root(crate_root, *edition);
             ids.insert(crate_name, crate_id);
         }
-        for (crate_name, (_, deps)) in graph.0.iter() {
+        for (crate_name, (_, _, deps)) in graph.0.iter() {
             let from = ids[crate_name];
             for dep in deps {
                 let to = ids[dep];
@@ -233,16 +233,19 @@ impl MockDatabase {
 }
 
 #[derive(Default)]
-pub struct CrateGraphFixture(pub FxHashMap<String, (String, Vec<String>)>);
+pub struct CrateGraphFixture(pub FxHashMap<String, (String, Edition, Vec<String>)>);
 
 #[macro_export]
 macro_rules! crate_graph {
-    ($($crate_name:literal: ($crate_path:literal, [$($dep:literal),*]),)*) => {{
+    ($($crate_name:literal: ($crate_path:literal, $($edition:literal,)? [$($dep:literal),*]),)*) => {{
         let mut res = $crate::mock::CrateGraphFixture::default();
         $(
+            #[allow(unused_mut, unused_assignments)]
+            let mut edition = ra_db::Edition::Edition2018;
+            $(edition = ra_db::Edition::from_string($edition);)?
             res.0.insert(
                 $crate_name.to_string(),
-                ($crate_path.to_string(), vec![$($dep.to_string()),*])
+                ($crate_path.to_string(), edition, vec![$($dep.to_string()),*])
             );
         )*
         res
diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs
index bee475c3a..e764e0855 100644
--- a/crates/ra_hir/src/nameres/tests.rs
+++ b/crates/ra_hir/src/nameres/tests.rs
@@ -267,7 +267,6 @@ fn glob_across_crates() {
 
 #[test]
 fn edition_2015_imports() {
-    use ra_db::{CrateGraph, Edition};
     let mut db = MockDatabase::with_files(
         "
         //- /main.rs
@@ -285,17 +284,12 @@ fn edition_2015_imports() {
         struct FromLib;
     ",
     );
-    let main_id = db.file_id_of("/main.rs");
-    let lib_id = db.file_id_of("/lib.rs");
+    db.set_crate_graph_from_fixture(crate_graph! {
+        "main": ("/main.rs", "2015", ["other_crate"]),
+        "other_crate": ("/lib.rs", "2018", []),
+    });
     let foo_id = db.file_id_of("/foo.rs");
 
-    let mut crate_graph = CrateGraph::default();
-    let main_crate = crate_graph.add_crate_root(main_id, Edition::Edition2015);
-    let lib_crate = crate_graph.add_crate_root(lib_id, Edition::Edition2018);
-    crate_graph.add_dep(main_crate, "other_crate".into(), lib_crate).unwrap();
-
-    db.set_crate_graph(Arc::new(crate_graph));
-
     let module = crate::source_binder::module_from_file_id(&db, foo_id).unwrap();
     let krate = module.krate(&db).unwrap();
     let item_map = db.item_map(krate);