refactor: code quality improvements

Cargo.toml

@@ -23,7 +23,6 @@ shlex         = "1.3.0"
 simd-json     = "0.13.10"
 strsim        = "0.11.1"
 terminal_size = "0.3.0"
-thiserror     = "1.0.63"
 unicode-width = "0.1.13"
 
 [dev-dependencies]

src/cli/env_file.rs

@@ -1,24 +1,16 @@
 use dotenvy::Result;
 
 #[derive(Clone, Debug)]
-pub struct EnvFile {
-    inner: Vec<(String, String)>,
-}
-
-impl From<Vec<(String, String)>> for EnvFile {
-    fn from(inner: Vec<(String, String)>) -> Self {
-        Self { inner }
-    }
-}
+pub struct EnvFile(Vec<(String, String)>);
 
 impl EnvFile {
     pub fn from_path(path: &str) -> Result<Self> {
-        let file = dotenvy::from_filename_iter(path)?;
-        let env: Vec<(String, String)> = file.collect::<Result<_>>()?;
-        Ok(Self { inner: env })
+        dotenvy::from_filename_iter(path)
+            .and_then(|file| file.collect())
+            .map(Self)
     }
 
     pub fn iter(&self) -> impl Iterator<Item = (&String, &String)> {
-        self.inner.iter().map(|(a, b)| (a, b))
+        self.0.iter().map(|(a, b)| (a, b))
     }
 }

src/cli/list.rs

@@ -17,7 +17,7 @@ pub fn handle(package_paths: impl Iterator<Item = PathBuf>) -> Result<bool> {
             let mut lock = stdout().lock();
 
             if found_package {
-                lock.write_all("\n".as_bytes())?;
+                lock.write_all(b"\n")?;
             }
 
             lock.write_all(package.make_prefix(None, Stream::Stdout).as_bytes())?;
@@ -53,11 +53,11 @@ pub fn handle(package_paths: impl Iterator<Item = PathBuf>) -> Result<bool> {
                             lock.write_all(" ".repeat(longest_pad + 2).as_bytes())?;
                         }
                         lock.write_all(line.as_bytes())?;
-                        lock.write_all("\n".as_bytes())?;
+                        lock.write_all(b"\n")?;
                     }
                 } else {
                     lock.write_all(content.as_bytes())?;
-                    lock.write_all("\n".as_bytes())?;
+                    lock.write_all(b"\n")?;
                 }
             }
         }

src/cli/mod.rs

@@ -133,7 +133,7 @@ impl Cli {
                 } else {
                     let found_package = list::handle(package_paths)?;
                     if !found_package {
-                        Cli::command().print_help()?;
+                        Self::command().print_help()?;
                     }
                 }
             }

src/package_json.rs

@@ -2,7 +2,6 @@ use std::{fs, path::Path};
 
 use owo_colors::{OwoColorize as _, Stream};
 use serde::Deserialize;
-use thiserror::Error;
 
 use indexmap::IndexMap;
 
@@ -17,12 +16,10 @@ pub struct PackageJson {
     pub scripts: AIndexMap<String, String>,
 }
 
-#[derive(Error, Debug)]
+#[derive(Debug)]
 pub enum PackageJsonFromPathError {
-    #[error("error reading file")]
-    FileError(#[from] std::io::Error),
-    #[error("error parsing file")]
-    ParseError(#[from] simd_json::Error),
+    FileError(std::io::Error),
+    ParseError(simd_json::Error),
 }
 
 impl PackageJsonFromPathError {
@@ -55,8 +52,9 @@ impl PackageJsonFromPathError {
 
 impl PackageJson {
     pub fn from_path(path: &Path) -> Result<Self, PackageJsonFromPathError> {
-        let mut raw = fs::read(path)?;
-        Ok(simd_json::from_slice::<Self>(&mut raw)?)
+        use PackageJsonFromPathError::{FileError, ParseError};
+        let mut raw = fs::read(path).map_err(FileError)?;
+        simd_json::from_slice(&mut raw).map_err(ParseError)
     }
 
     pub fn from_path_safe(path: &Path) -> Option<Self> {

src/run/exec.rs

@@ -40,7 +40,7 @@ pub fn exec(package_path: &Path, package_data: &PackageJson, args: &ExecArgs) ->
 
     #[cfg(unix)]
     {
-        Err::<(), _>(subproc.exec())?;
+        Err(subproc.exec())?;
         Ok(())
     }
 

src/run/script.rs

@@ -11,7 +11,7 @@ use crate::{
 
 use super::util::{make_patched_path, make_shell_cmd};
 
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum ScriptType {
     Pre,
     Post,
@@ -22,9 +22,9 @@ impl ScriptType {
     #[must_use]
     pub fn prefix(self) -> String {
         match self {
-            ScriptType::Normal => String::new(),
-            ScriptType::Pre => "pre".into(),
-            ScriptType::Post => "post".into(),
+            Self::Normal => String::new(),
+            Self::Pre => "pre".into(),
+            Self::Post => "post".into(),
         }
     }
 }