From a3acfb89690d467e06e1ad3cc28f347fadf0c5f9 Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Thu, 23 Jan 2025 18:17:55 +0100 Subject: [PATCH] rename dav::XmlError --- crates/dav/src/error.rs | 4 ++-- crates/dav/src/resource/methods/propfind.rs | 2 +- crates/dav/src/resource/methods/proppatch.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/dav/src/error.rs b/crates/dav/src/error.rs index 8863129..ec0fa1d 100644 --- a/crates/dav/src/error.rs +++ b/crates/dav/src/error.rs @@ -20,7 +20,7 @@ pub enum Error { PropReadOnly, #[error(transparent)] - XmlDeserializationError(#[from] rustical_xml::XmlError), + XmlError(#[from] rustical_xml::XmlError), #[error(transparent)] IOError(#[from] std::io::Error), @@ -33,7 +33,7 @@ impl actix_web::error::ResponseError for Error { Self::NotFound => StatusCode::NOT_FOUND, Self::BadRequest(_) => StatusCode::BAD_REQUEST, Self::Unauthorized => StatusCode::UNAUTHORIZED, - Self::XmlDeserializationError(_) => StatusCode::BAD_REQUEST, + Self::XmlError(_) => StatusCode::BAD_REQUEST, Error::PropReadOnly => StatusCode::CONFLICT, Self::IOError(_) => StatusCode::INTERNAL_SERVER_ERROR, } diff --git a/crates/dav/src/resource/methods/propfind.rs b/crates/dav/src/resource/methods/propfind.rs index 1a54ae2..07d1a6c 100644 --- a/crates/dav/src/resource/methods/propfind.rs +++ b/crates/dav/src/resource/methods/propfind.rs @@ -37,7 +37,7 @@ pub(crate) async fn route_propfind( // A request body is optional. If empty we MUST return all props let propfind: PropfindElement = if !body.is_empty() { - PropfindElement::parse_str(&body).map_err(Error::XmlDeserializationError)? + PropfindElement::parse_str(&body).map_err(Error::XmlError)? } else { PropfindElement { prop: PropfindType::Allprop, diff --git a/crates/dav/src/resource/methods/proppatch.rs b/crates/dav/src/resource/methods/proppatch.rs index 24959f2..6b544a5 100644 --- a/crates/dav/src/resource/methods/proppatch.rs +++ b/crates/dav/src/resource/methods/proppatch.rs @@ -78,7 +78,7 @@ pub(crate) async fn route_proppatch( // Extract operations let PropertyupdateElement::::Prop>>( operations, - ) = XmlDocument::parse_str(&body).map_err(Error::XmlDeserializationError)?; + ) = XmlDocument::parse_str(&body).map_err(Error::XmlError)?; let mut resource = resource_service.get_resource(&path).await?; let privileges = resource.get_user_privileges(&user)?;