Skip to content

Commit 2a28445

Browse files
committed
Merge external custom reasons
1 parent accc609 commit 2a28445

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/report.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ impl<P: Package, VS: VersionSet, M: Eq + Clone + Debug + Display> DerivationTree
141141
//
142142
// Cannot be merged because the reason may not match
143143
DerivationTree::External(External::NoVersions(_, _)) => None,
144+
DerivationTree::External(External::Custom(_, r, reason)) => Some(
145+
DerivationTree::External(External::Custom(package, set.union(&r), reason)),
146+
),
144147
DerivationTree::External(External::FromDependencyOf(p1, r1, p2, r2)) => {
145148
if p1 == package {
146149
Some(DerivationTree::External(External::FromDependencyOf(
@@ -158,8 +161,6 @@ impl<P: Package, VS: VersionSet, M: Eq + Clone + Debug + Display> DerivationTree
158161
)))
159162
}
160163
}
161-
// Cannot be merged because the reason may not match
162-
DerivationTree::External(External::Custom(_, _, _)) => None,
163164
}
164165
}
165166
}

0 commit comments

Comments
 (0)