From 724932a498c878a91bd16c36ddbead895e5a8ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Mon, 1 Nov 2021 22:17:31 +0100
Subject: [PATCH] aquatic_ws: pending scrape responses: avoid cloning stats

---
 aquatic_ws/src/lib/network.rs | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/aquatic_ws/src/lib/network.rs b/aquatic_ws/src/lib/network.rs
index e777e0c..1840459 100644
--- a/aquatic_ws/src/lib/network.rs
+++ b/aquatic_ws/src/lib/network.rs
@@ -394,32 +394,33 @@ impl ConnectionWriter {
                         .pending_scrape_id
                         .expect("meta.pending_scrape_id not set");
 
-                    let opt_message = if let Some(pending) = Slab::get_mut(
+                    let finished = if let Some(pending) = Slab::get_mut(
                         &mut RefCell::borrow_mut(&self.pending_scrape_slab),
                         pending_scrape_id.0,
                     ) {
                         pending.stats.extend(out_message.files);
                         pending.pending_worker_out_messages -= 1;
 
-                        if pending.pending_worker_out_messages == 0 {
-                            Some(OutMessage::ScrapeResponse(ScrapeResponse {
-                                action: ScrapeAction,
-                                files: pending.stats.clone(), // FIXME: clone
-                            }))
-                        } else {
-                            None
-                        }
+                        pending.pending_worker_out_messages == 0
                     } else {
                         return Err(anyhow::anyhow!("pending scrape not found in slab"));
                     };
 
-                    if let Some(out_message) = opt_message {
-                        self.send_out_message(&out_message).await?;
+                    if finished {
+                        let out_message = {
+                            let mut slab = RefCell::borrow_mut(&self.pending_scrape_slab);
 
-                        let mut slab = RefCell::borrow_mut(&self.pending_scrape_slab);
-                        
-                        slab.remove(pending_scrape_id.0);
-                        slab.shrink_to_fit();
+                            let pending = slab.remove(pending_scrape_id.0);
+
+                            slab.shrink_to_fit();
+
+                            OutMessage::ScrapeResponse(ScrapeResponse {
+                                action: ScrapeAction,
+                                files: pending.stats,
+                            })
+                        };
+
+                        self.send_out_message(&out_message).await?;
                     }
                 }
                 out_message => {