@@ -29,15 +29,11 @@ where
29
29
30
30
fn test_specializations < IterItem , Iter > (
31
31
it : & Iter ,
32
- known_expected_size : Option < usize > ,
33
32
) where
34
33
IterItem : Eq + Debug + Clone ,
35
34
Iter : Iterator < Item = IterItem > + Clone ,
36
35
{
37
36
let size = it. clone ( ) . count ( ) ;
38
- if let Some ( expected_size) = known_expected_size {
39
- assert_eq ! ( size, expected_size) ;
40
- }
41
37
check_specialized ( it, |i| i. count ( ) ) ;
42
38
check_specialized ( it, |i| i. last ( ) ) ;
43
39
for n in 0 ..size + 2 {
@@ -65,49 +61,49 @@ fn test_specializations<IterItem, Iter>(
65
61
} ) ;
66
62
}
67
63
68
- fn put_back_test ( test_vec : Vec < i32 > , known_expected_size : Option < usize > ) {
64
+ fn put_back_test ( test_vec : Vec < i32 > ) {
69
65
{
70
66
// Lexical lifetimes support
71
67
let pb = itertools:: put_back ( test_vec. iter ( ) ) ;
72
- test_specializations ( & pb, known_expected_size ) ;
68
+ test_specializations ( & pb) ;
73
69
}
74
70
75
71
let mut pb = itertools:: put_back ( test_vec. into_iter ( ) ) ;
76
72
pb. put_back ( 1 ) ;
77
- test_specializations ( & pb, known_expected_size . map ( |x| x + 1 ) ) ;
73
+ test_specializations ( & pb) ;
78
74
}
79
75
80
76
#[ test]
81
77
fn put_back ( ) {
82
- put_back_test ( vec ! [ 7 , 4 , 1 ] , Some ( 3 ) ) ;
78
+ put_back_test ( vec ! [ 7 , 4 , 1 ] ) ;
83
79
}
84
80
85
81
quickcheck ! {
86
82
fn put_back_qc( test_vec: Vec <i32 >) -> ( ) {
87
- put_back_test( test_vec, None )
83
+ put_back_test( test_vec)
88
84
}
89
85
}
90
86
91
- fn merge_join_by_test ( i1 : Vec < usize > , i2 : Vec < usize > , known_expected_size : Option < usize > ) {
87
+ fn merge_join_by_test ( i1 : Vec < usize > , i2 : Vec < usize > ) {
92
88
let i1 = i1. into_iter ( ) ;
93
89
let i2 = i2. into_iter ( ) ;
94
90
let mjb = i1. clone ( ) . merge_join_by ( i2. clone ( ) , std:: cmp:: Ord :: cmp) ;
95
- test_specializations ( & mjb, known_expected_size ) ;
91
+ test_specializations ( & mjb) ;
96
92
97
93
// And the other way around
98
94
let mjb = i2. merge_join_by ( i1, std:: cmp:: Ord :: cmp) ;
99
- test_specializations ( & mjb, known_expected_size ) ;
95
+ test_specializations ( & mjb) ;
100
96
}
101
97
102
98
#[ test]
103
99
fn merge_join_by ( ) {
104
100
let i1 = vec ! [ 1 , 3 , 5 , 7 , 8 , 9 ] ;
105
101
let i2 = vec ! [ 0 , 3 , 4 , 5 ] ;
106
- merge_join_by_test ( i1, i2, Some ( 8 ) ) ;
102
+ merge_join_by_test ( i1, i2) ;
107
103
}
108
104
109
105
quickcheck ! {
110
106
fn merge_join_by_qc( i1: Vec <usize >, i2: Vec <usize >) -> ( ) {
111
- merge_join_by_test( i1, i2, None )
107
+ merge_join_by_test( i1, i2)
112
108
}
113
109
}
0 commit comments