Merge #411

411: Use field init shorthand r=jswrenn a=phimuemue

I suggest that we use field init shorthand ([available since Rust 1.17](https://doc.rust-lang.org/nightly/edition-guide/rust-2018/data-types/field-init-shorthand.html)) whenever possible, as it seems easier and canonical to me.

Co-authored-by: philipp <[email protected]>

Author: bors[bot]

src/adaptors/mod.rs

@@ -370,7 +370,7 @@ impl<I, F> fmt::Debug for Batching<I, F> where I: fmt::Debug {
 
 /// Create a new Batching iterator.
 pub fn batching<I, F>(iter: I, f: F) -> Batching<I, F> {
-    Batching { f: f, iter: iter }
+    Batching { f, iter }
 }
 
 impl<B, F, I> Iterator for Batching<I, F>
@@ -534,7 +534,7 @@ pub fn merge_by_new<I, J, F>(a: I, b: J, cmp: F) -> MergeBy<I::IntoIter, J::Into
         a: a.into_iter().peekable(),
         b: b.into_iter().peekable(),
         fused: None,
-        cmp: cmp,
+        cmp,
     }
 }
 
@@ -655,9 +655,9 @@ pub fn coalesce<I, F>(mut iter: I, f: F) -> Coalesce<I, F>
     Coalesce {
         iter: CoalesceCore {
             last: iter.next(),
-            iter: iter,
+            iter,
         },
-        f: f,
+        f,
     }
 }
 
@@ -725,7 +725,7 @@ pub fn dedup_by<I, Pred>(mut iter: I, dedup_pred: Pred) -> DedupBy<I, Pred>
     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<I, F>(iter: &mut I, f: F) -> TakeWhileRef<I, F>
     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<I> {
 
 /// Create a new `WhileSome<I>`.
 pub fn while_some<I>(iter: I) -> WhileSome<I> {
-    WhileSome { iter: iter }
+    WhileSome { iter }
 }
 
 impl<I, A> Iterator for WhileSome<I>
@@ -915,7 +915,7 @@ pub struct Tuple1Combination<I> {
 
 impl<I> From<I> for Tuple1Combination<I> {
     fn from(iter: I) -> Self {
-        Tuple1Combination { iter: iter }
+        Tuple1Combination { iter }
     }
 }
 
@@ -1007,7 +1007,7 @@ pub struct MapInto<I, R> {
 /// Create a new [`MapInto`](struct.MapInto.html) iterator.
 pub fn map_into<I, R>(iter: I) -> MapInto<I, R> {
     MapInto {
-        iter: iter,
+        iter,
         _res: PhantomData,
     }
 }
@@ -1068,8 +1068,8 @@ pub fn map_results<I, F, T, U, E>(iter: I, f: F) -> MapResults<I, F>
           F: FnMut(T) -> U,
 {
     MapResults {
-        iter: iter,
-        f: f,
+        iter,
+        f,
     }
 }
 
@@ -1119,8 +1119,8 @@ pub fn positions<I, F>(iter: I, f: F) -> Positions<I, F>
           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<I, F> Iterator for Update<I, F>

src/adaptors/multi_product.rs

@@ -65,7 +65,7 @@ impl<I> MultiProduct<I>
             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

src/combinations.rs

@@ -40,7 +40,7 @@ pub fn combinations<I>(iter: I, k: usize) -> Combinations<I>
 
     Combinations {
         indices: (0..k).collect(),
-        pool: pool,
+        pool,
         first: true,
     }
 }

src/combinations_with_replacement.rs

@@ -51,7 +51,7 @@ where
         k,
         indices,
         max_index: 0,
-        pool: pool,
+        pool,
         first: true,
     }
 }

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),
             }
         })

src/intersperse.rs

@@ -27,7 +27,7 @@ pub fn intersperse<I>(iter: I, elt: I::Item) -> Intersperse<I>
     let mut iter = iter.fuse();
     Intersperse {
         peek: iter.next(),
-        iter: iter,
+        iter,
         element: elt,
     }
 }

src/kmerge_impl.rs

@@ -177,7 +177,7 @@ pub fn kmerge_by<I, F>(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<I, F> Clone for KMergeBy<I, F>

src/lazy_buffer.rs

@@ -13,7 +13,7 @@ where
 {
     pub fn new(it: I) -> LazyBuffer<I> {
         LazyBuffer {
-            it: it,
+            it,
             done: false,
             buffer: Vec::new(),
         }

src/merge_join.rs

@@ -17,7 +17,7 @@ pub fn merge_join_by<I, J, F>(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,
     }
 }
 

src/pad_tail.rs

@@ -23,9 +23,9 @@ pub fn pad_using<I, F>(iter: I, min: usize, filler: F) -> PadUsing<I, F>
 {
     PadUsing {
         iter: iter.fuse(),
-        min: min,
+        min,
         pos: 0,
-        filler: filler,
+        filler,
     }
 }