Merge pull request #1655 from etungsten/tokio-actix

sources: update actix and tokio packages
bottlerocket-os · Jul 14, 2021 · e4e610e · e4e610e
2 parents d3f33a4 + fbb74ee
commit e4e610e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/api/apiserver/src/server/mod.rs b/sources/api/apiserver/src/server/mod.rs
@@ -443,7 +443,7 @@ fn transaction_name(query: &web::Query<HashMap<String, String>>) -> &str {
 // Can also override `render_response` if we want to change headers, content type, etc.
 impl ResponseError for error::Error {
     /// Maps our error types to the HTTP error code they should return.
-    fn error_response(&self) -> BaseHttpResponse<Body> {
+    fn error_response(&self) -> HttpResponse<Body> {
         use error::Error::*;
         let status_code = match self {
             // 400 Bad Request
@@ -498,7 +498,7 @@ impl ResponseError for error::Error {
             UpdateLockOpen { .. } => StatusCode::INTERNAL_SERVER_ERROR,
         };
 
-        BaseHttpResponse::new(status_code)
+        HttpResponse::new(status_code)
     }
 }