Merge branch 'master' into master

actix-web/CHANGES.md

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

actix-web/src/error/error.rs

@@ -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> {
     fn from(err: Error) -> Response<BoxBody> {
         err.error_response().into()