From 77c2f73790bd2ba00f0b7b43fda510f66bb66815 Mon Sep 17 00:00:00 2001 From: philipp Date: Sun, 16 Feb 2020 15:52:26 +0100 Subject: [PATCH] Use field init shorthand --- src/adaptors/mod.rs | 28 ++++++++++++++-------------- src/adaptors/multi_product.rs | 2 +- src/combinations.rs | 2 +- src/combinations_with_replacement.rs | 2 +- src/groupbylazy.rs | 6 +++--- src/intersperse.rs | 2 +- src/kmerge_impl.rs | 2 +- src/lazy_buffer.rs | 2 +- src/merge_join.rs | 2 +- src/pad_tail.rs | 4 ++-- src/peeking_take_while.rs | 4 ++-- src/process_results_impl.rs | 2 +- src/repeatn.rs | 4 ++-- src/sources.rs | 4 ++-- src/tee.rs | 2 +- src/tuple_impl.rs | 6 +++--- src/unique_impl.rs | 6 +++--- tests/quick.rs | 14 +++++++------- 18 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/adaptors/mod.rs b/src/adaptors/mod.rs index 3bc419945..82e2103cb 100644 --- a/src/adaptors/mod.rs +++ b/src/adaptors/mod.rs @@ -370,7 +370,7 @@ impl fmt::Debug for Batching where I: fmt::Debug { /// Create a new Batching iterator. pub fn batching(iter: I, f: F) -> Batching { - Batching { f: f, iter: iter } + Batching { f, iter } } impl Iterator for Batching @@ -534,7 +534,7 @@ pub fn merge_by_new(a: I, b: J, cmp: F) -> MergeBy(mut iter: I, f: F) -> Coalesce Coalesce { iter: CoalesceCore { last: iter.next(), - iter: iter, + iter, }, - f: f, + f, } } @@ -725,7 +725,7 @@ pub fn dedup_by(mut iter: I, dedup_pred: Pred) -> DedupBy DedupBy { iter: CoalesceCore { last: iter.next(), - iter: iter, + iter, }, dedup_pred, } @@ -801,7 +801,7 @@ impl<'a, I, F> fmt::Debug for TakeWhileRef<'a, I, F> pub fn take_while_ref(iter: &mut I, f: F) -> TakeWhileRef where I: Iterator + Clone { - TakeWhileRef { iter: iter, f: f } + TakeWhileRef { iter, f } } impl<'a, I, F> Iterator for TakeWhileRef<'a, I, F> @@ -843,7 +843,7 @@ pub struct WhileSome { /// Create a new `WhileSome`. pub fn while_some(iter: I) -> WhileSome { - WhileSome { iter: iter } + WhileSome { iter } } impl Iterator for WhileSome @@ -915,7 +915,7 @@ pub struct Tuple1Combination { impl From for Tuple1Combination { fn from(iter: I) -> Self { - Tuple1Combination { iter: iter } + Tuple1Combination { iter } } } @@ -1007,7 +1007,7 @@ pub struct MapInto { /// Create a new [`MapInto`](struct.MapInto.html) iterator. pub fn map_into(iter: I) -> MapInto { MapInto { - iter: iter, + iter, _res: PhantomData, } } @@ -1068,8 +1068,8 @@ pub fn map_results(iter: I, f: F) -> MapResults F: FnMut(T) -> U, { MapResults { - iter: iter, - f: f, + iter, + f, } } @@ -1119,8 +1119,8 @@ pub fn positions(iter: I, f: F) -> Positions F: FnMut(I::Item) -> bool, { Positions { - iter: iter, - f: f, + iter, + f, count: 0 } } @@ -1177,7 +1177,7 @@ where I: Iterator, F: FnMut(&mut I::Item), { - Update { iter: iter, f: f } + Update { iter, f } } impl Iterator for Update diff --git a/src/adaptors/multi_product.rs b/src/adaptors/multi_product.rs index a6796386e..a8a70f80b 100644 --- a/src/adaptors/multi_product.rs +++ b/src/adaptors/multi_product.rs @@ -65,7 +65,7 @@ impl MultiProduct let on_first_iter = match state { StartOfIter => { let on_first_iter = !last.in_progress(); - state = MidIter { on_first_iter: on_first_iter }; + state = MidIter { on_first_iter }; on_first_iter }, MidIter { on_first_iter } => on_first_iter diff --git a/src/combinations.rs b/src/combinations.rs index aa7c9e624..e8efb473f 100644 --- a/src/combinations.rs +++ b/src/combinations.rs @@ -40,7 +40,7 @@ pub fn combinations(iter: I, k: usize) -> Combinations Combinations { indices: (0..k).collect(), - pool: pool, + pool, first: true, } } diff --git a/src/combinations_with_replacement.rs b/src/combinations_with_replacement.rs index 85629614a..d51154521 100644 --- a/src/combinations_with_replacement.rs +++ b/src/combinations_with_replacement.rs @@ -51,7 +51,7 @@ where k, indices, max_index: 0, - pool: pool, + pool, first: true, } } diff --git a/src/groupbylazy.rs b/src/groupbylazy.rs index ff253e845..bf6e3c7a1 100644 --- a/src/groupbylazy.rs +++ b/src/groupbylazy.rs @@ -30,7 +30,7 @@ impl ChunkIndex { #[inline(always)] fn new(size: usize) -> Self { ChunkIndex { - size: size, + size, index: 0, key: 0, } @@ -380,7 +380,7 @@ impl<'a, K, I, F> Iterator for Groups<'a, K, I, F> let key = inner.group_key(index); (key, Group { parent: self.parent, - index: index, + index, first: Some(elt), }) }) @@ -528,7 +528,7 @@ impl<'a, I> Iterator for Chunks<'a, I> inner.step(index).map(|elt| { Chunk { parent: self.parent, - index: index, + index, first: Some(elt), } }) diff --git a/src/intersperse.rs b/src/intersperse.rs index f82544229..057929927 100644 --- a/src/intersperse.rs +++ b/src/intersperse.rs @@ -27,7 +27,7 @@ pub fn intersperse(iter: I, elt: I::Item) -> Intersperse let mut iter = iter.fuse(); Intersperse { peek: iter.next(), - iter: iter, + iter, element: elt, } } diff --git a/src/kmerge_impl.rs b/src/kmerge_impl.rs index 1281f2703..31e0894cb 100644 --- a/src/kmerge_impl.rs +++ b/src/kmerge_impl.rs @@ -177,7 +177,7 @@ pub fn kmerge_by(iterable: I, mut less_than: F) let mut heap: Vec<_> = Vec::with_capacity(lower); heap.extend(iter.filter_map(|it| HeadTail::new(it.into_iter()))); heapify(&mut heap, |a, b| less_than.kmerge_pred(&a.head, &b.head)); - KMergeBy { heap: heap, less_than: less_than } + KMergeBy { heap, less_than } } impl Clone for KMergeBy diff --git a/src/lazy_buffer.rs b/src/lazy_buffer.rs index ce5521d94..01123d473 100644 --- a/src/lazy_buffer.rs +++ b/src/lazy_buffer.rs @@ -13,7 +13,7 @@ where { pub fn new(it: I) -> LazyBuffer { LazyBuffer { - it: it, + it, done: false, buffer: Vec::new(), } diff --git a/src/merge_join.rs b/src/merge_join.rs index 46c5d0c84..6eb017ded 100644 --- a/src/merge_join.rs +++ b/src/merge_join.rs @@ -17,7 +17,7 @@ pub fn merge_join_by(left: I, right: J, cmp_fn: F) MergeJoinBy { left: put_back(left.into_iter().fuse()), right: put_back(right.into_iter().fuse()), - cmp_fn: cmp_fn + cmp_fn, } } diff --git a/src/pad_tail.rs b/src/pad_tail.rs index c9cfe6af3..4c5b202ef 100644 --- a/src/pad_tail.rs +++ b/src/pad_tail.rs @@ -23,9 +23,9 @@ pub fn pad_using(iter: I, min: usize, filler: F) -> PadUsing { PadUsing { iter: iter.fuse(), - min: min, + min, pos: 0, - filler: filler, + filler, } } diff --git a/src/peeking_take_while.rs b/src/peeking_take_while.rs index 0b2291dfd..bff040330 100644 --- a/src/peeking_take_while.rs +++ b/src/peeking_take_while.rs @@ -89,8 +89,8 @@ pub fn peeking_take_while(iter: &mut I, f: F) -> PeekingTakeWhile where I: Iterator, { PeekingTakeWhile { - iter: iter, - f: f, + iter, + f, } } diff --git a/src/process_results_impl.rs b/src/process_results_impl.rs index f78515d77..c819f5029 100644 --- a/src/process_results_impl.rs +++ b/src/process_results_impl.rs @@ -75,7 +75,7 @@ pub fn process_results(iterable: I, processor: F) -> Result let iter = iterable.into_iter(); let mut error = Ok(()); - let result = processor(ProcessResults { error: &mut error, iter: iter }); + let result = processor(ProcessResults { error: &mut error, iter }); error.map(|_| result) } diff --git a/src/repeatn.rs b/src/repeatn.rs index f0a7bb7d9..8bc485083 100644 --- a/src/repeatn.rs +++ b/src/repeatn.rs @@ -14,9 +14,9 @@ pub fn repeat_n(element: A, n: usize) -> RepeatN where A: Clone, { if n == 0 { - RepeatN { elt: None, n: n, } + RepeatN { elt: None, n, } } else { - RepeatN { elt: Some(element), n: n, } + RepeatN { elt: Some(element), n, } } } diff --git a/src/sources.rs b/src/sources.rs index c3f0110f2..17d9ff92c 100644 --- a/src/sources.rs +++ b/src/sources.rs @@ -102,7 +102,7 @@ pub fn unfold(initial_state: St, f: F) -> Unfold where F: FnMut(&mut St) -> Option { Unfold { - f: f, + f, state: initial_state, } } @@ -186,6 +186,6 @@ pub fn iterate(initial_value: St, f: F) -> Iterate { Iterate { state: initial_value, - f: f, + f, } } diff --git a/src/tee.rs b/src/tee.rs index 77d261759..aa4be41be 100644 --- a/src/tee.rs +++ b/src/tee.rs @@ -28,7 +28,7 @@ pub struct Tee pub fn new(iter: I) -> (Tee, Tee) where I: Iterator { - let buffer = TeeBuffer{backlog: VecDeque::new(), iter: iter, owner: false}; + let buffer = TeeBuffer{backlog: VecDeque::new(), iter, owner: false}; let t1 = Tee{rcbuffer: Rc::new(RefCell::new(buffer)), id: true}; let t2 = Tee{rcbuffer: t1.rcbuffer.clone(), id: false}; (t1, t2) diff --git a/src/tuple_impl.rs b/src/tuple_impl.rs index f724abc45..f205f01b3 100644 --- a/src/tuple_impl.rs +++ b/src/tuple_impl.rs @@ -32,7 +32,7 @@ impl TupleBuffer fn new(buf: T::Buffer) -> Self { TupleBuffer { cur: 0, - buf: buf, + buf, } } } @@ -158,8 +158,8 @@ pub fn tuple_windows(mut iter: I) -> TupleWindows } TupleWindows { - last: last, - iter: iter, + last, + iter, } } diff --git a/src/unique_impl.rs b/src/unique_impl.rs index d9e7fd3dc..cf8675c18 100644 --- a/src/unique_impl.rs +++ b/src/unique_impl.rs @@ -30,9 +30,9 @@ pub fn unique_by(iter: I, f: F) -> UniqueBy I: Iterator, { UniqueBy { - iter: iter, + iter, used: HashMap::new(), - f: f, + f, } } @@ -126,7 +126,7 @@ pub fn unique(iter: I) -> Unique { Unique { iter: UniqueBy { - iter: iter, + iter, used: HashMap::new(), f: (), } diff --git a/tests/quick.rs b/tests/quick.rs index b55960b44..c78c3dc59 100644 --- a/tests/quick.rs +++ b/tests/quick.rs @@ -124,7 +124,7 @@ impl Iter where HK: HintKind Iter { iterator: it, fuse_flag: 0, - hint_kind: hint_kind + hint_kind, } } } @@ -239,12 +239,12 @@ impl qc::Arbitrary for ShiftRange let hint_kind = qc::Arbitrary::arbitrary(g); ShiftRange { - range_start: range_start, - range_end: range_end, - start_step: start_step, - end_step: end_step, - iter_count: iter_count, - hint_kind: hint_kind + range_start, + range_end, + start_step, + end_step, + iter_count, + hint_kind, } } }