Remove some anyhow dependencies

This commit is contained in:
Lennart
2025-01-23 18:56:21 +01:00
parent e616ab0898
commit 1442d79a24
10 changed files with 10 additions and 20 deletions

View File

@@ -7,7 +7,6 @@ repository.workspace = true
publish = false
[dependencies]
anyhow = { workspace = true }
actix-web = { workspace = true }
async-trait = { workspace = true }
thiserror = { workspace = true }

View File

@@ -44,8 +44,7 @@ pub async fn route_post<C: CalendarStore, S: SubscriptionStore>(
let sub_id = uuid::Uuid::new_v4().to_string();
let expires = if let Some(expires) = request.expires {
chrono::DateTime::parse_from_rfc2822(&expires)
.map_err(|err| crate::Error::Other(err.into()))?
chrono::DateTime::parse_from_rfc2822(&expires).map_err(Error::from)?
} else {
chrono::Utc::now().fixed_offset() + chrono::Duration::weeks(1)
};

View File

@@ -15,14 +15,14 @@ pub enum Error {
#[error(transparent)]
StoreError(#[from] rustical_store::Error),
#[error(transparent)]
ChronoParseError(#[from] chrono::ParseError),
#[error(transparent)]
DavError(#[from] rustical_dav::Error),
#[error(transparent)]
XmlDecodeError(#[from] rustical_xml::XmlError),
#[error(transparent)]
Other(#[from] anyhow::Error),
}
impl actix_web::ResponseError for Error {
@@ -33,11 +33,11 @@ impl actix_web::ResponseError for Error {
rustical_store::Error::InvalidData(_) => StatusCode::BAD_REQUEST,
_ => StatusCode::INTERNAL_SERVER_ERROR,
},
Error::ChronoParseError(_) => StatusCode::INTERNAL_SERVER_ERROR,
Error::DavError(err) => err.status_code(),
Error::Unauthorized => StatusCode::UNAUTHORIZED,
Error::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
Error::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
Error::Other(_) => StatusCode::INTERNAL_SERVER_ERROR,
Error::NotFound => StatusCode::NOT_FOUND,
}
}

View File

@@ -7,7 +7,6 @@ repository.workspace = true
publish = false
[dependencies]
anyhow = { workspace = true }
actix-web = { workspace = true }
async-trait = { workspace = true }
thiserror = { workspace = true }

View File

@@ -29,8 +29,7 @@ pub async fn route_post<A: AddressbookStore, S: SubscriptionStore>(
let sub_id = uuid::Uuid::new_v4().to_string();
let expires = if let Some(expires) = request.expires {
chrono::DateTime::parse_from_rfc2822(&expires)
.map_err(|err| crate::Error::Other(err.into()))?
chrono::DateTime::parse_from_rfc2822(&expires).map_err(Error::from)?
} else {
chrono::Utc::now().fixed_offset() + chrono::Duration::weeks(1)
};

View File

@@ -15,14 +15,14 @@ pub enum Error {
#[error(transparent)]
StoreError(#[from] rustical_store::Error),
#[error(transparent)]
ChronoParseError(#[from] chrono::ParseError),
#[error(transparent)]
DavError(#[from] rustical_dav::Error),
#[error(transparent)]
XmlDecodeError(#[from] rustical_xml::XmlError),
#[error(transparent)]
Other(#[from] anyhow::Error),
}
impl actix_web::ResponseError for Error {
@@ -33,11 +33,11 @@ impl actix_web::ResponseError for Error {
rustical_store::Error::InvalidData(_) => StatusCode::BAD_REQUEST,
_ => StatusCode::INTERNAL_SERVER_ERROR,
},
Error::ChronoParseError(_) => StatusCode::INTERNAL_SERVER_ERROR,
Error::DavError(err) => err.status_code(),
Error::Unauthorized => StatusCode::UNAUTHORIZED,
Error::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
Error::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
Error::Other(_) => StatusCode::INTERNAL_SERVER_ERROR,
Error::NotFound => StatusCode::NOT_FOUND,
}
}

View File

@@ -11,7 +11,6 @@ askama.workspace = true
askama_actix = { workspace = true }
actix-session = { workspace = true }
serde = { workspace = true }
anyhow = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
actix-web = { workspace = true }

View File

@@ -1,6 +1,5 @@
use super::{CalDateTime, EventObject, JournalObject, TodoObject};
use crate::Error;
use anyhow::Result;
use ical::parser::{ical::component::IcalTimeZone, Component};
use serde::Serialize;
use sha2::{Digest, Sha256};