refactor: adopt thiserror

Cargo.toml

@@ -22,6 +22,7 @@ serde      = { version = "1.0.203", features = ["derive"] }
 shlex      = "1.3.0"
 simd-json  = "0.13.10"
 strsim     = "0.11.1"
+thiserror = "1.0.61"
 
 [dev-dependencies]
 trycmd = "0.15.4"

nix/package.nix

@@ -18,6 +18,7 @@ rustPlatform.buildRustPackage rec {
     root = ../.;
     fileset = lib.fileset.unions [
       ../src
+      ../tests
       ../Cargo.lock
       ../Cargo.toml
     ];
@@ -27,12 +28,12 @@ rustPlatform.buildRustPackage rec {
     lockFile = ../Cargo.lock;
   };
 
-  buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-    CoreFoundation
-    Security
-    IOKit
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.CoreFoundation
+    darwin.apple_sdk.frameworks.Security
+    darwin.apple_sdk.frameworks.IOKit
     darwin.libiconv
-  ]);
+  ];
 
   nativeBuildInputs = lib.optionals stdenv.isDarwin [
     pkg-config

src/package_json.rs

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