refactor: apply clippy rules

Author: tao-guo

src/child.rs

@@ -3,7 +3,7 @@ use crate::{process, CmdResult, FunResult};
 use os_pipe::PipeReader;
 use std::any::Any;
 use std::fmt::Display;
-use std::io::{BufRead, BufReader, Error, ErrorKind, Read, Result};
+use std::io::{BufRead, BufReader, Error, Read, Result};
 use std::process::{Child, ExitStatus};
 use std::thread::JoinHandle;
 
@@ -37,9 +37,11 @@ impl CmdChildren {
         let last_child_res = last_child.wait(true);
         let other_children_res = Self::wait_children(&mut self.children);
 
-        self.ignore_error
-            .then_some(Ok(()))
-            .unwrap_or(last_child_res.and(other_children_res))
+        if self.ignore_error {
+            Ok(())
+        } else {
+            last_child_res.and(other_children_res)
+        }
     }
 
     fn wait_children(children: &mut Vec<CmdChild>) -> CmdResult {
@@ -166,9 +168,11 @@ impl FunChildren {
         let other_children_res = CmdChildren::wait_children(&mut self.children);
         let _ = stderr_thread.join();
 
-        self.ignore_error
-            .then_some(Ok(()))
-            .unwrap_or(last_child_res.and(other_children_res))
+        if self.ignore_error {
+            Ok(())
+        } else {
+            last_child_res.and(other_children_res)
+        }
     }
 
     /// Returns the OS-assigned process identifiers associated with these children processes.
@@ -183,10 +187,11 @@ impl FunChildren {
         let last_child = self.children.pop().unwrap();
         let last_child_res = last_child.wait_with_all(capture_stderr, &mut stdout, &mut stderr);
         let other_children_res = CmdChildren::wait_children(&mut self.children);
-        let cmd_result = self
-            .ignore_error
-            .then_some(Ok(()))
-            .unwrap_or(last_child_res.and(other_children_res));
+        let cmd_result = if self.ignore_error {
+            Ok(())
+        } else {
+            last_child_res.and(other_children_res)
+        };
 
         let mut stdout: String = String::from_utf8_lossy(&stdout).into();
         if stdout.ends_with('\n') {
@@ -345,10 +350,9 @@ trait ChildOutcome: Display {
         if self.success() {
             Ok(())
         } else {
-            Err(Error::new(
-                ErrorKind::Other,
-                format!("Running [{cmd}] exited with error; {self} at {file}:{line}"),
-            ))
+            Err(Error::other(format!(
+                "Running [{cmd}] exited with error; {self} at {file}:{line}"
+            )))
         }
     }
 }
@@ -392,10 +396,9 @@ impl CmdChildHandle {
                     format!("Killing process [{cmd}] failed with error: {e} at {file}:{line}"),
                 )
             }),
-            CmdChildHandle::Thread(_thread) => Err(Error::new(
-                ErrorKind::Other,
-                format!("Killing thread [{cmd}] failed: not supported at {file}:{line}"),
-            )),
+            CmdChildHandle::Thread(_thread) => Err(Error::other(format!(
+                "Killing thread [{cmd}] failed: not supported at {file}:{line}"
+            ))),
             CmdChildHandle::SyncFn => Ok(()),
         }
     }

src/process.rs

@@ -10,7 +10,7 @@ use std::collections::HashMap;
 use std::ffi::{OsStr, OsString};
 use std::fmt;
 use std::fs::{File, OpenOptions};
-use std::io::{Error, ErrorKind, Result};
+use std::io::{Error, Result};
 use std::marker::PhantomData;
 use std::mem::take;
 use std::path::{Path, PathBuf};
@@ -150,11 +150,11 @@ pub(crate) fn pipefail_enabled() -> bool {
 thread_local! {
     /// Whether debug mode is enabled in the current thread.
     /// None means to use the global setting in [`DEBUG_ENABLED`].
-    static DEBUG_OVERRIDE: Cell<Option<bool>> = Cell::new(None);
+    static DEBUG_OVERRIDE: Cell<Option<bool>> = const { Cell::new(None) };
 
     /// Whether pipefail mode is enabled in the current thread.
     /// None means to use the global setting in [`PIPEFAIL_ENABLED`].
-    static PIPEFAIL_OVERRIDE: Cell<Option<bool>> = Cell::new(None);
+    static PIPEFAIL_OVERRIDE: Cell<Option<bool>> = const { Cell::new(None) };
 }
 
 /// Overrides the debug mode in the current thread, while the value is in scope.
@@ -622,19 +622,16 @@ impl Cmd {
 
     fn run_cd_cmd(&self, current_dir: &mut PathBuf, file: &str, line: u32) -> CmdResult {
         if self.args.len() == 1 {
-            return Err(Error::new(
-                ErrorKind::Other,
-                "{CD_CMD}: missing directory at {file}:{line}",
-            ));
+            return Err(Error::other("{CD_CMD}: missing directory at {file}:{line}"));
         } else if self.args.len() > 2 {
             let err_msg = format!("{CD_CMD}: too many arguments at {file}:{line}");
-            return Err(Error::new(ErrorKind::Other, err_msg));
+            return Err(Error::other(err_msg));
         }
 
         let dir = current_dir.join(&self.args[1]);
         if !dir.is_dir() {
             let err_msg = format!("{CD_CMD}: No such file or directory at {file}:{line}");
-            return Err(Error::new(ErrorKind::Other, err_msg));
+            return Err(Error::other(err_msg));
         }
 
         dir.access(AccessMode::EXECUTE)?;