Skip to content

Commit 04a451a

Browse files
wip
1 parent 8b7e802 commit 04a451a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

compiler-core/src/error.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ fn derivation_tree_to_pretty_error_message(
413413
derivation_tree.collapse_no_versions();
414414
let derivation_tree = simplify_error(derivation_tree);
415415

416+
pprint_error(0, &derivation_tree);
416417
// TODO))
417418
// This order is not deterministic, so sometimes it will default to the
418419
// original version even though it's almost the same!!
@@ -612,7 +613,7 @@ fn merge_trees_step<'dt, P: Package, V: Version>(
612613
cause1_p1,
613614
cause1_r1.union(&cause2_r1),
614615
cause1_p2,
615-
cause1_r2.intersection(&cause2_r2),
616+
cause1_r2.union(&cause2_r2),
616617
))
617618
}
618619

0 commit comments

Comments
 (0)