refactor: make on_collection take a reference

This way we avoid a clone
n0-computer · Feb 8, 2023 · 34aa8e1 · 34aa8e1
1 parent 1a127fa
commit 34aa8e1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/get.rs b/src/get.rs
@@ -125,7 +125,7 @@ pub async fn run<A, B, C, FutA, FutB, FutC>(
 where
     A: FnOnce() -> FutA,
     FutA: Future<Output = Result<()>>,
-    B: FnMut(Collection) -> FutB,
+    B: FnMut(&Collection) -> FutB,
     FutB: Future<Output = Result<()>>,
     C: FnMut(Hash, DataStream, String) -> FutC,
     FutC: Future<Output = Result<DataStream>>,
@@ -187,7 +187,7 @@ where
 
                         // decode the collection
                         let collection = Collection::from_bytes(&data)?;
-                        on_collection(collection.clone()).await?;
+                        on_collection(&collection).await?;
 
                         // expect to get blob data in the order they appear in the collection
                         let mut remaining_size = total_blobs_size;

diff --git a/src/lib.rs b/src/lib.rs
@@ -116,8 +116,8 @@ mod tests {
                 hash,
                 token,
                 opts,
-                || async move { Ok(()) },
-                |_collection| async move { Ok(()) },
+                || async { Ok(()) },
+                |_collection| async { Ok(()) },
                 |got_hash, mut reader, got_name| async move {
                     assert_eq!(file_hash, got_hash);
                     let mut got = Vec::new();
@@ -221,10 +221,10 @@ mod tests {
             collection_hash,
             provider.auth_token(),
             opts,
-            || async move { Ok(()) },
-            |collection| async move {
+            || async { Ok(()) },
+            |collection| {
                 assert_eq!(collection.blobs.len(), num_blobs);
-                Ok(())
+                async { Ok(()) }
             },
             |got_hash, mut reader, got_name| {
                 let i = &i;

diff --git a/src/main.rs b/src/main.rs
@@ -362,13 +362,13 @@ async fn get_interactive(
             Ok(())
         }
     };
-    let on_collection = |collection: sendme::blobs::Collection| {
+    let on_collection = |collection: &sendme::blobs::Collection| {
         let pb = &pb;
         let out_writer = &out_writer;
+        let name = collection.name().to_string();
+        let total_entries = collection.total_entries();
+        let size = collection.total_blobs_size();
         async move {
-            let name = collection.name();
-            let total_entries = collection.total_entries();
-            let size = collection.total_blobs_size();
             out_writer
                 .println(format!(
                     "{} Downloading {name}...",