Merge pull request #58 from xrelkd/chore/nix

chore(nix): update `flake.lock`

caracal-daemon/src/cli/mod.rs

@@ -115,9 +115,12 @@ mod tests {
 
     #[test]
     fn test_command_simple() {
-        match Cli::parse_from(["program_name", "version"]).commands {
-            Some(Commands::Version { .. }) => (),
-            _ => panic!(),
+        if let Some(Commands::Version { .. }) =
+            Cli::parse_from(["program_name", "version"]).commands
+        {
+            // everything is good.
+        } else {
+            panic!();
         }
     }
 }

caracal/src/cli/mod.rs

@@ -368,9 +368,12 @@ mod tests {
 
     #[test]
     fn test_command_simple() {
-        match Cli::parse_from(["program_name", "version"]).commands {
-            Some(Commands::Version { .. }) => (),
-            _ => panic!(),
+        if let Some(Commands::Version { .. }) =
+            Cli::parse_from(["program_name", "version"]).commands
+        {
+            // everything is good.
+        } else {
+            panic!();
         }
     }
 }

crates/engine/src/downloader/mod.rs

@@ -251,7 +251,7 @@ impl Downloader {
                 file_path: file_path.clone(),
                 chunk_receiver: chunk_receiver.clone(),
                 progress_updater: ProgressUpdater::from(event_sender.clone()),
-                worker_event_receiver,
+                event_receiver: worker_event_receiver,
             };
             let _handle = join_set.spawn(worker.serve());
         }
@@ -311,7 +311,7 @@ impl Downloader {
                             sink: sink.clone(),
                             source: source.clone(),
                             file_path: file_path.clone(),
-                            worker_event_receiver,
+                            event_receiver: worker_event_receiver,
                         };
 
                         join_set.spawn(worker.serve())

crates/engine/src/downloader/worker.rs

@@ -21,8 +21,8 @@ pub struct Worker {
     pub source: Fetcher,
     pub file_path: PathBuf,
     pub chunk_receiver: async_channel::Receiver<Chunk>,
+    pub event_receiver: mpsc::UnboundedReceiver<WorkerEvent>,
     pub progress_updater: ProgressUpdater,
-    pub worker_event_receiver: mpsc::UnboundedReceiver<WorkerEvent>,
 }
 
 impl Worker {
@@ -33,8 +33,8 @@ impl Worker {
             sink,
             file_path,
             chunk_receiver,
+            mut event_receiver,
             progress_updater,
-            mut worker_event_receiver,
         } = self;
 
         while let Ok(chunk) = chunk_receiver.recv().await {
@@ -55,7 +55,7 @@ impl Worker {
 
             loop {
                 let new_bytes = stream.bytes();
-                let new_event = worker_event_receiver.recv();
+                let new_event = event_receiver.recv();
                 futures::pin_mut!(new_bytes);
                 futures::pin_mut!(new_event);