diff options
Diffstat (limited to 'crates/ra_hir/src/nameres/tests.rs')
-rw-r--r-- | crates/ra_hir/src/nameres/tests.rs | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/crates/ra_hir/src/nameres/tests.rs b/crates/ra_hir/src/nameres/tests.rs index 0654dbaa1..3dfad6bf2 100644 --- a/crates/ra_hir/src/nameres/tests.rs +++ b/crates/ra_hir/src/nameres/tests.rs | |||
@@ -42,19 +42,11 @@ fn check_module_item_map(map: &ItemMap, module_id: ModuleId, expected: &str) { | |||
42 | .collect::<Vec<_>>(); | 42 | .collect::<Vec<_>>(); |
43 | lines.sort(); | 43 | lines.sort(); |
44 | let actual = lines.join("\n"); | 44 | let actual = lines.join("\n"); |
45 | let expected = expected | 45 | let expected = expected.trim().lines().map(|it| it.trim()).collect::<Vec<_>>().join("\n"); |
46 | .trim() | ||
47 | .lines() | ||
48 | .map(|it| it.trim()) | ||
49 | .collect::<Vec<_>>() | ||
50 | .join("\n"); | ||
51 | assert_eq_text!(&expected, &actual); | 46 | assert_eq_text!(&expected, &actual); |
52 | 47 | ||
53 | fn dump_resolution(resolution: &Resolution) -> &'static str { | 48 | fn dump_resolution(resolution: &Resolution) -> &'static str { |
54 | match ( | 49 | match (resolution.def.types.is_some(), resolution.def.values.is_some()) { |
55 | resolution.def.types.is_some(), | ||
56 | resolution.def.values.is_some(), | ||
57 | ) { | ||
58 | (true, true) => "t v", | 50 | (true, true) => "t v", |
59 | (true, false) => "t", | 51 | (true, false) => "t", |
60 | (false, true) => "v", | 52 | (false, true) => "v", |
@@ -314,9 +306,7 @@ fn item_map_across_crates() { | |||
314 | let mut crate_graph = CrateGraph::default(); | 306 | let mut crate_graph = CrateGraph::default(); |
315 | let main_crate = crate_graph.add_crate_root(main_id); | 307 | let main_crate = crate_graph.add_crate_root(main_id); |
316 | let lib_crate = crate_graph.add_crate_root(lib_id); | 308 | let lib_crate = crate_graph.add_crate_root(lib_id); |
317 | crate_graph | 309 | crate_graph.add_dep(main_crate, "test_crate".into(), lib_crate).unwrap(); |
318 | .add_dep(main_crate, "test_crate".into(), lib_crate) | ||
319 | .unwrap(); | ||
320 | 310 | ||
321 | db.set_crate_graph(Arc::new(crate_graph)); | 311 | db.set_crate_graph(Arc::new(crate_graph)); |
322 | 312 | ||
@@ -357,9 +347,7 @@ fn extern_crate_rename() { | |||
357 | let mut crate_graph = CrateGraph::default(); | 347 | let mut crate_graph = CrateGraph::default(); |
358 | let main_crate = crate_graph.add_crate_root(main_id); | 348 | let main_crate = crate_graph.add_crate_root(main_id); |
359 | let lib_crate = crate_graph.add_crate_root(lib_id); | 349 | let lib_crate = crate_graph.add_crate_root(lib_id); |
360 | crate_graph | 350 | crate_graph.add_dep(main_crate, "alloc".into(), lib_crate).unwrap(); |
361 | .add_dep(main_crate, "alloc".into(), lib_crate) | ||
362 | .unwrap(); | ||
363 | 351 | ||
364 | db.set_crate_graph(Arc::new(crate_graph)); | 352 | db.set_crate_graph(Arc::new(crate_graph)); |
365 | 353 | ||
@@ -406,9 +394,7 @@ fn import_across_source_roots() { | |||
406 | let mut crate_graph = CrateGraph::default(); | 394 | let mut crate_graph = CrateGraph::default(); |
407 | let main_crate = crate_graph.add_crate_root(main_id); | 395 | let main_crate = crate_graph.add_crate_root(main_id); |
408 | let lib_crate = crate_graph.add_crate_root(lib_id); | 396 | let lib_crate = crate_graph.add_crate_root(lib_id); |
409 | crate_graph | 397 | crate_graph.add_dep(main_crate, "test_crate".into(), lib_crate).unwrap(); |
410 | .add_dep(main_crate, "test_crate".into(), lib_crate) | ||
411 | .unwrap(); | ||
412 | 398 | ||
413 | db.set_crate_graph(Arc::new(crate_graph)); | 399 | db.set_crate_graph(Arc::new(crate_graph)); |
414 | 400 | ||
@@ -447,9 +433,7 @@ fn reexport_across_crates() { | |||
447 | let mut crate_graph = CrateGraph::default(); | 433 | let mut crate_graph = CrateGraph::default(); |
448 | let main_crate = crate_graph.add_crate_root(main_id); | 434 | let main_crate = crate_graph.add_crate_root(main_id); |
449 | let lib_crate = crate_graph.add_crate_root(lib_id); | 435 | let lib_crate = crate_graph.add_crate_root(lib_id); |
450 | crate_graph | 436 | crate_graph.add_dep(main_crate, "test_crate".into(), lib_crate).unwrap(); |
451 | .add_dep(main_crate, "test_crate".into(), lib_crate) | ||
452 | .unwrap(); | ||
453 | 437 | ||
454 | db.set_crate_graph(Arc::new(crate_graph)); | 438 | db.set_crate_graph(Arc::new(crate_graph)); |
455 | 439 | ||
@@ -482,11 +466,7 @@ fn check_item_map_is_not_recomputed(initial: &str, file_change: &str) { | |||
482 | let events = db.log_executed(|| { | 466 | let events = db.log_executed(|| { |
483 | db.item_map(krate); | 467 | db.item_map(krate); |
484 | }); | 468 | }); |
485 | assert!( | 469 | assert!(!format!("{:?}", events).contains("item_map"), "{:#?}", events) |
486 | !format!("{:?}", events).contains("item_map"), | ||
487 | "{:#?}", | ||
488 | events | ||
489 | ) | ||
490 | } | 470 | } |
491 | } | 471 | } |
492 | 472 | ||