berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into master

This commit is contained in:
Rob Ede 2024-06-07 15:12:51 +01:00 committed by GitHub
parent 9875c03c39 85655f731d
commit a585ecfe7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actix-web/CHANGES.md
View File

@ -2,9 +2,10 @@
## Unreleased ## Unreleased
# Added ### Added
- Add `guard::GuardContext::app_data()` method. - Add `guard::GuardContext::app_data()` method.
- Implement `From<Box<dyn ResponseError>>` for `Error`.
## 4.6.0 ## 4.6.0

6
actix-web/src/error/error.rs
View File

@ -60,6 +60,12 @@ impl<T: ResponseError + 'static> From<T> for Error {
} }
} }
impl From<Box<dyn ResponseError>> for Error {
fn from(value: Box<dyn ResponseError>) -> Self {
Error { cause: value }
}
}
impl From<Error> for Response<BoxBody> { impl From<Error> for Response<BoxBody> {
fn from(err: Error) -> Response<BoxBody> { fn from(err: Error) -> Response<BoxBody> {
err.error_response().into() err.error_response().into()