Convert from error-chain to thiserror

tblah · Apr 24, 2020 · ba48f09 · ba48f09
1 parent aaccec9
commit ba48f09
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "effective-limits"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Robert Collins <robertc@robertcollins.net>"]
 edition = "2018"
 description = "Estimate effective resource limits for a process e.g. how much RAM is available for use."
@@ -15,7 +15,7 @@ license = "Apache-2.0"
 
 [dependencies]
 sys-info = "=0.5.8"
-error-chain = "0.12.2"
+thiserror = "1.0.15"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.66"

diff --git a/src/lib.rs b/src/lib.rs
@@ -2,22 +2,23 @@
 // for error_chain!
 #![recursion_limit = "1024"]
 
-#[macro_use]
-extern crate error_chain;
-
 use std::cmp::min;
 
-mod errors {
-    // Create the Error, ErrorKind, ResultExt, and Result types
-    error_chain! {
-        foreign_links {
-            IoError(std::io::Error);
-            SysInfo(::sys_info::Error);
-        }
-    }
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("sysinfo failure")]
+    SysInfo(#[from] ::sys_info::Error),
+    #[error("io error")]
+    IoError(#[from] std::io::Error),
+    #[error("io error {1}")]
+    IoExplainedError(#[source] std::io::Error, String),
+    #[error("utf8 error")]
+    Utf8Error(#[from] std::str::Utf8Error),
+    #[error("u64 parse error on '{1}'")]
+    U64Error(#[source] std::num::ParseIntError, String),
 }
 
-pub use errors::*;
+pub type Result<R> = std::result::Result<R, Error>;
 
 fn min_opt(left: u64, right: Option<u64>) -> u64 {
     match right {
@@ -71,10 +72,10 @@ fn ulimited_memory() -> Result<Option<u64>> {
 
 #[cfg(not(unix))]
 fn win_err<T>(fn_name: &str) -> Result<T> {
-    Err(format!("{} Error {}", fn_name, unsafe {
-        winapi::um::errhandlingapi::GetLastError()
-    })
-    .into())
+    Err(Error::IoExplainedError(
+        std::io::Error::last_os_error(),
+        fn_name.into(),
+    ))
 }
 
 #[cfg(not(unix))]
@@ -176,7 +177,6 @@ mod tests {
             Some(ulimit) => {
                 #[cfg(windows)]
                 {
-                    use std::default::Default;
                     use std::mem::size_of;
                     use std::process::Stdio;
 
@@ -218,7 +218,9 @@ mod tests {
                         .stdout(Stdio::piped())
                         .stderr(Stdio::piped())
                         .spawn()
-                        .chain_err(|| "error spawning helper")?;
+                        .map_err(|e| {
+                            crate::Error::IoExplainedError(e, "error spawning helper".into())
+                        })?;
                     let childhandle = match unsafe {
                         winapi::um::processthreadsapi::OpenProcess(
                             winapi::um::winnt::JOB_OBJECT_ASSIGN_PROCESS
@@ -273,7 +275,7 @@ mod tests {
                                 let err = unsafe { winapi::um::errhandlingapi::GetLastError() };
                                 match err {
                                     winapi::shared::winerror::ERROR_NO_MORE_FILES => Ok(false),
-                                    _ => Err(format!("Thread32Next Error {}", err)),
+                                    _ => win_err("Thread32Next"),
                                 }
                             }
                             _ => Ok(true),
@@ -298,9 +300,9 @@ mod tests {
                         std::u32::MAX => win_err("ResumeThread"),
                         _ => Ok(()),
                     }?;
-                    child
-                        .wait_with_output()
-                        .chain_err(|| "error waiting for child")?
+                    child.wait_with_output().map_err(|e| {
+                        crate::Error::IoExplainedError(e, "error waiting for child".into())
+                    })?
                 }
                 #[cfg(unix)]
                 {
@@ -317,24 +319,22 @@ mod tests {
                             }
                         });
                     }
-                    cmd.output().chain_err(|| "error running helper")?
+                    cmd.output().map_err(|e| {
+                        crate::Error::IoExplainedError(e, "error running helper".into())
+                    })?
                 }
             }
-            None => cmd.output().chain_err(|| "error running helper")?,
+            None => cmd
+                .output()
+                .map_err(|e| crate::Error::IoExplainedError(e, "error running helper".into()))?,
         };
         assert_eq!(true, output.status.success());
         eprintln!("stderr {}", str::from_utf8(&output.stderr).unwrap());
         let limit_bytes = output.stdout;
-        let limit: u64 = str::from_utf8(&limit_bytes)
-            .chain_err(|| "bad utf8")?
+        let limit: u64 = str::from_utf8(&limit_bytes)?
             .trim()
             .parse()
-            .chain_err(|| {
-                format!(
-                    "bad int parse on '{}'",
-                    str::from_utf8(&limit_bytes).unwrap()
-                )
-            })?;
+            .map_err(|e| Error::U64Error(e, str::from_utf8(&limit_bytes).unwrap().into()))?;
 
         Ok(limit)
     }
@@ -344,15 +344,15 @@ mod tests {
         // This test depends on the dev environment being run uncontained.
         let info = sys_info::mem_info()?;
         let total_ram = info.total * 1024;
-        let limit = read_test_process(None).chain_err(|| "Failed to read limit")?;
+        let limit = read_test_process(None)?;
         assert_eq!(total_ram, limit);
         Ok(())
     }
 
     #[test]
     fn test_ulimit() -> Result<()> {
         // Page size rounding
-        let limit = read_test_process(Some(99_999_744)).chain_err(|| "Failed to read limit")?;
+        let limit = read_test_process(Some(99_999_744))?;
         assert_eq!(99_999_744, limit);
         Ok(())
     }