Tokio 1.0 (#1813)

Co-authored-by: Rob Ede <robjtede@icloud.com>

awc/CHANGES.md

@@ -2,7 +2,11 @@
 
 ## Unreleased - 2021-xx-xx
 ### Changed
-* Bumped `rand` to `0.8`
+* Update `rand` to `0.8`
+* Update `bytes` to `1.0`. [#1813]
+* Update `rust-tls` to `0.19`. [#1813]
+
+[#1813]: https://github.com/actix/actix-web/pull/1813
 
 
 ## 2.0.3 - 2020-11-29

awc/Cargo.toml

@@ -37,16 +37,16 @@ rustls = ["rust-tls", "actix-http/rustls"]
 compress = ["actix-http/compress"]
 
 [dependencies]
-actix-codec = "0.3.0"
-actix-service = "1.0.6"
+actix-codec = "0.4.0-beta.1"
+actix-service = "2.0.0-beta.2"
 actix-http = "2.2.0"
-actix-rt = "1.0.0"
+actix-rt = "2.0.0-beta.1"
 
 base64 = "0.13"
-bytes = "0.5.3"
+bytes = "1"
 cfg-if = "1.0"
 derive_more = "0.99.2"
-futures-core = { version = "0.3.5", default-features = false }
+futures-core = { version = "0.3.7", default-features = false }
 log =" 0.4"
 mime = "0.3"
 percent-encoding = "2.1"
@@ -55,18 +55,20 @@ serde = "1.0"
 serde_json = "1.0"
 serde_urlencoded = "0.7"
 open-ssl = { version = "0.10", package = "openssl", optional = true }
-rust-tls = { version = "0.18.0", package = "rustls", optional = true, features = ["dangerous_configuration"] }
+rust-tls = { version = "0.19.0", package = "rustls", optional = true, features = ["dangerous_configuration"] }
 
 [dev-dependencies]
-actix-connect = { version = "2.0.0", features = ["openssl"] }
+# TODO: actix is temporary added as dev dep for actix-macro reason.
+# Can be removed when it does not impact tests.
+actix = "0.11.0-beta.1"
 actix-web = { version = "3.0.0", features = ["openssl"] }
 actix-http = { version = "2.0.0", features = ["openssl"] }
 actix-http-test = { version = "2.0.0", features = ["openssl"] }
-actix-utils = "2.0.0"
-actix-server = "1.0.0"
-actix-tls = { version = "2.0.0", features = ["openssl", "rustls"] }
+actix-utils = "3.0.0-beta.1"
+actix-server = "2.0.0-beta.2"
+actix-tls = { version = "3.0.0-beta.2", features = ["openssl", "rustls"] }
 brotli2 = "0.3.2"
 flate2 = "1.0.13"
-futures-util = { version = "0.3.5", default-features = false }
+futures-util = { version = "0.3.7", default-features = false }
 env_logger = "0.7"
 webpki = "0.21"

awc/src/builder.rs

@@ -51,7 +51,7 @@ impl ClientBuilder {
     /// Use custom connector service.
     pub fn connector<T>(mut self, connector: T) -> Self
     where
-        T: Service<Request = HttpConnect, Error = ConnectError> + 'static,
+        T: Service<HttpConnect, Error = ConnectError> + 'static,
         T::Response: Connection,
         <T::Response as Connection>::Future: 'static,
         T::Future: 'static,

awc/src/connect.rs

@@ -2,9 +2,9 @@ use std::future::Future;
 use std::pin::Pin;
 use std::rc::Rc;
 use std::task::{Context, Poll};
-use std::{fmt, io, mem, net};
+use std::{fmt, io, net};
 
-use actix_codec::{AsyncRead, AsyncWrite, Framed};
+use actix_codec::{AsyncRead, AsyncWrite, Framed, ReadBuf};
 use actix_http::body::Body;
 use actix_http::client::{
     Connect as ClientConnect, ConnectError, Connection, SendRequestError,
@@ -70,7 +70,7 @@ pub(crate) trait Connect {
 
 impl<T> Connect for ConnectorWrapper<T>
 where
-    T: Service<Request = ClientConnect, Error = ConnectError>,
+    T: Service<ClientConnect, Error = ConnectError>,
     T::Response: Connection,
     <T::Response as Connection>::Io: 'static,
     <T::Response as Connection>::Future: 'static,
@@ -221,18 +221,11 @@ impl fmt::Debug for BoxedSocket {
 }
 
 impl AsyncRead for BoxedSocket {
-    unsafe fn prepare_uninitialized_buffer(
-        &self,
-        buf: &mut [mem::MaybeUninit<u8>],
-    ) -> bool {
-        self.0.as_read().prepare_uninitialized_buffer(buf)
-    }
-
     fn poll_read(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
-        buf: &mut [u8],
-    ) -> Poll<io::Result<usize>> {
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
         Pin::new(self.get_mut().0.as_read_mut()).poll_read(cx, buf)
     }
 }

awc/src/sender.rs

@@ -5,7 +5,7 @@ use std::rc::Rc;
 use std::task::{Context, Poll};
 use std::time::Duration;
 
-use actix_rt::time::{delay_for, Delay};
+use actix_rt::time::{sleep, Sleep};
 use bytes::Bytes;
 use derive_more::From;
 use futures_core::Stream;
@@ -56,7 +56,8 @@ impl Into<SendRequestError> for PrepForSendingError {
 pub enum SendClientRequest {
     Fut(
         Pin<Box<dyn Future<Output = Result<ClientResponse, SendRequestError>>>>,
-        Option<Delay>,
+        // FIXME: use a pinned Sleep instead of box.
+        Option<Pin<Box<Sleep>>>,
         bool,
     ),
     Err(Option<SendRequestError>),
@@ -68,7 +69,7 @@ impl SendClientRequest {
         response_decompress: bool,
         timeout: Option<Duration>,
     ) -> SendClientRequest {
-        let delay = timeout.map(delay_for);
+        let delay = timeout.map(|d| Box::pin(sleep(d)));
         SendClientRequest::Fut(send, delay, response_decompress)
     }
 }

awc/tests/test_client.rs

@@ -108,14 +108,14 @@ async fn test_form() {
 async fn test_timeout() {
     let srv = test::start(|| {
         App::new().service(web::resource("/").route(web::to(|| async {
-            actix_rt::time::delay_for(Duration::from_millis(200)).await;
+            actix_rt::time::sleep(Duration::from_millis(200)).await;
             Ok::<_, Error>(HttpResponse::Ok().body(STR))
         })))
     });
 
     let connector = awc::Connector::new()
-        .connector(actix_connect::new_connector(
-            actix_connect::start_default_resolver().await.unwrap(),
+        .connector(actix_tls::connect::new_connector(
+            actix_tls::connect::start_default_resolver().await.unwrap(),
         ))
         .timeout(Duration::from_secs(15))
         .finish();
@@ -136,7 +136,7 @@ async fn test_timeout() {
 async fn test_timeout_override() {
     let srv = test::start(|| {
         App::new().service(web::resource("/").route(web::to(|| async {
-            actix_rt::time::delay_for(Duration::from_millis(200)).await;
+            actix_rt::time::sleep(Duration::from_millis(200)).await;
             Ok::<_, Error>(HttpResponse::Ok().body(STR))
         })))
     });

awc/tests/test_connector.rs

@@ -1,7 +1,7 @@
 #![cfg(feature = "openssl")]
 use actix_http::HttpService;
 use actix_http_test::test_server;
-use actix_service::{map_config, ServiceFactory};
+use actix_service::{map_config, ServiceFactoryExt};
 use actix_web::http::Version;
 use actix_web::{dev::AppConfig, web, App, HttpResponse};
 use open_ssl::ssl::{SslAcceptor, SslConnector, SslFiletype, SslMethod, SslVerifyMode};

awc/tests/test_rustls_client.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use actix_http::HttpService;
 use actix_http_test::test_server;
-use actix_service::{map_config, pipeline_factory, ServiceFactory};
+use actix_service::{map_config, pipeline_factory, ServiceFactoryExt};
 use actix_web::http::Version;
 use actix_web::{dev::AppConfig, web, App, HttpResponse};
 use futures_util::future::ok;

awc/tests/test_ssl_client.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use actix_http::HttpService;
 use actix_http_test::test_server;
-use actix_service::{map_config, pipeline_factory, ServiceFactory};
+use actix_service::{map_config, pipeline_factory, ServiceFactoryExt};
 use actix_web::http::Version;
 use actix_web::{dev::AppConfig, web, App, HttpResponse};
 use futures_util::future::ok;