diff --git a/Cargo.lock b/Cargo.lock index 0dc4bd9..ff45ffd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1952,7 +1952,6 @@ version = "0.1.0" dependencies = [ "actix-web", "actix-web-httpauth", - "derive_more 1.0.0", "futures-util", "password-auth", "serde", @@ -2010,7 +2009,6 @@ dependencies = [ "actix-web", "anyhow", "async-trait", - "derive_more 1.0.0", "futures-util", "itertools", "log", diff --git a/crates/auth/Cargo.toml b/crates/auth/Cargo.toml index 4714b5e..a4d4a19 100644 --- a/crates/auth/Cargo.toml +++ b/crates/auth/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" [dependencies] actix-web = "4.9" actix-web-httpauth = "0.8" -derive_more = "1.0" futures-util = "0.3" password-auth = "1.0" serde = { version = "1.0", features = ["derive"] } diff --git a/crates/auth/src/error.rs b/crates/auth/src/error.rs index 7c98e1d..352f9c4 100644 --- a/crates/auth/src/error.rs +++ b/crates/auth/src/error.rs @@ -1,15 +1,15 @@ use actix_web::{http::StatusCode, HttpResponse}; -use derive_more::Display; use thiserror::Error; -#[derive(Debug, Display, Error, Clone)] +#[derive(Debug, Error, Clone)] pub enum Error { - #[display("Internal server error")] + #[error("Internal server error")] InternalError, - #[display("Not found")] + #[error("Not found")] NotFound, - #[display("Bad request")] + #[error("Bad request")] BadRequest, + #[error("Unauthorized")] Unauthorized, } diff --git a/crates/dav/Cargo.toml b/crates/dav/Cargo.toml index 22973b0..ca87654 100644 --- a/crates/dav/Cargo.toml +++ b/crates/dav/Cargo.toml @@ -7,7 +7,6 @@ edition = "2021" actix-web = "4.9" anyhow = "1.0" async-trait = "0.1" -derive_more = "1.0" futures-util = "0.3" quick-xml = { version = "0.36", features = [ "serde", diff --git a/crates/dav/src/depth_extractor.rs b/crates/dav/src/depth_extractor.rs index c5d4c43..0e4973f 100644 --- a/crates/dav/src/depth_extractor.rs +++ b/crates/dav/src/depth_extractor.rs @@ -1,8 +1,9 @@ use actix_web::{http::StatusCode, FromRequest, HttpRequest, ResponseError}; -use derive_more::Display; use futures_util::future::{err, ok, Ready}; +use thiserror::Error; -#[derive(Debug, Display)] +#[derive(Error, Debug)] +#[error("Invalid Depth header")] pub struct InvalidDepthHeader {} impl ResponseError for InvalidDepthHeader {