From 70839b7ef8217fd019ce5bd3a643a8a16f5fa829 Mon Sep 17 00:00:00 2001 From: Florian Diebold 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_hir/src/nameres/tests.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'crates/ra_hir/src/nameres') 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); -- cgit v1.2.3