@@ -1032,10 +1032,7 @@ impl Property for ExtData {
1032
1032
// costy satisfactions are satisfied, the most costy dissatisfactions are dissatisfied).
1033
1033
//
1034
1034
// 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 {
1039
1036
a. 0 . map ( |x| x as isize - a. 1 as isize )
1040
1037
. cmp ( & b. 0 . map ( |x| x as isize - b. 1 as isize ) )
1041
1038
}
@@ -1046,9 +1043,9 @@ fn sat_minus_dissat<'r, 's>(
1046
1043
// costy satisfactions are satisfied, the most costy dissatisfactions are dissatisfied).
1047
1044
//
1048
1045
// 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 > ) ,
1052
1049
) -> cmp:: Ordering {
1053
1050
a. 0 . map ( |x| a. 1 . map ( |y| x as isize - y as isize ) )
1054
1051
. 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>(
1058
1055
//
1059
1056
// Args are of form: (<max_sat_size>, <count_dissat_size>)
1060
1057
// 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 ) > ) ,
1064
1061
) -> cmp:: Ordering {
1065
1062
a. 0 . map ( |x| a. 1 . map ( |y| x. 0 as isize - y. 0 as isize ) )
1066
1063
. cmp ( & b. 0 . map ( |x| b. 1 . map ( |y| x. 0 as isize - y. 0 as isize ) ) )
0 commit comments