File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -983,7 +983,12 @@ fn find_candidate(
983
983
. any ( |c| * c == ConflictReason :: PublicDependency )
984
984
{
985
985
// we dont have abnormal situations. So we can ask `cx` for how far back we need to go.
986
- cx. is_conflicting ( Some ( parent. package_id ( ) ) , conflicting_activations)
986
+ let a = cx. is_conflicting ( Some ( parent. package_id ( ) ) , conflicting_activations) ;
987
+ // If the `conflicting_activations` does not apply to `cx`, then something went very wrong
988
+ // in building it. But we will just fall back to laboriously trying all possibilities witch
989
+ // will give us the correct answer so only `assert` if there is a developer to debug it.
990
+ debug_assert ! ( a. is_some( ) ) ;
991
+ a
987
992
} else {
988
993
None
989
994
} ;
You can’t perform that action at this time.
0 commit comments