refactor: Replace thiserror with derive_more

Author: KSXGitHub

Cargo.lock

@@ -51,7 +51,6 @@ cli-completions = ["cli"]
 pipe-trait = "^0.4.0"
 smart-default = "^0.6.0"
 derive_more = "^0.99.17"
-thiserror = "^1.0.38"
 rayon = "^1.6.1"
 text-block-macros = "^0.1.1"
 rounded-div = "^0.1.2"

Cargo.toml

@@ -1,23 +1,22 @@
-use derive_more::{AsRef, Deref, Display, Into};
+use derive_more::{AsRef, Deref, Display, Error, Into};
 use std::{
     convert::{TryFrom, TryInto},
     num::ParseFloatError,
     str::FromStr,
 };
-use thiserror::Error;
 
 /// Floating-point value that is greater than or equal to 0 and less than 1.
 #[derive(Debug, Default, Clone, Copy, PartialEq, PartialOrd, AsRef, Deref, Display, Into)]
 pub struct Fraction(f32);
 
 /// Error that occurs when calling [`Fraction::new`].
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Error)]
+#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, Error)]
 pub enum ConversionError {
     /// Provided value is greater than or equal to 1.
-    #[error("greater than or equal to 1")]
+    #[display(fmt = "greater than or equal to 1")]
     UpperBound,
     /// Provided value is less than 0.
-    #[error("less than 0")]
+    #[display(fmt = "less than 0")]
     LowerBound,
 }
 
@@ -42,8 +41,7 @@ impl TryFrom<f32> for Fraction {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Error)]
-#[error("{_0}")]
+#[derive(Debug, Display, Clone, PartialEq, Eq, Error)]
 pub enum FromStrError {
     ParseFloatError(ParseFloatError),
     Conversion(ConversionError),

src/args/fraction.rs

@@ -1,16 +1,16 @@
-use thiserror::Error;
+use derive_more::{Display, Error};
 
 /// Return value of [`Formatter::parse_value`](super::Formatter::parse_value).
-#[derive(Debug, Clone, Copy, Error)]
+#[derive(Debug, Display, Clone, Copy, Error)]
 pub enum ParsedValue {
     /// When input value is less than `scale_base`.
-    #[error("{value}   ")]
+    #[display(fmt = "{value}   ")]
     Small {
         /// Input value that is less than `scale_base`.
         value: u16,
     },
     /// When input value is greater than `scale_base`.
-    #[error("{coefficient:.1}{unit}")]
+    #[display(fmt = "{coefficient:.1}{unit}")]
     Big {
         /// The visible part of the number.
         coefficient: f32,

src/bytes_format/parsed_value.rs

@@ -1,9 +1,9 @@
 #[cfg(feature = "json")]
+use derive_more::{Display, Error};
+#[cfg(feature = "json")]
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "json")]
 use std::convert::TryFrom;
-#[cfg(feature = "json")]
-use thiserror::Error;
 
 /// Content of [`SchemaVersion`].
 pub const SCHEMA_VERSION: &str = "2021-06-05";
@@ -16,8 +16,8 @@ pub struct SchemaVersion;
 
 /// Error when trying to parse [`SchemaVersion`].
 #[cfg(feature = "json")]
-#[derive(Debug, Error)]
-#[error("InvalidSchema: {:?}: input schema is not {:?}", input, SCHEMA_VERSION)]
+#[derive(Debug, Display, Error)]
+#[display(fmt = "InvalidSchema: {input:?}: input schema is not {SCHEMA_VERSION:?}")]
 pub struct InvalidSchema {
     /// The input string.
     pub input: String,

src/json_data/schema_version.rs

@@ -1,21 +1,21 @@
-use thiserror::Error;
+use derive_more::{Display, Error};
 
 /// Error caused by the CLI program.
-#[derive(Debug, Error)]
+#[derive(Debug, Display, Error)]
 #[non_exhaustive]
 pub enum RuntimeError {
     /// When it fails to write JSON representation of
     /// [DataTreeReflection](crate::data_tree::Reflection) to stdout.
-    #[error("SerializationFailure: {_0}")]
+    #[display(fmt = "SerializationFailure: {_0}")]
     SerializationFailure(serde_json::Error),
     /// When it fails to read JSON representation of
     /// [DataTreeReflection](crate::data_tree::Reflection) from stdin.
-    #[error("DeserializationFailure: {_0}")]
+    #[display(fmt = "DeserializationFailure: {_0}")]
     DeserializationFailure(serde_json::Error),
     /// When both `--json-input` and file names are both specified.
-    #[error("JsonInputArgConflict: Arguments exist alongside --json-input")]
+    #[display(fmt = "JsonInputArgConflict: Arguments exist alongside --json-input")]
     JsonInputArgConflict,
     /// When input JSON data is not a valid tree.
-    #[error("InvalidInputReflection: {_0}")]
-    InvalidInputReflection(String),
+    #[display(fmt = "InvalidInputReflection: {_0}")]
+    InvalidInputReflection(#[error(not(source))] String),
 }