Merge pull request #81 from delan/cleanup

Minor cleanups

Author: tao-guo

examples/dd_test.rs

@@ -15,10 +15,10 @@
 //! [INFO ] Total bandwidth: 1.11 GiB/s
 //! ```
 use byte_unit::Byte;
+use clap::Parser;
 use cmd_lib::*;
 use rayon::prelude::*;
 use std::time::Instant;
-use clap::Parser;
 
 const DATA_SIZE: u64 = 10 * 1024 * 1024 * 1024; // 10GB data
 

rustfmt.toml

@@ -354,14 +354,10 @@ impl StderrThread {
                         .lines()
                         .map_while(Result::ok)
                         .for_each(|line| {
-                            if !capture {
-                                info!("{line}");
-                            } else {
-                                if !output.is_empty() {
-                                    output.push('\n');
-                                }
-                                output.push_str(&line);
+                            if !output.is_empty() {
+                                output.push('\n');
                             }
+                            output.push_str(&line);
                         });
                     return output;
                 }

src/child.rs

@@ -11,6 +11,7 @@ use std::ffi::{OsStr, OsString};
 use std::fmt;
 use std::fs::{File, OpenOptions};
 use std::io::{Error, ErrorKind, Result};
+use std::mem::take;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::sync::Mutex;
@@ -160,7 +161,7 @@ impl GroupCmds {
 #[doc(hidden)]
 #[derive(Default)]
 pub struct Cmds {
-    cmds: Vec<Option<Cmd>>,
+    cmds: Vec<Cmd>,
     full_cmds: String,
     ignore_error: bool,
     file: String,
@@ -188,7 +189,7 @@ impl Cmds {
                 );
             }
         }
-        self.cmds.push(Some(cmd));
+        self.cmds.push(cmd);
         self
     }
 
@@ -204,8 +205,7 @@ impl Cmds {
         let mut children: Vec<CmdChild> = Vec::new();
         let len = self.cmds.len();
         let mut prev_pipe_in = None;
-        for (i, cmd_opt) in self.cmds.iter_mut().enumerate() {
-            let mut cmd = cmd_opt.take().unwrap();
+        for (i, mut cmd) in take(&mut self.cmds).into_iter().enumerate() {
             if i != len - 1 {
                 // not the last, update redirects
                 let (pipe_reader, pipe_writer) =