diff --git a/Cargo.lock b/Cargo.lock index aa662c1..b011afd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,9 +57,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.0.0-beta.16" +version = "3.0.0-beta.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6294c508c1413346857838356f53f45dbfd257ea31dca19470d9ce78750a7d37" +checksum = "dac76407e2be239b5e544c9d83bdac4a0d68ae188031ac0424aa3e4868a669be" dependencies = [ "actix-codec", "actix-rt", @@ -73,12 +73,11 @@ dependencies = [ "derive_more", "encoding_rs", "futures-core", - "futures-task", "h2", "http", "httparse", "httpdate", - "itoa 0.4.8", + "itoa 1.0.1", "language-tags", "local-channel", "log", @@ -127,9 +126,9 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.0.0-rc.1" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c9b22794b8af1c2e02434873ef858f2a7db40dbbf861ce77a04cd81ac6b767" +checksum = "29b7894a5b47aa84e15fbe8d89ee953568296a3739c5f6e6b5858802a561390c" dependencies = [ "actix-rt", "actix-service", @@ -156,9 +155,9 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.0.0-rc.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcebfd4a6255a2a75b7b87c1a3a723c57f08293ca9a7fade692e94515585f7a6" +checksum = "b5ef5760747cdfb108a1f35e6911a7a40939da893f95e035f9eee0c18b4b4025" dependencies = [ "actix-codec", "actix-rt", @@ -186,9 +185,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.0.0-beta.15" +version = "4.0.0-beta.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4609cf57246040316642d4dc4c03d7f3d4a083a892122829dbd9e6ec8db7cd67" +checksum = "dcc9a3e9642e035fe81cb9f7ef7eb98e7a049452d5d65637aebeab89c1849e4c" dependencies = [ "actix-codec", "actix-http", @@ -206,7 +205,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "itoa 0.4.8", + "itoa 1.0.1", "language-tags", "log", "mime", @@ -301,9 +300,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.51" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203" +checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3" [[package]] name = "arrayvec" @@ -387,9 +386,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "awc" -version = "3.0.0-beta.14" +version = "3.0.0-beta.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7f4bbe98c31efbf5182545d1b0a423df909ee27281c66f3c9aaeb58120cf8b" +checksum = "039b3a6bbb351f9708df0e5db1e96dd0fce84ef8e410a12a77b886f683589737" dependencies = [ "actix-codec", "actix-http", @@ -406,7 +405,7 @@ dependencies = [ "futures-util", "h2", "http", - "itoa 0.4.8", + "itoa 1.0.1", "log", "mime", "percent-encoding", @@ -500,15 +499,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.0" @@ -774,7 +764,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" dependencies = [ - "block-buffer 0.10.0", + "block-buffer", "crypto-common", "generic-array", ] @@ -1621,9 +1611,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", @@ -1635,12 +1625,6 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "opentelemetry" version = "0.16.0" @@ -1783,18 +1767,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +checksum = "1622113ce508488160cff04e6abc60960e676d330e1ca0f77c0b8df17c81438f" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +checksum = "b95af56fee93df76d721d356ac1ca41fccf168bc448eb14049234df764ba3e76" dependencies = [ "proc-macro2", "quote", @@ -1875,9 +1859,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.34" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid", ] @@ -1988,9 +1972,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.10" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" dependencies = [ "proc-macro2", ] @@ -2380,15 +2364,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.8" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ - "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest 0.10.1", ] [[package]] @@ -2549,9 +2531,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.82" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b" dependencies = [ "proc-macro2", "quote", @@ -2895,9 +2877,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.5.0-beta.6" +version = "0.5.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "940f76971e1a1ca2c64e8f915aec14acbc61a5b1c1c177dedf64eb8dd41b204d" +checksum = "2f00575e655451448b6ebde455528917498b3e04bdea7616784d807c49dc0491" dependencies = [ "actix-web", "pin-project", @@ -2919,9 +2901,9 @@ dependencies = [ [[package]] name = "tracing-awc" -version = "0.1.0-beta.15" +version = "0.1.0-beta.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd5fa893d29a9725a2ee8b35e2d0eeb02d64b11be3b6cc1bf7ed5e838ea80777" +checksum = "f76ec9366c7f4496348c6ff404db91552cfacd8c8a22c053f490d5882619a13f" dependencies = [ "actix-http", "actix-service", @@ -2987,9 +2969,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3" +checksum = "d5e6136799e1079699e0d9784c883e03af55cf6a1bee48fe1d79ca552c1bc36f" dependencies = [ "ansi_term", "lazy_static", @@ -3011,9 +2993,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "typenum" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "unicode-bidi" diff --git a/src/middleware/payload.rs b/src/middleware/payload.rs index 1f591bb..2a83d39 100644 --- a/src/middleware/payload.rs +++ b/src/middleware/payload.rs @@ -55,17 +55,19 @@ where fn call(&self, mut req: ServiceRequest) -> Self::Future { if self.0 && req.method() == Method::POST { let pl = req.take_payload(); - req.set_payload(Payload::Stream(Box::pin(once( - pl.try_fold(BytesMut::new(), |mut acc, bytes| async { - acc.extend(bytes); - Ok(acc) - }) - .map_ok(|bytes| { - let bytes = bytes.freeze(); - info!("{}", String::from_utf8_lossy(&bytes)); - bytes - }), - )))); + req.set_payload(Payload::Stream { + payload: Box::pin(once( + pl.try_fold(BytesMut::new(), |mut acc, bytes| async { + acc.extend(bytes); + Ok(acc) + }) + .map_ok(|bytes| { + let bytes = bytes.freeze(); + info!("{}", String::from_utf8_lossy(&bytes)); + bytes + }), + )), + }); let fut = self.1.call(req);