Skip to content

Commit 0210a99

Browse files
committed
Merge external custom reasons
1 parent 1a6971f commit 0210a99

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
@@ -144,6 +144,9 @@ impl<P: Package, VS: VersionSet, M: Eq + Clone + Debug + Display> DerivationTree
144144
//
145145
// Cannot be merged because the reason may not match
146146
DerivationTree::External(External::NoVersions(_, _)) => None,
147+
DerivationTree::External(External::Custom(_, r, reason)) => Some(
148+
DerivationTree::External(External::Custom(package, set.union(&r), reason)),
149+
),
147150
DerivationTree::External(External::FromDependencyOf(p1, r1, p2, r2)) => {
148151
if p1 == package {
149152
Some(DerivationTree::External(External::FromDependencyOf(
@@ -161,8 +164,6 @@ impl<P: Package, VS: VersionSet, M: Eq + Clone + Debug + Display> DerivationTree
161164
)))
162165
}
163166
}
164-
// Cannot be merged because the reason may not match
165-
DerivationTree::External(External::Custom(_, _, _)) => None,
166167
}
167168
}
168169
}

0 commit comments

Comments
 (0)