diff --git a/Cargo.lock b/Cargo.lock index be37790..30e27bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "actix" version = "0.7.9" @@ -8,7 +10,7 @@ checksum = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666" dependencies = [ "actix_derive 0.3.2", "bitflags", - "bytes", + "bytes 0.4.12", "crossbeam-channel", "failure", "fnv", @@ -17,7 +19,7 @@ dependencies = [ "log", "parking_lot 0.7.1", "smallvec 0.6.14", - "tokio", + "tokio 0.1.22", "tokio-codec", "tokio-executor", "tokio-io", @@ -40,7 +42,7 @@ dependencies = [ "actix-rt", "actix_derive 0.4.0", "bitflags", - "bytes", + "bytes 0.4.12", "crossbeam-channel", "derive_more 0.14.1", "futures", @@ -63,20 +65,36 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f2c11af4b06dc935d8e1b1491dad56bfb32febc49096a91e773f8535c176453" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "log", "tokio-codec", "tokio-io", ] +[[package]] +name = "actix-codec" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570" +dependencies = [ + "bitflags", + "bytes 0.5.6", + "futures-core", + "futures-sink", + "log", + "pin-project", + "tokio 0.2.25", + "tokio-util", +] + [[package]] name = "actix-connect" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fade9bd4bb46bacde89f1e726c7a3dd230536092712f5d94d77ca57c087fca0" dependencies = [ - "actix-codec", + "actix-codec 0.1.2", "actix-rt", "actix-service", "actix-utils", @@ -100,7 +118,7 @@ dependencies = [ "actix-service", "actix-web", "bitflags", - "bytes", + "bytes 0.4.12", "derive_more 0.15.0", "futures", "log", @@ -116,7 +134,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb50f77cd28240d344fd54afd205bae8760a3b0ad448b1716a2aa31e24db139" dependencies = [ - "actix-codec", + "actix-codec 0.1.2", "actix-connect", "actix-server-config", "actix-service", @@ -125,7 +143,7 @@ dependencies = [ "base64 0.10.1", "bitflags", "brotli2", - "bytes", + "bytes 0.4.12", "chrono", "copyless", "derive_more 0.15.0", @@ -166,7 +184,7 @@ checksum = "d91f0604a1bf3e628b4c3f516f07280f33a33cece27df514227f5ec30925bb55" dependencies = [ "actix-service", "actix-web", - "bytes", + "bytes 0.4.12", "derive_more 0.15.0", "futures", "httparse", @@ -183,14 +201,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd" dependencies = [ "actix 0.7.9", - "bytes", + "bytes 0.4.12", "futures", "log", "mio", "net2", "num_cpus", "slab", - "tokio", + "tokio 0.1.22", "tokio-codec", "tokio-current-thread", "tokio-io", @@ -207,7 +225,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23224bb527e204261d0291102cb9b52713084def67d94f7874923baefe04ccf7" dependencies = [ - "bytes", + "bytes 0.4.12", "http", "log", "regex", @@ -310,9 +328,9 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "908c3109948f5c37a8b57fd343a37dcad5bb1d90bfd06300ac96b17bbe017b95" dependencies = [ - "actix-codec", + "actix-codec 0.1.2", "actix-service", - "bytes", + "bytes 0.4.12", "either", "futures", "log", @@ -326,7 +344,7 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af3a1b967cdbacb903c4b9ae71257a7f098d881b25eb483d0c468b7dac579b03" dependencies = [ - "actix-codec", + "actix-codec 0.1.2", "actix-http", "actix-router", "actix-rt", @@ -338,7 +356,7 @@ dependencies = [ "actix-utils", "actix-web-codegen", "awc", - "bytes", + "bytes 0.4.12", "derive_more 0.15.0", "encoding_rs", "futures", @@ -362,10 +380,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ebee30be1864aa8dfccea853468516ae4c82303c73df96563728284e246f3b" dependencies = [ "actix 0.8.3", - "actix-codec", + "actix-codec 0.1.2", "actix-http", "actix-web", - "bytes", + "bytes 0.4.12", "futures", ] @@ -505,11 +523,11 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e995283278dd3bf0449e7534e77184adb1570c0de8b6a50bf7c9d01ad8db8c4" dependencies = [ - "actix-codec", + "actix-codec 0.1.2", "actix-http", "actix-service", "base64 0.10.1", - "bytes", + "bytes 0.4.12", "derive_more 0.15.0", "futures", "log", @@ -605,6 +623,12 @@ dependencies = [ "iovec", ] +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + [[package]] name = "cc" version = "1.0.67" @@ -926,7 +950,7 @@ name = "flat-manager" version = "0.3.7" dependencies = [ "actix 0.8.3", - "actix-codec", + "actix-codec 0.3.0", "actix-files", "actix-http", "actix-multipart", @@ -939,7 +963,7 @@ dependencies = [ "awc", "base64 0.13.0", "byteorder", - "bytes", + "bytes 0.4.12", "chrono", "diesel", "diesel_migrations", @@ -963,7 +987,7 @@ dependencies = [ "serde_json", "tempfile", "time", - "tokio", + "tokio 0.1.22", "tokio-process", "tokio-signal", "walkdir", @@ -1026,6 +1050,12 @@ version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" +[[package]] +name = "futures-core" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" + [[package]] name = "futures-cpupool" version = "0.1.8" @@ -1042,7 +1072,7 @@ version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b9f2aeb603383051bab2898cb253a0efed9b590582d0b7baaa0b25de2a536d5" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "futures-cpupool", ] @@ -1058,6 +1088,12 @@ dependencies = [ "tokio-executor", ] +[[package]] +name = "futures-sink" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" + [[package]] name = "getrandom" version = "0.1.16" @@ -1093,7 +1129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" dependencies = [ "byteorder", - "bytes", + "bytes 0.4.12", "fnv", "futures", "http", @@ -1158,7 +1194,7 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" dependencies = [ - "bytes", + "bytes 0.4.12", "fnv", "itoa", ] @@ -1528,7 +1564,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5fc9c36a235da74d4686ebaefe0eeaa3c4460afa95e3a3d95dfcfc9f1e29cd0" dependencies = [ - "bytes", + "bytes 0.4.12", "failure", "futures", "log", @@ -1743,6 +1779,32 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +[[package]] +name = "pin-project" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.9", + "syn 1.0.60", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + [[package]] name = "ppv-lite86" version = "0.2.10" @@ -2278,7 +2340,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" dependencies = [ - "bytes", + "bytes 0.4.12", ] [[package]] @@ -2397,7 +2459,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "mio", "num_cpus", @@ -2415,13 +2477,24 @@ dependencies = [ "tokio-uds", ] +[[package]] +name = "tokio" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "futures-core", + "pin-project-lite", +] + [[package]] name = "tokio-codec" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "tokio-io", ] @@ -2463,7 +2536,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "log", ] @@ -2539,7 +2612,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "iovec", "mio", @@ -2582,7 +2655,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "log", "mio", @@ -2597,7 +2670,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" dependencies = [ - "bytes", + "bytes 0.4.12", "futures", "iovec", "libc", @@ -2609,6 +2682,20 @@ dependencies = [ "tokio-reactor", ] +[[package]] +name = "tokio-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +dependencies = [ + "bytes 0.5.6", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio 0.2.25", +] + [[package]] name = "toml" version = "0.4.10" @@ -2715,7 +2802,7 @@ dependencies = [ "lru-cache", "resolv-conf", "smallvec 0.6.14", - "tokio", + "tokio 0.1.22", "trust-dns-proto 0.6.3", ] diff --git a/Cargo.toml b/Cargo.toml index d14c4b2..e985920 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ path = "src/lib.rs" env_logger = "0.8" actix = "0.8" -actix-codec = "0.1.2" +actix-codec = "0.3.0" actix-files = "0.1" actix-http = "0.2" actix-multipart = "0.1.5"