From 926b3c0fadcd10b4ef75c7d8995170ac3d16ca89 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 18 May 2022 00:27:57 +0200 Subject: [PATCH] Rename error varian for Clippy --- src/api/admin/error.rs | 16 ++++++++-------- src/api/k2v/error.rs | 20 ++++++++++---------- src/api/s3/error.rs | 18 +++++++++--------- src/api/signature/error.rs | 4 ++-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/api/admin/error.rs b/src/api/admin/error.rs index b4475268..cc51807f 100644 --- a/src/api/admin/error.rs +++ b/src/api/admin/error.rs @@ -14,7 +14,7 @@ use crate::helpers::CustomApiErrorBody; pub enum Error { #[error(display = "{}", _0)] /// Error from common error - CommonError(CommonError), + Common(CommonError), // Category: cannot process /// The API access key does not exist @@ -34,7 +34,7 @@ where CommonError: From, { fn from(err: T) -> Self { - Error::CommonError(CommonError::from(err)) + Error::Common(CommonError::from(err)) } } @@ -43,12 +43,12 @@ impl CommonErrorDerivative for Error {} impl From for Error { fn from(err: HelperError) -> Self { match err { - HelperError::Internal(i) => Self::CommonError(CommonError::InternalError(i)), - HelperError::BadRequest(b) => Self::CommonError(CommonError::BadRequest(b)), + HelperError::Internal(i) => Self::Common(CommonError::InternalError(i)), + HelperError::BadRequest(b) => Self::Common(CommonError::BadRequest(b)), HelperError::InvalidBucketName(n) => { - Self::CommonError(CommonError::InvalidBucketName(n)) + Self::Common(CommonError::InvalidBucketName(n)) } - HelperError::NoSuchBucket(n) => Self::CommonError(CommonError::NoSuchBucket(n)), + HelperError::NoSuchBucket(n) => Self::Common(CommonError::NoSuchBucket(n)), HelperError::NoSuchAccessKey(n) => Self::NoSuchAccessKey(n), } } @@ -57,7 +57,7 @@ impl From for Error { impl Error { fn code(&self) -> &'static str { match self { - Error::CommonError(c) => c.aws_code(), + Error::Common(c) => c.aws_code(), Error::NoSuchAccessKey(_) => "NoSuchAccessKey", Error::KeyAlreadyExists(_) => "KeyAlreadyExists", } @@ -68,7 +68,7 @@ impl ApiError for Error { /// Get the HTTP status code that best represents the meaning of the error for the client fn http_status_code(&self) -> StatusCode { match self { - Error::CommonError(c) => c.http_status_code(), + Error::Common(c) => c.http_status_code(), Error::NoSuchAccessKey(_) => StatusCode::NOT_FOUND, Error::KeyAlreadyExists(_) => StatusCode::CONFLICT, } diff --git a/src/api/k2v/error.rs b/src/api/k2v/error.rs index dbd9a5f5..9263d9be 100644 --- a/src/api/k2v/error.rs +++ b/src/api/k2v/error.rs @@ -15,7 +15,7 @@ use crate::signature::error::Error as SignatureError; pub enum Error { #[error(display = "{}", _0)] /// Error from common error - CommonError(CommonError), + Common(CommonError), // Category: cannot process /// Authorization Header Malformed @@ -48,7 +48,7 @@ where CommonError: From, { fn from(err: T) -> Self { - Error::CommonError(CommonError::from(err)) + Error::Common(CommonError::from(err)) } } @@ -57,13 +57,13 @@ impl CommonErrorDerivative for Error {} impl From for Error { fn from(err: HelperError) -> Self { match err { - HelperError::Internal(i) => Self::CommonError(CommonError::InternalError(i)), - HelperError::BadRequest(b) => Self::CommonError(CommonError::BadRequest(b)), + HelperError::Internal(i) => Self::Common(CommonError::InternalError(i)), + HelperError::BadRequest(b) => Self::Common(CommonError::BadRequest(b)), HelperError::InvalidBucketName(n) => { - Self::CommonError(CommonError::InvalidBucketName(n)) + Self::Common(CommonError::InvalidBucketName(n)) } - HelperError::NoSuchBucket(n) => Self::CommonError(CommonError::NoSuchBucket(n)), - e => Self::CommonError(CommonError::BadRequest(format!("{}", e))), + HelperError::NoSuchBucket(n) => Self::Common(CommonError::NoSuchBucket(n)), + e => Self::Common(CommonError::BadRequest(format!("{}", e))), } } } @@ -71,7 +71,7 @@ impl From for Error { impl From for Error { fn from(err: SignatureError) -> Self { match err { - SignatureError::CommonError(c) => Self::CommonError(c), + SignatureError::Common(c) => Self::Common(c), SignatureError::AuthorizationHeaderMalformed(c) => { Self::AuthorizationHeaderMalformed(c) } @@ -87,7 +87,7 @@ impl Error { /// as we are building a custom API fn code(&self) -> &'static str { match self { - Error::CommonError(c) => c.aws_code(), + Error::Common(c) => c.aws_code(), Error::NoSuchKey => "NoSuchKey", Error::NotAcceptable(_) => "NotAcceptable", Error::AuthorizationHeaderMalformed(_) => "AuthorizationHeaderMalformed", @@ -102,7 +102,7 @@ impl ApiError for Error { /// Get the HTTP status code that best represents the meaning of the error for the client fn http_status_code(&self) -> StatusCode { match self { - Error::CommonError(c) => c.http_status_code(), + Error::Common(c) => c.http_status_code(), Error::NoSuchKey => StatusCode::NOT_FOUND, Error::NotAcceptable(_) => StatusCode::NOT_ACCEPTABLE, Error::AuthorizationHeaderMalformed(_) diff --git a/src/api/s3/error.rs b/src/api/s3/error.rs index f2096bea..60e2915c 100644 --- a/src/api/s3/error.rs +++ b/src/api/s3/error.rs @@ -17,7 +17,7 @@ use crate::signature::error::Error as SignatureError; pub enum Error { #[error(display = "{}", _0)] /// Error from common error - CommonError(CommonError), + Common(CommonError), // Category: cannot process /// Authorization Header Malformed @@ -80,7 +80,7 @@ where CommonError: From, { fn from(err: T) -> Self { - Error::CommonError(CommonError::from(err)) + Error::Common(CommonError::from(err)) } } @@ -89,12 +89,12 @@ impl CommonErrorDerivative for Error {} impl From for Error { fn from(err: HelperError) -> Self { match err { - HelperError::Internal(i) => Self::CommonError(CommonError::InternalError(i)), - HelperError::BadRequest(b) => Self::CommonError(CommonError::BadRequest(b)), + HelperError::Internal(i) => Self::Common(CommonError::InternalError(i)), + HelperError::BadRequest(b) => Self::Common(CommonError::BadRequest(b)), HelperError::InvalidBucketName(n) => { - Self::CommonError(CommonError::InvalidBucketName(n)) + Self::Common(CommonError::InvalidBucketName(n)) } - HelperError::NoSuchBucket(n) => Self::CommonError(CommonError::NoSuchBucket(n)), + HelperError::NoSuchBucket(n) => Self::Common(CommonError::NoSuchBucket(n)), e => Self::bad_request(format!("{}", e)), } } @@ -115,7 +115,7 @@ impl From for Error { impl From for Error { fn from(err: SignatureError) -> Self { match err { - SignatureError::CommonError(c) => Self::CommonError(c), + SignatureError::Common(c) => Self::Common(c), SignatureError::AuthorizationHeaderMalformed(c) => { Self::AuthorizationHeaderMalformed(c) } @@ -134,7 +134,7 @@ impl From for Error { impl Error { pub fn aws_code(&self) -> &'static str { match self { - Error::CommonError(c) => c.aws_code(), + Error::Common(c) => c.aws_code(), Error::NoSuchKey => "NoSuchKey", Error::NoSuchUpload => "NoSuchUpload", Error::PreconditionFailed => "PreconditionFailed", @@ -156,7 +156,7 @@ impl ApiError for Error { /// Get the HTTP status code that best represents the meaning of the error for the client fn http_status_code(&self) -> StatusCode { match self { - Error::CommonError(c) => c.http_status_code(), + Error::Common(c) => c.http_status_code(), Error::NoSuchKey | Error::NoSuchUpload => StatusCode::NOT_FOUND, Error::PreconditionFailed => StatusCode::PRECONDITION_FAILED, Error::InvalidRange(_) => StatusCode::RANGE_NOT_SATISFIABLE, diff --git a/src/api/signature/error.rs b/src/api/signature/error.rs index 3ef5cdcd..f5a067bd 100644 --- a/src/api/signature/error.rs +++ b/src/api/signature/error.rs @@ -8,7 +8,7 @@ pub use crate::common_error::{CommonErrorDerivative, OkOrBadRequest, OkOrInterna pub enum Error { #[error(display = "{}", _0)] /// Error from common error - CommonError(CommonError), + Common(CommonError), /// Authorization Header Malformed #[error(display = "Authorization header malformed, expected scope: {}", _0)] @@ -29,7 +29,7 @@ where CommonError: From, { fn from(err: T) -> Self { - Error::CommonError(CommonError::from(err)) + Error::Common(CommonError::from(err)) } }