@@ -485,15 +485,15 @@ impl<DP: DependencyProvider> PartialSolution<DP> {
485
485
. get ( satisfier_package)
486
486
. expect ( "satisfier package not in incompat" ) ;
487
487
488
- let start_term = accum_term. intersection ( & incompat_term. negate ( ) ) ;
489
- let out = satisfier_pa. satisfier ( satisfier_package, & start_term) ;
490
-
491
488
satisfied_map. insert (
492
489
satisfier_package,
493
490
if accum_term. subset_of ( incompat_term) {
494
491
( None , 0 , DecisionLevel ( 1 ) )
495
492
} else {
496
- out
493
+ satisfier_pa. satisfier (
494
+ satisfier_package,
495
+ & accum_term. intersection ( & incompat_term. negate ( ) ) ,
496
+ )
497
497
} ,
498
498
) ;
499
499
@@ -516,14 +516,16 @@ impl<P: Package, VS: VersionSet, M: Eq + Clone + Debug + Display> PackageAssignm
516
516
package : & P ,
517
517
start_term : & Term < VS > ,
518
518
) -> ( Option < IncompId < P , VS , M > > , u32 , DecisionLevel ) {
519
- let empty = Term :: empty ( ) ;
520
519
// Indicate if we found a satisfier in the list of derivations, otherwise it will be the decision.
521
520
let idx = self
522
521
. dated_derivations
523
522
. as_slice ( )
524
523
. partition_point ( |dd| !dd. accumulated_intersection . is_disjoint ( start_term) ) ;
525
524
if let Some ( dd) = self . dated_derivations . get ( idx) {
526
- debug_assert_eq ! ( dd. accumulated_intersection. intersection( start_term) , empty) ;
525
+ debug_assert_eq ! (
526
+ dd. accumulated_intersection. intersection( start_term) ,
527
+ Term :: empty( )
528
+ ) ;
527
529
return ( Some ( dd. cause ) , dd. global_index , dd. decision_level ) ;
528
530
}
529
531
// If it wasn't found in the derivations,
0 commit comments