From 4b25b26bb2cbb08837217287c49e1c93290d9483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= Date: Mon, 14 Sep 2020 23:36:15 +0200 Subject: [PATCH] update bytes to be compatible with actix_web::Bytes --- Cargo.lock | 132 +++++++++++++++-------------------------------------- Cargo.toml | 2 +- 2 files changed, 39 insertions(+), 95 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index debd5a8..d25fef7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,20 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -[[package]] -name = "actix-codec" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e55f0a5c2ca15795035d90c46bd0e73a5123b72f68f12596d6ba5282051380" -dependencies = [ - "bitflags", - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "tokio", - "tokio-util 0.2.0", -] - [[package]] name = "actix-codec" version = "0.3.0" @@ -22,13 +7,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570" dependencies = [ "bitflags", - "bytes 0.5.6", + "bytes", "futures-core", "futures-sink", "log", "pin-project", "tokio", - "tokio-util 0.3.1", + "tokio-util", ] [[package]] @@ -37,10 +22,10 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc" dependencies = [ - "actix-codec 0.3.0", + "actix-codec", "actix-rt", "actix-service", - "actix-utils 2.0.0", + "actix-utils", "derive_more", "either", "futures-util", @@ -60,7 +45,7 @@ dependencies = [ "actix-service", "actix-web", "bitflags", - "bytes 0.5.6", + "bytes", "derive_more", "futures-core", "futures-util", @@ -77,16 +62,16 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05dd80ba8f27c4a34357c07e338c8f5c38f8520e6d626ca1727d8fecc41b0cab" dependencies = [ - "actix-codec 0.3.0", + "actix-codec", "actix-connect", "actix-rt", "actix-service", "actix-threadpool", - "actix-utils 2.0.0", + "actix-utils", "base64", "bitflags", "brotli2", - "bytes 0.5.6", + "bytes", "cookie", "copyless", "derive_more", @@ -158,14 +143,14 @@ dependencies = [ [[package]] name = "actix-server" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d74b464215a473c973a2d7d03a69cc10f4ce1f4b38a7659c5193dc5c675630" +checksum = "45407e6e672ca24784baa667c5d32ef109ccdd8d5e0b5ebb9ef8a67f4dfb708e" dependencies = [ - "actix-codec 0.2.0", + "actix-codec", "actix-rt", "actix-service", - "actix-utils 1.0.6", + "actix-utils", "futures-channel", "futures-util", "log", @@ -221,41 +206,23 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb" dependencies = [ - "actix-codec 0.3.0", + "actix-codec", "actix-service", - "actix-utils 2.0.0", + "actix-utils", "futures-util", ] -[[package]] -name = "actix-utils" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf8f5631bf01adec2267808f00e228b761c60c0584cc9fa0b5364f41d147f4e" -dependencies = [ - "actix-codec 0.2.0", - "actix-rt", - "actix-service", - "bitflags", - "bytes 0.5.6", - "either", - "futures", - "log", - "pin-project", - "slab", -] - [[package]] name = "actix-utils" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a" dependencies = [ - "actix-codec 0.3.0", + "actix-codec", "actix-rt", "actix-service", "bitflags", - "bytes 0.5.6", + "bytes", "either", "futures-channel", "futures-sink", @@ -267,11 +234,11 @@ dependencies = [ [[package]] name = "actix-web" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e665de333edabd0421799822dac3e7d8a25a63bb995ae1f60cd99619d8ddda8" +checksum = "cd7fc56022da91a4dc00ccae7d7bb82e539749ca36df181695f4efdf5d413b2e" dependencies = [ - "actix-codec 0.3.0", + "actix-codec", "actix-http", "actix-macros", "actix-router", @@ -281,10 +248,10 @@ dependencies = [ "actix-testing", "actix-threadpool", "actix-tls", - "actix-utils 2.0.0", + "actix-utils", "actix-web-codegen", "awc", - "bytes 0.5.6", + "bytes", "derive_more", "encoding_rs", "futures-channel", @@ -388,12 +355,12 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "150e00c06683ab44c5f97d033950e5d87a7a042d06d77f5eecb443cbd23d0575" dependencies = [ - "actix-codec 0.3.0", + "actix-codec", "actix-http", "actix-rt", "actix-service", "base64", - "bytes 0.5.6", + "bytes", "derive_more", "futures-core", "log", @@ -472,7 +439,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6ae7069aad07c7cdefe6a22a671f00650728bd2331a4cc62e1e5d0becdf9ca4" dependencies = [ - "bytes 0.5.6", + "bytes", ] [[package]] @@ -487,16 +454,6 @@ version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] - [[package]] name = "bytes" version = "0.5.6" @@ -509,7 +466,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7c05fa5172da78a62d9949d662d2ac89d4cc7355d7b49adee5163f1fb3f363" dependencies = [ - "bytes 0.5.6", + "bytes", ] [[package]] @@ -841,7 +798,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53" dependencies = [ - "bytes 0.5.6", + "bytes", "fnv", "futures-core", "futures-sink", @@ -850,7 +807,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.3.1", + "tokio-util", "tracing", ] @@ -895,7 +852,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes 0.5.6", + "bytes", "fnv", "itoa", ] @@ -906,7 +863,7 @@ version = "0.11.0" dependencies = [ "actix-files", "actix-web", - "bytes 0.4.12", + "bytes", "clap", "env_logger", "futures", @@ -1082,11 +1039,12 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722" +checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9" dependencies = [ "adler", + "autocfg", ] [[package]] @@ -1565,9 +1523,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350" +checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b" dependencies = [ "proc-macro2", "quote", @@ -1644,9 +1602,9 @@ dependencies = [ [[package]] name = "time" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12785163ae8a1cbb52a5db39af4a5baabd3fe49f07f76f952f89d7e89e5ce531" +checksum = "80c1a1fd93112fc50b11c43a1def21f926be3c18884fad676ea879572da070a1" dependencies = [ "const_fn", "libc", @@ -1692,7 +1650,7 @@ version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" dependencies = [ - "bytes 0.5.6", + "bytes", "futures-core", "iovec", "lazy_static", @@ -1706,27 +1664,13 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "tokio-util" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - [[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", + "bytes", "futures-core", "futures-sink", "log", diff --git a/Cargo.toml b/Cargo.toml index 6a50cdd..f61b72c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [dependencies] actix-web = "3.0" actix-files = "0.3.0" -bytes = "0.4" +bytes = "0.5.6" clap = "2" env_logger = "*" log = "*"