Skip to content

Commit

Permalink
Remove thiserror dep
Browse files Browse the repository at this point in the history
  • Loading branch information
yukibtc committed Jan 2, 2025
1 parent ac2e2d7 commit 0f5051e
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 11 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ base64 = "0.22"
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls-webpki-roots", "socks"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0"
url = { version = "2", features = ["serde"] }

[dev-dependencies]
Expand Down
46 changes: 37 additions & 9 deletions src/error.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,45 @@
// Copyright (c) 2022 Yuki Kishimoto
// Distributed under the MIT software license

use std::fmt;

use reqwest::header::InvalidHeaderValue;
use thiserror::Error;

#[derive(Debug, Error)]
#[derive(Debug)]
pub enum NtfyError {
#[error(transparent)]
ReqwestError(#[from] reqwest::Error),
#[error(transparent)]
Url(#[from] url::ParseError),
#[error(transparent)]
InvalidHeaderValue(#[from] InvalidHeaderValue),
#[error("Empty Response")]
ReqwestError(reqwest::Error),
Url(url::ParseError),
InvalidHeaderValue(InvalidHeaderValue),
EmptyResponse,
}

impl std::error::Error for NtfyError {}

impl fmt::Display for NtfyError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::ReqwestError(e) => write!(f, "{}", e),
Self::Url(e) => write!(f, "{}", e),
Self::InvalidHeaderValue(e) => write!(f, "{}", e),
Self::EmptyResponse => write!(f, "Empty Response"),
}
}
}

impl From<reqwest::Error> for NtfyError {
fn from(e: reqwest::Error) -> Self {
Self::ReqwestError(e)
}
}

impl From<url::ParseError> for NtfyError {
fn from(e: url::ParseError) -> Self {
Self::Url(e)
}
}

impl From<InvalidHeaderValue> for NtfyError {
fn from(e: InvalidHeaderValue) -> Self {
Self::InvalidHeaderValue(e)
}
}

0 comments on commit 0f5051e

Please sign in to comment.