From d1948b5a00f4fde40f19bb4e6b37398189be3d60 Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <garious@gmail.com>
Date: Tue, 10 Apr 2018 21:12:59 -0600
Subject: [PATCH] Zip earlier

And remove redundant into_iter() calls.
---
 src/accountant_skel.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/accountant_skel.rs b/src/accountant_skel.rs
index df2c19f02..95e6b3717 100644
--- a/src/accountant_skel.rs
+++ b/src/accountant_skel.rs
@@ -114,7 +114,7 @@ impl<W: Write + Send + 'static> AccountantSkel<W> {
 
     fn verifier(
         recvr: &streamer::PacketReceiver,
-        sendr: &Sender<(Vec<SharedPackets>, Vec<Vec<u8>>)>,
+        sendr: &Sender<Vec<(SharedPackets, Vec<u8>)>>,
     ) -> Result<()> {
         let timer = Duration::new(1, 0);
         let msgs = recvr.recv_timeout(timer)?;
@@ -133,7 +133,8 @@ impl<W: Write + Send + 'static> AccountantSkel<W> {
             .map(|x| ecdsa::ed25519_verify(&x.to_vec()))
             .collect();
         for (v, r) in v.chunks(chunk).zip(rvs) {
-            sendr.send((v.to_vec(), r))?;
+            let xs = v.to_vec().into_iter().zip(r).collect();
+            sendr.send(xs)?;
         }
         Ok(())
     }
@@ -155,7 +156,7 @@ impl<W: Write + Send + 'static> AccountantSkel<W> {
         vers: Vec<u8>,
     ) -> Vec<(Response, SocketAddr)> {
         let mut rsps = Vec::new();
-        for (data, v) in reqs.into_iter().zip(vers.into_iter()) {
+        for (data, v) in reqs.into_iter().zip(vers) {
             if let Some((req, rsp_addr)) = data {
                 if !req.verify() {
                     continue;
@@ -198,14 +199,14 @@ impl<W: Write + Send + 'static> AccountantSkel<W> {
 
     fn process(
         obj: &Arc<Mutex<AccountantSkel<W>>>,
-        verified_receiver: &Receiver<(Vec<SharedPackets>, Vec<Vec<u8>>)>,
+        verified_receiver: &Receiver<Vec<(SharedPackets, Vec<u8>)>>,
         blob_sender: &streamer::BlobSender,
         packet_recycler: &packet::PacketRecycler,
         blob_recycler: &packet::BlobRecycler,
     ) -> Result<()> {
         let timer = Duration::new(1, 0);
-        let (mms, vvs) = verified_receiver.recv_timeout(timer)?;
-        for (msgs, vers) in mms.into_iter().zip(vvs.into_iter()) {
+        let mms = verified_receiver.recv_timeout(timer)?;
+        for (msgs, vers) in mms {
             let reqs = Self::deserialize_packets(&msgs.read().unwrap());
             let rsps = Self::process_packets(obj, reqs, vers);
             let blobs = Self::serialize_responses(rsps, blob_recycler)?;