@@ -1032,10 +1032,7 @@ impl Property for ExtData {
10321032// costy satisfactions are satisfied, the most costy dissatisfactions are dissatisfied).
10331033//
10341034// Args are of form: (<count_sat>, <count_dissat>)
1035- fn sat_minus_dissat < ' r , ' s > (
1036- a : & ' r ( Option < usize > , usize ) ,
1037- b : & ' s ( Option < usize > , usize ) ,
1038- ) -> cmp:: Ordering {
1035+ fn sat_minus_dissat ( a : & ( Option < usize > , usize ) , b : & ( Option < usize > , usize ) ) -> cmp:: Ordering {
10391036 a. 0 . map ( |x| x as isize - a. 1 as isize )
10401037 . cmp ( & b. 0 . map ( |x| x as isize - b. 1 as isize ) )
10411038}
@@ -1046,9 +1043,9 @@ fn sat_minus_dissat<'r, 's>(
10461043// costy satisfactions are satisfied, the most costy dissatisfactions are dissatisfied).
10471044//
10481045// Args are of form: (<count_sat>, <count_dissat>)
1049- fn sat_minus_option_dissat < ' r , ' s > (
1050- a : & ' r ( Option < usize > , Option < usize > ) ,
1051- b : & ' s ( Option < usize > , Option < usize > ) ,
1046+ fn sat_minus_option_dissat (
1047+ a : & ( Option < usize > , Option < usize > ) ,
1048+ b : & ( Option < usize > , Option < usize > ) ,
10521049) -> cmp:: Ordering {
10531050 a. 0 . map ( |x| a. 1 . map ( |y| x as isize - y as isize ) )
10541051 . cmp ( & b. 0 . map ( |x| b. 1 . map ( |y| x as isize - y as isize ) ) )
@@ -1058,9 +1055,9 @@ fn sat_minus_option_dissat<'r, 's>(
10581055//
10591056// Args are of form: (<max_sat_size>, <count_dissat_size>)
10601057// max_[dis]sat_size of form: (<cost_of_witness>, <cost_of_sciptsig>)
1061- fn sat_minus_dissat_witness < ' r , ' s > (
1062- a : & ' r ( Option < ( usize , usize ) > , Option < ( usize , usize ) > ) ,
1063- b : & ' s ( Option < ( usize , usize ) > , Option < ( usize , usize ) > ) ,
1058+ fn sat_minus_dissat_witness (
1059+ a : & ( Option < ( usize , usize ) > , Option < ( usize , usize ) > ) ,
1060+ b : & ( Option < ( usize , usize ) > , Option < ( usize , usize ) > ) ,
10641061) -> cmp:: Ordering {
10651062 a. 0 . map ( |x| a. 1 . map ( |y| x. 0 as isize - y. 0 as isize ) )
10661063 . cmp ( & b. 0 . map ( |x| b. 1 . map ( |y| x. 0 as isize - y. 0 as isize ) ) )
0 commit comments