diff --git a/sources/Cargo.lock b/sources/Cargo.lock index aff41b4405b..2db942b87a8 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -20,9 +20,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.0.0-beta.6" +version = "3.0.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d51c2ba06062e698a5d212d860e9fb2afc931c285ede687aaae896c8150347" +checksum = "3cd16d6b846983ffabfd081e1a67abd7698094fcbe7b3d9bcf1acbc6f546a516" dependencies = [ "actix-codec", "actix-rt", @@ -47,7 +47,6 @@ dependencies = [ "log", "mime", "once_cell", - "paste", "percent-encoding", "pin-project 1.0.7", "pin-project-lite", @@ -151,9 +150,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.0.0-beta.6" +version = "4.0.0-beta.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff12e933051557d700b0fcad20fe25b9ca38395cc87bbc5aeaddaef17b937a2f" +checksum = "c503f726f895e55dac39adeafd14b5ee00cc956796314e9227fc7ae2e176f443" dependencies = [ "actix-codec", "actix-http", @@ -166,6 +165,7 @@ dependencies = [ "actix-web-codegen", "ahash", "bytes", + "cfg-if 1.0.0", "derive_more", "either", "encoding_rs", @@ -176,6 +176,7 @@ dependencies = [ "log", "mime", "once_cell", + "paste", "pin-project 1.0.7", "regex", "serde", @@ -189,9 +190,9 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "0.5.0-beta.2" +version = "0.5.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f138ac357a674c3b480ddb7bbd894b13c1b6e8927d728bc9ea5e17eee2f8fc9" +checksum = "0d048c6986743105c1e8e9729fbc8d5d1667f2f62393a58be8d85a7d9a5a6c8d" dependencies = [ "proc-macro2", "quote", @@ -1595,9 +1596,9 @@ dependencies = [ [[package]] name = "language-tags" -version = "0.2.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" [[package]] name = "lazy_static" @@ -2390,9 +2391,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2296f2fac53979e8ccbc4a1136b25dcefd37be9ed7e4a1f6b05a6029c84ff124" +checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" dependencies = [ "base64", "bytes", @@ -3316,9 +3317,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.7.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb2ed024293bb19f7a5dc54fe83bf86532a44c12a2bb8ba40d64a4509395ca2" +checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985" dependencies = [ "autocfg", "bytes", @@ -3336,9 +3337,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37" +checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" dependencies = [ "proc-macro2", "quote", @@ -3358,9 +3359,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8864d706fdb3cc0843a49647ac892720dac98a6eeb818b77190592cf4994066" +checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" dependencies = [ "futures-core", "pin-project-lite", diff --git a/sources/api/apiserver/src/server/mod.rs b/sources/api/apiserver/src/server/mod.rs index 111902a1aeb..697554cb8e8 100644 --- 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>) -> &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 { + fn error_response(&self) -> HttpResponse { 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) } }