diff options
Diffstat (limited to 'crates/ra_hir/src/nameres')
-rw-r--r-- | crates/ra_hir/src/nameres/tests.rs | 14 |
1 files changed, 4 insertions, 10 deletions
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() { | |||
267 | 267 | ||
268 | #[test] | 268 | #[test] |
269 | fn edition_2015_imports() { | 269 | fn edition_2015_imports() { |
270 | use ra_db::{CrateGraph, Edition}; | ||
271 | let mut db = MockDatabase::with_files( | 270 | let mut db = MockDatabase::with_files( |
272 | " | 271 | " |
273 | //- /main.rs | 272 | //- /main.rs |
@@ -285,17 +284,12 @@ fn edition_2015_imports() { | |||
285 | struct FromLib; | 284 | struct FromLib; |
286 | ", | 285 | ", |
287 | ); | 286 | ); |
288 | let main_id = db.file_id_of("/main.rs"); | 287 | db.set_crate_graph_from_fixture(crate_graph! { |
289 | let lib_id = db.file_id_of("/lib.rs"); | 288 | "main": ("/main.rs", "2015", ["other_crate"]), |
289 | "other_crate": ("/lib.rs", "2018", []), | ||
290 | }); | ||
290 | let foo_id = db.file_id_of("/foo.rs"); | 291 | let foo_id = db.file_id_of("/foo.rs"); |
291 | 292 | ||
292 | let mut crate_graph = CrateGraph::default(); | ||
293 | let main_crate = crate_graph.add_crate_root(main_id, Edition::Edition2015); | ||
294 | let lib_crate = crate_graph.add_crate_root(lib_id, Edition::Edition2018); | ||
295 | crate_graph.add_dep(main_crate, "other_crate".into(), lib_crate).unwrap(); | ||
296 | |||
297 | db.set_crate_graph(Arc::new(crate_graph)); | ||
298 | |||
299 | let module = crate::source_binder::module_from_file_id(&db, foo_id).unwrap(); | 293 | let module = crate::source_binder::module_from_file_id(&db, foo_id).unwrap(); |
300 | let krate = module.krate(&db).unwrap(); | 294 | let krate = module.krate(&db).unwrap(); |
301 | let item_map = db.item_map(krate); | 295 | let item_map = db.item_map(krate); |