Skip to content

Commit 83a102b

Browse files
committed
Omit known_expected_size parameter
It should be enough to test against the unspecialized `count`, so we can simplify the argument list.
1 parent 3154cb7 commit 83a102b

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

tests/specializations.rs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,11 @@ where
2929

3030
fn test_specializations<IterItem, Iter>(
3131
it: &Iter,
32-
known_expected_size: Option<usize>,
3332
) where
3433
IterItem: Eq + Debug + Clone,
3534
Iter: Iterator<Item = IterItem> + Clone,
3635
{
3736
let size = it.clone().count();
38-
if let Some(expected_size) = known_expected_size {
39-
assert_eq!(size, expected_size);
40-
}
4137
check_specialized(it, |i| i.count());
4238
check_specialized(it, |i| i.last());
4339
for n in 0..size + 2 {
@@ -65,49 +61,49 @@ fn test_specializations<IterItem, Iter>(
6561
});
6662
}
6763

68-
fn put_back_test(test_vec: Vec<i32>, known_expected_size: Option<usize>) {
64+
fn put_back_test(test_vec: Vec<i32>) {
6965
{
7066
// Lexical lifetimes support
7167
let pb = itertools::put_back(test_vec.iter());
72-
test_specializations(&pb, known_expected_size);
68+
test_specializations(&pb);
7369
}
7470

7571
let mut pb = itertools::put_back(test_vec.into_iter());
7672
pb.put_back(1);
77-
test_specializations(&pb, known_expected_size.map(|x| x + 1));
73+
test_specializations(&pb);
7874
}
7975

8076
#[test]
8177
fn put_back() {
82-
put_back_test(vec![7, 4, 1], Some(3));
78+
put_back_test(vec![7, 4, 1]);
8379
}
8480

8581
quickcheck! {
8682
fn put_back_qc(test_vec: Vec<i32>) -> () {
87-
put_back_test(test_vec, None)
83+
put_back_test(test_vec)
8884
}
8985
}
9086

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>) {
9288
let i1 = i1.into_iter();
9389
let i2 = i2.into_iter();
9490
let mjb = i1.clone().merge_join_by(i2.clone(), std::cmp::Ord::cmp);
95-
test_specializations(&mjb, known_expected_size);
91+
test_specializations(&mjb);
9692

9793
// And the other way around
9894
let mjb = i2.merge_join_by(i1, std::cmp::Ord::cmp);
99-
test_specializations(&mjb, known_expected_size);
95+
test_specializations(&mjb);
10096
}
10197

10298
#[test]
10399
fn merge_join_by() {
104100
let i1 = vec![1, 3, 5, 7, 8, 9];
105101
let i2 = vec![0, 3, 4, 5];
106-
merge_join_by_test(i1, i2, Some(8));
102+
merge_join_by_test(i1, i2);
107103
}
108104

109105
quickcheck! {
110106
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)
112108
}
113109
}

0 commit comments

Comments
 (0)