update actix-web-actors/actix-files/actix-multipart to tokio 0.3 compat

Cargo.toml

@@ -134,6 +134,7 @@ actix-files = { path = "actix-files" }
 awc = { path = "awc" }
 
 # FIXME: remove these override
+actix = { git = "https://github.com/fakeshadow/actix.git", branch = "tokio-0.3" }
 actix-rt = { git = "https://github.com/fakeshadow/actix-net.git", branch = "mio-0.7.3" }
 actix-server = { git = "https://github.com/fakeshadow/actix-net.git", branch = "mio-0.7.3" }
 actix-tls = { git = "https://github.com/fakeshadow/actix-net.git", branch = "mio-0.7.3" }

actix-files/CHANGES.md

@@ -1,6 +1,7 @@
 # Changes
 
 ## Unreleased - 2020-xx-xx
+* Update `Bytes` to 0.6.
 
 
 ## 0.4.1 - 2020-11-24

actix-files/Cargo.toml

@@ -20,9 +20,9 @@ path = "src/lib.rs"
 actix-web = { version = "3.0.0", default-features = false }
 actix-service = "1.0.6"
 bitflags = "1"
-bytes = "0.5.3"
+bytes = "0.6"
 futures-core = { version = "0.3.7", default-features = false }
-futures-util = { version = "0.3.7", default-features = false }
+futures-util = { version = "0.3.7", default-features = false, features = ["sink"] }
 derive_more = "0.99.2"
 log = "0.4"
 mime = "0.3"

actix-http-test/CHANGES.md

@@ -1,6 +1,7 @@
 # Changes
 
 ## Unreleased - 2020-xx-xx
+* Update `Bytes` to 0.6.
 
 
 ## 2.1.0 - 2020-11-25

actix-http/Cargo.toml

@@ -59,7 +59,7 @@ either = "1.5.3"
 encoding_rs = "0.8"
 futures-channel = { version = "0.3.5", default-features = false }
 futures-core = { version = "0.3.5", default-features = false }
-futures-util = { version = "0.3.5", default-features = false }
+futures-util = { version = "0.3.5", default-features = false, features = ["sink"] }
 fxhash = "0.2.1"
 
 h2 = "0.3.0"

actix-multipart/CHANGES.md

@@ -2,6 +2,7 @@
 
 ## Unreleased - 2020-xx-xx
 * Fix multipart consuming payload before header checks #1513
+* Update `Bytes` to 0.6
 
 
 ## 3.0.0 - 2020-09-11

actix-multipart/Cargo.toml

@@ -19,7 +19,7 @@ path = "src/lib.rs"
 actix-web = { version = "3.0.0", default-features = false }
 actix-service = "1.0.6"
 actix-utils = "2.0.0"
-bytes = "0.5.3"
+bytes = "0.6"
 derive_more = "0.99.2"
 httparse = "1.3"
 futures-util = { version = "0.3.5", default-features = false }

actix-web-actors/CHANGES.md

@@ -2,6 +2,7 @@
 
 ## Unreleased - 2020-xx-xx
 * Upgrade `pin-project` to `1.0`.
+* Update `Bytes` to 0.6.
 
 ## 3.0.0 - 2020-09-11
 * No significant changes from `3.0.0-beta.2`.

actix-web-actors/Cargo.toml

@@ -20,7 +20,7 @@ actix = "0.10.0"
 actix-web = { version = "3.0.0", default-features = false }
 actix-http = "2.0.0"
 actix-codec = "0.3.0"
-bytes = "0.5.2"
+bytes = "0.6"
 futures-channel = { version = "0.3.5", default-features = false }
 futures-core = { version = "0.3.5", default-features = false }
 pin-project = "1.0.0"

benches/service.rs

@@ -26,7 +26,7 @@ where
     S: Service<Request = ServiceRequest, Response = ServiceResponse, Error = Error>
         + 'static,
 {
-    let mut rt = actix_rt::System::new("test");
+    let rt = actix_rt::System::new("test");
     let srv = Rc::new(RefCell::new(srv));
 
     let req = TestRequest::default().to_srv_request();
@@ -67,7 +67,7 @@ async fn index(req: ServiceRequest) -> Result<ServiceResponse, Error> {
 // Sample results on MacBook Pro '14
 // time:   [2.0724 us 2.1345 us 2.2074 us]
 fn async_web_service(c: &mut Criterion) {
-    let mut rt = actix_rt::System::new("test");
+    let rt = actix_rt::System::new("test");
     let srv = Rc::new(RefCell::new(rt.block_on(init_service(
         App::new().service(web::service("/").finish(index)),
     ))));