actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-30 18:34:36 +01:00
Code Issues Releases Wiki Activity

Use Display formatting for InternalError Display implementation #188

Browse Source
This commit is contained in:
Nikolay Kim 2018-04-19 07:55:09 -07:00
parent 813d1d6e66
commit 2c8d987241
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -1,11 +1,13 @@
# Changes # Changes
## 0.5.4 (2018-04-xx) ## 0.5.4 (2018-04-19)
* Add identity service middleware * Add identity service middleware
* Middleware response() is not invoked if there was an error in async handler #187 * Middleware response() is not invoked if there was an error in async handler #187
* Use Display formatting for InternalError Display implementation #188
## 0.5.3 (2018-04-18) ## 0.5.3 (2018-04-18)

32
src/error.rs
View File

@ -580,7 +580,7 @@ impl<T> InternalError<T> {
impl<T> Fail for InternalError<T> impl<T> Fail for InternalError<T>
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
fn backtrace(&self) -> Option<&Backtrace> { fn backtrace(&self) -> Option<&Backtrace> {
Some(&self.backtrace) Some(&self.backtrace)
@ -598,16 +598,16 @@ where
impl<T> fmt::Display for InternalError<T> impl<T> fmt::Display for InternalError<T>
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Display + 'static,
{ {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::Debug::fmt(&self.cause, f) fmt::Display::fmt(&self.cause, f)
} }
} }
impl<T> ResponseError for InternalError<T> impl<T> ResponseError for InternalError<T>
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
fn error_response(&self) -> HttpResponse { fn error_response(&self) -> HttpResponse {
match self.status { match self.status {
@ -625,7 +625,7 @@ where
impl<T> Responder for InternalError<T> impl<T> Responder for InternalError<T>
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
type Item = HttpResponse; type Item = HttpResponse;
type Error = Error; type Error = Error;
@ -640,7 +640,7 @@ where
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorBadRequest<T>(err: T) -> Error pub fn ErrorBadRequest<T>(err: T) -> Error
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
InternalError::new(err, StatusCode::BAD_REQUEST).into() InternalError::new(err, StatusCode::BAD_REQUEST).into()
} }
@ -650,7 +650,7 @@ where
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorUnauthorized<T>(err: T) -> Error pub fn ErrorUnauthorized<T>(err: T) -> Error
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
InternalError::new(err, StatusCode::UNAUTHORIZED).into() InternalError::new(err, StatusCode::UNAUTHORIZED).into()
} }
@ -660,7 +660,7 @@ where
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorForbidden<T>(err: T) -> Error pub fn ErrorForbidden<T>(err: T) -> Error
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
InternalError::new(err, StatusCode::FORBIDDEN).into() InternalError::new(err, StatusCode::FORBIDDEN).into()
} }
@ -670,7 +670,7 @@ where
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorNotFound<T>(err: T) -> Error pub fn ErrorNotFound<T>(err: T) -> Error
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
InternalError::new(err, StatusCode::NOT_FOUND).into() InternalError::new(err, StatusCode::NOT_FOUND).into()
} }
@ -680,7 +680,7 @@ where
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorMethodNotAllowed<T>(err: T) -> Error pub fn ErrorMethodNotAllowed<T>(err: T) -> Error
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
InternalError::new(err, StatusCode::METHOD_NOT_ALLOWED).into() InternalError::new(err, StatusCode::METHOD_NOT_ALLOWED).into()
} }
@ -690,7 +690,7 @@ where
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorRequestTimeout<T>(err: T) -> Error pub fn ErrorRequestTimeout<T>(err: T) -> Error
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
InternalError::new(err, StatusCode::REQUEST_TIMEOUT).into() InternalError::new(err, StatusCode::REQUEST_TIMEOUT).into()
} }
@ -700,7 +700,7 @@ where
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorConflict<T>(err: T) -> Error pub fn ErrorConflict<T>(err: T) -> Error
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
InternalError::new(err, StatusCode::CONFLICT).into() InternalError::new(err, StatusCode::CONFLICT).into()
} }
@ -710,7 +710,7 @@ where
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorGone<T>(err: T) -> Error pub fn ErrorGone<T>(err: T) -> Error
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
InternalError::new(err, StatusCode::GONE).into() InternalError::new(err, StatusCode::GONE).into()
} }
@ -720,7 +720,7 @@ where
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorPreconditionFailed<T>(err: T) -> Error pub fn ErrorPreconditionFailed<T>(err: T) -> Error
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
InternalError::new(err, StatusCode::PRECONDITION_FAILED).into() InternalError::new(err, StatusCode::PRECONDITION_FAILED).into()
} }
@ -730,7 +730,7 @@ where
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorExpectationFailed<T>(err: T) -> Error pub fn ErrorExpectationFailed<T>(err: T) -> Error
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
InternalError::new(err, StatusCode::EXPECTATION_FAILED).into() InternalError::new(err, StatusCode::EXPECTATION_FAILED).into()
} }
@ -740,7 +740,7 @@ where
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn ErrorInternalServerError<T>(err: T) -> Error pub fn ErrorInternalServerError<T>(err: T) -> Error
where where
T: Send + Sync + fmt::Debug + 'static, T: Send + Sync + fmt::Debug + fmt::Display + 'static,
{ {
InternalError::new(err, StatusCode::INTERNAL_SERVER_ERROR).into() InternalError::new(err, StatusCode::INTERNAL_SERVER_ERROR).into()
} }