bump tokio-util to 0.7

actix-codec/CHANGES.md

@@ -1,6 +1,9 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+- Updated `tokio-util` dependency to `0.7.0`. [#???]
+
+[#338]: https://github.com/actix/actix-net/pull/338
 
 
 ## 0.4.2 - 2021-12-31

actix-codec/Cargo.toml

@@ -17,7 +17,7 @@ name = "actix_codec"
 path = "src/lib.rs"
 
 [dependencies]
-bitflags = "1.2.1"
+bitflags = "1.2"
 bytes = "1"
 futures-core = { version = "0.3.7", default-features = false }
 futures-sink = { version = "0.3.7", default-features = false }
@@ -25,7 +25,7 @@ log = "0.4"
 memchr = "2.3"
 pin-project-lite = "0.2"
 tokio = "1.13.1"
-tokio-util = { version = "0.6", features = ["codec", "io"] }
+tokio-util = { version = "0.7", features = ["codec", "io"] }
 
 [dev-dependencies]
 criterion = { version = "0.3", features = ["html_reports"] }

actix-codec/src/lines.rs

@@ -7,8 +7,8 @@ use super::{Decoder, Encoder};
 
 /// Lines codec. Reads/writes line delimited strings.
 ///
-/// Will split input up by LF or CRLF delimiters. I.e. carriage return characters at the end of
+/// Will split input up by LF or CRLF delimiters. Carriage return characters at the end of lines are
-/// lines are not preserved.
+/// not preserved.
 #[derive(Debug, Copy, Clone, Default)]
 #[non_exhaustive]
 pub struct LinesCodec;

actix-tls/Cargo.toml

@@ -50,7 +50,7 @@ actix-utils = "3.0.0"
 futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
 log = "0.4"
 pin-project-lite = "0.2.7"
-tokio-util = { version = "0.6.3", default-features = false }
+tokio-util = "0.7"
 
 # uri
 http = { version = "0.2.3", optional = true }

actix-tls/src/connect/tcp.rs

@@ -79,7 +79,7 @@ pub enum TcpConnectorFut<R> {
         port: u16,
         local_addr: Option<IpAddr>,
         addrs: Option<VecDeque<SocketAddr>>,
-        stream: ReusableBoxFuture<Result<TcpStream, io::Error>>,
+        stream: ReusableBoxFuture<'static, Result<TcpStream, io::Error>>,
     },
 
     Error(Option<ConnectError>),