Skip to content

Commit bf4ca16

Browse files
committed
Make specializations tests actually test specialized methods
1 parent 949610d commit bf4ca16

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

tests/specializations.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ where
1515
}
1616
}
1717

18-
fn check_specialized<'a, V, IterItem, Iter, F>(iterator: &Iter, mapper: F)
19-
where
20-
V: Eq + Debug,
21-
Iter: Iterator<Item = IterItem> + Clone + 'a,
22-
F: Fn(Box<dyn Iterator<Item = IterItem> + 'a>) -> V,
23-
{
24-
assert_eq!(
25-
mapper(Box::new(Unspecialized(iterator.clone()))),
26-
mapper(Box::new(iterator.clone()))
27-
)
18+
macro_rules! check_specialized {
19+
($src:expr, |$it:pat| $closure:expr) => {
20+
let $it = $src.clone();
21+
let v1 = $closure;
22+
23+
let $it = Unspecialized($src.clone());
24+
let v2 = $closure;
25+
26+
assert_eq!(v1, v2);
27+
}
2828
}
2929

3030
fn test_specializations<IterItem, Iter>(
@@ -33,10 +33,10 @@ fn test_specializations<IterItem, Iter>(
3333
IterItem: Eq + Debug + Clone,
3434
Iter: Iterator<Item = IterItem> + Clone,
3535
{
36-
check_specialized(it, |i| i.count());
37-
check_specialized(it, |i| i.last());
38-
check_specialized(it, |i| i.collect::<Vec<_>>());
39-
check_specialized(it, |i| {
36+
check_specialized!(it, |i| i.count());
37+
check_specialized!(it, |i| i.last());
38+
check_specialized!(it, |i| i.collect::<Vec<_>>());
39+
check_specialized!(it, |i| {
4040
let mut parameters_from_fold = vec![];
4141
let fold_result = i.fold(vec![], |mut acc, v: IterItem| {
4242
parameters_from_fold.push((acc.clone(), v.clone()));
@@ -45,7 +45,7 @@ fn test_specializations<IterItem, Iter>(
4545
});
4646
(parameters_from_fold, fold_result)
4747
});
48-
check_specialized(it, |mut i| {
48+
check_specialized!(it, |mut i| {
4949
let mut parameters_from_all = vec![];
5050
let first = i.next();
5151
let all_result = i.all(|x| {
@@ -56,7 +56,7 @@ fn test_specializations<IterItem, Iter>(
5656
});
5757
let size = it.clone().count();
5858
for n in 0..size + 2 {
59-
check_specialized(it, |mut i| i.nth(n));
59+
check_specialized!(it, |mut i| i.nth(n));
6060
}
6161
// size_hint is a bit harder to check
6262
let mut it_sh = it.clone();

0 commit comments

Comments
 (0)