Merge branch 'master' into get-all-order

guarantee ordering of header map get_all
closes #2466
2025-07-24 17:55:27 +02:00 · 2021-11-28 00:20:08 +00:00 · 2021-11-28 00:18:15 +00:00
49 changed files with 337 additions and 658 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,13 +3,6 @@
 ## Unreleased - 2021-xx-xx


-## 4.0.0-beta.13 - 2021-11-30
-### Changed
-* Update `actix-tls` to `3.0.0-rc.1`. [#2474]
-
-[#2474]: https://github.com/actix/actix-web/pull/2474
-
-
 ## 4.0.0-beta.12 - 2021-11-22
 ### Changed
 * Compress middleware's response type is now `AnyBody<Encoder<B>>`. [#2448]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "4.0.0-beta.13"
+version = "4.0.0-beta.12"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
 keywords = ["actix", "http", "web", "framework", "async"]
@@ -75,9 +75,9 @@ actix-rt = "2.3"
 actix-server = "2.0.0-beta.9"
 actix-service = "2.0.0"
 actix-utils = "3.0.0"
-actix-tls = { version = "3.0.0-rc.1", default-features = false, optional = true }
+actix-tls = { version = "3.0.0-beta.9", default-features = false, optional = true }

-actix-http = "3.0.0-beta.14"
+actix-http = "3.0.0-beta.13"
 actix-router = "0.5.0-beta.2"
 actix-web-codegen = "0.5.0-beta.5"

@@ -96,7 +96,7 @@ once_cell = "1.5"
 log = "0.4"
 mime = "0.3"
 paste = "1"
-pin-project-lite = "0.2.7"
+pin-project = "1.0.0"
 regex = "1.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -143,15 +143,6 @@ actix-web-actors = { path = "actix-web-actors" }
 actix-web-codegen = { path = "actix-web-codegen" }
 awc = { path = "awc" }

-# uncomment for quick testing against local actix-net repo
-# actix-service = { path = "../actix-net/actix-service" }
-# actix-macros = { path = "../actix-net/actix-macros" }
-# actix-rt = { path = "../actix-net/actix-rt" }
-# actix-codec = { path = "../actix-net/actix-codec" }
-# actix-utils = { path = "../actix-net/actix-utils" }
-# actix-tls = { path = "../actix-net/actix-tls" }
-# actix-server = { path = "../actix-net/actix-server" }
-
 [[test]]
 name = "test_server"
 required-features = ["compress-brotli", "compress-gzip", "compress-zstd", "cookies"]
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@
  <p>

 [![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web)
-[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.0.0-beta.13)](https://docs.rs/actix-web/4.0.0-beta.13)
+[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.0.0-beta.12)](https://docs.rs/actix-web/4.0.0-beta.12)
 [![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg)
-[![Dependency Status](https://deps.rs/crate/actix-web/4.0.0-beta.13/status.svg)](https://deps.rs/crate/actix-web/4.0.0-beta.13)
+[![Dependency Status](https://deps.rs/crate/actix-web/4.0.0-beta.12/status.svg)](https://deps.rs/crate/actix-web/4.0.0-beta.12)
 <br />
 [![build status](https://github.com/actix/actix-web/workflows/CI%20%28Linux%29/badge.svg?branch=master&event=push)](https://github.com/actix/actix-web/actions)
 [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) 
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@@ -23,9 +23,8 @@ experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]

 [dependencies]
 actix-web = { version = "4.0.0-beta.11", default-features = false }
-actix-http = "3.0.0-beta.14"
-actix-service = "2"
-actix-utils = "3"
+actix-http = "3.0.0-beta.13"
+actix-service = "2.0.0"

 askama_escape = "0.10"
 bitflags = "1"
--- a/actix-files/src/path_buf.rs
+++ b/actix-files/src/path_buf.rs
@@ -1,9 +1,9 @@
 use std::{
+    future::{ready, Ready},
    path::{Path, PathBuf},
    str::FromStr,
 };

-use actix_utils::future::{ready, Ready};
 use actix_web::{dev::Payload, FromRequest, HttpRequest};

 use crate::error::UriSegmentError;
--- a/actix-http-test/CHANGES.md
+++ b/actix-http-test/CHANGES.md
@@ -3,12 +3,6 @@
 ## Unreleased - 2021-xx-xx


-## 3.0.0-beta.8 - 2021-11-30
-* Update `actix-tls` to `3.0.0-rc.1`. [#2474]
-
-[#2474]: https://github.com/actix/actix-web/pull/2474
-
-
 ## 3.0.0-beta.7 - 2021-11-22
 * Fix compatibility with experimental `io-uring` feature of `actix-rt`. [#2408]

--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-http-test"
-version = "3.0.0-beta.8"
+version = "3.0.0-beta.7"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Various helpers for Actix applications to use during testing"
 keywords = ["http", "web", "framework", "async", "futures"]
@@ -31,7 +31,7 @@ openssl = ["tls-openssl", "awc/openssl"]
 [dependencies]
 actix-service = "2.0.0"
 actix-codec = "0.4.1"
-actix-tls = "3.0.0-rc.1"
+actix-tls = "3.0.0-beta.9"
 actix-utils = "3.0.0"
 actix-rt = "2.2"
 actix-server = "2.0.0-beta.9"
@@ -52,4 +52,4 @@ tokio = { version = "1.2", features = ["sync"] }

 [dev-dependencies]
 actix-web = { version = "4.0.0-beta.11", default-features = false, features = ["cookies"] }
-actix-http = "3.0.0-beta.14"
+actix-http = "3.0.0-beta.13"
--- a/actix-http-test/README.md
+++ b/actix-http-test/README.md
@@ -3,11 +3,11 @@
 > Various helpers for Actix applications to use during testing.

 [![crates.io](https://img.shields.io/crates/v/actix-http-test?label=latest)](https://crates.io/crates/actix-http-test)
-[![Documentation](https://docs.rs/actix-http-test/badge.svg?version=3.0.0-beta.8)](https://docs.rs/actix-http-test/3.0.0-beta.8)
+[![Documentation](https://docs.rs/actix-http-test/badge.svg?version=3.0.0-beta.7)](https://docs.rs/actix-http-test/3.0.0-beta.7)
 [![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http-test)
 <br>
-[![Dependency Status](https://deps.rs/crate/actix-http-test/3.0.0-beta.8/status.svg)](https://deps.rs/crate/actix-http-test/3.0.0-beta.8)
+[![Dependency Status](https://deps.rs/crate/actix-http-test/3.0.0-beta.7/status.svg)](https://deps.rs/crate/actix-http-test/3.0.0-beta.7)
 [![Download](https://img.shields.io/crates/d/actix-http-test.svg)](https://crates.io/crates/actix-http-test)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)

--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -1,18 +1,11 @@
 # Changes

 ## Unreleased - 2021-xx-xx
-
-
-## 3.0.0-beta.14 - 2021-11-30
 ### Changed
 * Guarantee ordering of `header::GetAll` iterator to be same as insertion order. [#2467]
-* Expose `header::map` module. [#2467]
-* Implement `ExactSizeIterator` and `FusedIterator` for all `HeaderMap` iterators. [#2470]
-* Update `actix-tls` to `3.0.0-rc.1`. [#2474]
+* Expose `header::{GetAll, Removed}` iterators. [#2467]

 [#2467]: https://github.com/actix/actix-web/pull/2467
-[#2470]: https://github.com/actix/actix-web/pull/2470
-[#2474]: https://github.com/actix/actix-web/pull/2474


 ## 3.0.0-beta.13 - 2021-11-22
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "3.0.0-beta.14"
+version = "3.0.0-beta.13"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "HTTP primitives for the Actix ecosystem"
 keywords = ["actix", "http", "framework", "async", "futures"]
@@ -73,7 +73,7 @@ sha-1 = "0.9"
 smallvec = "1.6.1"

 # tls
-actix-tls = { version = "3.0.0-rc.1", default-features = false, optional = true }
+actix-tls = { version = "3.0.0-beta.9", default-features = false, optional = true }

 # compression
 brotli2 = { version="0.3.2", optional = true }
@@ -83,7 +83,7 @@ zstd = { version = "0.9", optional = true }
 [dev-dependencies]
 actix-server = "2.0.0-beta.9"
 actix-http-test = { version = "3.0.0-beta.7", features = ["openssl"] }
-actix-tls = { version = "3.0.0-rc.1", features = ["openssl"] }
+actix-tls = { version = "3.0.0-beta.9", features = ["openssl"] }
 async-stream = "0.3"
 criterion = { version = "0.3", features = ["html_reports"] }
 env_logger = "0.9"
--- a/actix-http/README.md
+++ b/actix-http/README.md
@@ -3,11 +3,11 @@
 > HTTP primitives for the Actix ecosystem.

 [![crates.io](https://img.shields.io/crates/v/actix-http?label=latest)](https://crates.io/crates/actix-http)
-[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.0.0-beta.14)](https://docs.rs/actix-http/3.0.0-beta.14)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.0.0-beta.13)](https://docs.rs/actix-http/3.0.0-beta.13)
 [![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-http/3.0.0-beta.14/status.svg)](https://deps.rs/crate/actix-http/3.0.0-beta.14)
+[![dependency status](https://deps.rs/crate/actix-http/3.0.0-beta.13/status.svg)](https://deps.rs/crate/actix-http/3.0.0-beta.13)
 [![Download](https://img.shields.io/crates/d/actix-http.svg)](https://crates.io/crates/actix-http)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)

--- a/actix-http/src/h1/service.rs
+++ b/actix-http/src/h1/service.rs
@@ -103,10 +103,7 @@ mod openssl {
    use super::*;

    use actix_tls::accept::{
-        openssl::{
-            reexports::{Error as SslError, SslAcceptor},
-            Acceptor, TlsStream,
-        },
+        openssl::{Acceptor, SslAcceptor, SslError, TlsStream},
        TlsError,
    };

@@ -167,7 +164,7 @@ mod rustls {

    use actix_service::ServiceFactoryExt as _;
    use actix_tls::accept::{
-        rustls::{reexports::ServerConfig, Acceptor, TlsStream},
+        rustls::{Acceptor, ServerConfig, TlsStream},
        TlsError,
    };

--- a/actix-http/src/h2/service.rs
+++ b/actix-http/src/h2/service.rs
@@ -103,10 +103,7 @@ where
 mod openssl {
    use actix_service::ServiceFactoryExt as _;
    use actix_tls::accept::{
-        openssl::{
-            reexports::{Error as SslError, SslAcceptor},
-            Acceptor, TlsStream,
-        },
+        openssl::{Acceptor, SslAcceptor, SslError, TlsStream},
        TlsError,
    };

@@ -154,7 +151,7 @@ mod rustls {

    use actix_service::ServiceFactoryExt as _;
    use actix_tls::accept::{
-        rustls::{reexports::ServerConfig, Acceptor, TlsStream},
+        rustls::{Acceptor, ServerConfig, TlsStream},
        TlsError,
    };

--- a/actix-http/src/header/as_name.rs
+++ b/actix-http/src/header/as_name.rs
@@ -1,12 +1,11 @@
-//! Sealed [`AsHeaderName`] trait and implementations.
+//! Helper trait for types that can be effectively borrowed as a [HeaderValue].
+//!
+//! [HeaderValue]: crate::http::HeaderValue

-use std::{borrow::Cow, str::FromStr as _};
+use std::{borrow::Cow, str::FromStr};

 use http::header::{HeaderName, InvalidHeaderName};

-/// Sealed trait implemented for types that can be effectively borrowed as a [`HeaderValue`].
-///
-/// [`HeaderValue`]: crate::http::HeaderValue
 pub trait AsHeaderName: Sealed {}

 pub struct Seal;
--- a/actix-http/src/header/into_pair.rs
+++ b/actix-http/src/header/into_pair.rs
@@ -1,6 +1,4 @@
-//! [`IntoHeaderPair`] trait and implementations.
-
-use std::convert::TryFrom as _;
+use std::convert::TryFrom;

 use http::{
    header::{HeaderName, InvalidHeaderName, InvalidHeaderValue},
@@ -9,10 +7,7 @@ use http::{

 use super::{Header, IntoHeaderValue};

-/// An interface for types that can be converted into a [`HeaderName`]/[`HeaderValue`] pair for
-/// insertion into a [`HeaderMap`].
-///
-/// [`HeaderMap`]: crate::http::HeaderMap
+/// Transforms structures into header K/V pairs for inserting into `HeaderMap`s.
 pub trait IntoHeaderPair: Sized {
    type Error: Into<HttpError>;

--- a/actix-http/src/header/into_value.rs
+++ b/actix-http/src/header/into_value.rs
@@ -1,12 +1,10 @@
-//! [`IntoHeaderValue`] trait and implementations.
-
-use std::convert::TryFrom as _;
+use std::convert::TryFrom;

 use bytes::Bytes;
 use http::{header::InvalidHeaderValue, Error as HttpError, HeaderValue};
 use mime::Mime;

-/// An interface for types that can be converted into a [`HeaderValue`].
+/// A trait for any object that can be Converted to a `HeaderValue`
 pub trait IntoHeaderValue: Sized {
    /// The type returned in the event of a conversion error.
    type Error: Into<HttpError>;
--- a/actix-http/src/header/map.rs
+++ b/actix-http/src/header/map.rs
@@ -1,6 +1,6 @@
 //! A multi-value [`HeaderMap`] and its iterators.

-use std::{borrow::Cow, collections::hash_map, iter, ops};
+use std::{borrow::Cow, collections::hash_map, ops};

 use ahash::AHashMap;
 use http::header::{HeaderName, HeaderValue};
@@ -581,8 +581,7 @@ impl HeaderMap {
    }
 }

-/// Note that this implementation will clone a [HeaderName] for each value. Consider using
-/// [`drain`](Self::drain) to control header name cloning.
+/// Note that this implementation will clone a [HeaderName] for each value.
 impl IntoIterator for HeaderMap {
    type Item = (HeaderName, HeaderValue);
    type IntoIter = IntoIter;
@@ -603,7 +602,7 @@ impl<'a> IntoIterator for &'a HeaderMap {
    }
 }

-/// Iterator over borrowed values with the same associated name.
+/// Iterator for references of [`HeaderValue`]s with the same associated [`HeaderName`].
 ///
 /// See [`HeaderMap::get_all`].
 #[derive(Debug)]
@@ -645,14 +644,10 @@ impl<'a> Iterator for GetAll<'a> {
    }
 }

-impl ExactSizeIterator for GetAll<'_> {}
-
-impl iter::FusedIterator for GetAll<'_> {}
-
-/// Iterator over removed, owned values with the same associated name.
+/// Iterator for owned [`HeaderValue`]s with the same associated [`HeaderName`] returned from
+/// methods that remove or replace items.
 ///
-/// Returned from methods that remove or replace items. See [`HeaderMap::insert`]
-/// and [`HeaderMap::remove`].
+/// See [`HeaderMap::insert`] and [`HeaderMap::remove`].
 #[derive(Debug)]
 pub struct Removed {
    inner: Option<smallvec::IntoIter<[HeaderValue; 4]>>,
@@ -694,11 +689,7 @@ impl Iterator for Removed {
    }
 }

-impl ExactSizeIterator for Removed {}
-
-impl iter::FusedIterator for Removed {}
-
-/// Iterator over all names in the map.
+/// Iterator over all [`HeaderName`]s in the map.
 #[derive(Debug)]
 pub struct Keys<'a>(hash_map::Keys<'a, HeaderName, Value>);

@@ -716,11 +707,6 @@ impl<'a> Iterator for Keys<'a> {
    }
 }

-impl ExactSizeIterator for Keys<'_> {}
-
-impl iter::FusedIterator for Keys<'_> {}
-
-/// Iterator over borrowed name-value pairs.
 #[derive(Debug)]
 pub struct Iter<'a> {
    inner: hash_map::Iter<'a, HeaderName, Value>,
@@ -772,10 +758,6 @@ impl<'a> Iterator for Iter<'a> {
    }
 }

-impl ExactSizeIterator for Iter<'_> {}
-
-impl iter::FusedIterator for Iter<'_> {}
-
 /// Iterator over drained name-value pairs.
 ///
 /// Iterator items are `(Option<HeaderName>, HeaderValue)` to avoid cloning.
@@ -827,10 +809,6 @@ impl<'a> Iterator for Drain<'a> {
    }
 }

-impl ExactSizeIterator for Drain<'_> {}
-
-impl iter::FusedIterator for Drain<'_> {}
-
 /// Iterator over owned name-value pairs.
 ///
 /// Implementation necessarily clones header names for each value.
@@ -881,27 +859,12 @@ impl Iterator for IntoIter {
    }
 }

-impl ExactSizeIterator for IntoIter {}
-
-impl iter::FusedIterator for IntoIter {}
-
 #[cfg(test)]
 mod tests {
-    use std::iter::FusedIterator;
-
    use http::header;
-    use static_assertions::assert_impl_all;

    use super::*;

-    assert_impl_all!(HeaderMap: IntoIterator);
-    assert_impl_all!(Keys<'_>: Iterator, ExactSizeIterator, FusedIterator);
-    assert_impl_all!(GetAll<'_>: Iterator, ExactSizeIterator, FusedIterator);
-    assert_impl_all!(Removed: Iterator, ExactSizeIterator, FusedIterator);
-    assert_impl_all!(Iter<'_>: Iterator, ExactSizeIterator, FusedIterator);
-    assert_impl_all!(IntoIter: Iterator, ExactSizeIterator, FusedIterator);
-    assert_impl_all!(Drain<'_>: Iterator, ExactSizeIterator, FusedIterator);
-
    #[test]
    fn create() {
        let map = HeaderMap::new();
@@ -1072,9 +1035,6 @@ mod tests {
        assert_eq!(vals.next().unwrap().as_bytes(), b"8");
        assert_eq!(vals.next().unwrap().as_bytes(), b"9");
        assert!(vals.next().is_none());
-
-        // check for fused-ness
-        assert!(vals.next().is_none());
    }

    fn owned_pair<'a>(
--- a/actix-http/src/header/mod.rs
+++ b/actix-http/src/header/mod.rs
@@ -34,7 +34,7 @@ use crate::{error::ParseError, HttpMessage};
 mod as_name;
 mod into_pair;
 mod into_value;
-pub mod map;
+pub(crate) mod map;
 mod shared;
 mod utils;

@@ -44,12 +44,12 @@ pub use self::shared::*;
 pub use self::as_name::AsHeaderName;
 pub use self::into_pair::IntoHeaderPair;
 pub use self::into_value::IntoHeaderValue;
-pub use self::map::HeaderMap;
+pub use self::map::{GetAll, HeaderMap, Removed};
 pub use self::utils::{
    fmt_comma_delimited, from_comma_delimited, from_one_raw_str, http_percent_encode,
 };

-/// An interface for types that already represent a valid header.
+/// A trait for any object that already represents a valid header field and value.
 pub trait Header: IntoHeaderValue {
    /// Returns the name of the header field
    fn name() -> HeaderName;
--- a/actix-http/src/header/shared/content_encoding.rs
+++ b/actix-http/src/header/shared/content_encoding.rs
@@ -9,17 +9,14 @@ use crate::{
    HttpMessage,
 };

-/// Error returned when a content encoding is unknown.
+/// Error return when a content encoding is unknown.
+///
+/// Example: 'compress'
 #[derive(Debug, Display, Error)]
 #[display(fmt = "unsupported content encoding")]
 pub struct ContentEncodingParseError;

 /// Represents a supported content encoding.
-///
-/// Includes a commonly-used subset of media types appropriate for use as HTTP content encodings.
-/// See [IANA HTTP Content Coding Registry].
-///
-/// [IANA HTTP Content Coding Registry]: https://www.iana.org/assignments/http-parameters/http-parameters.xhtml
 #[derive(Debug, Clone, Copy, PartialEq)]
 #[non_exhaustive]
 pub enum ContentEncoding {
@@ -35,7 +32,7 @@ pub enum ContentEncoding {
    /// Gzip algorithm.
    Gzip,

-    /// Zstd algorithm.
+    // Zstd algorithm.
    Zstd,

    /// Indicates the identity function (i.e. no compression, nor modification).
--- a/actix-http/src/header/utils.rs
+++ b/actix-http/src/header/utils.rs
@@ -1,5 +1,3 @@
-//! Header parsing utilities.
-
 use std::{fmt, str::FromStr};

 use super::HeaderValue;
--- a/actix-http/src/service.rs
+++ b/actix-http/src/service.rs
@@ -197,10 +197,7 @@ where
 mod openssl {
    use actix_service::ServiceFactoryExt as _;
    use actix_tls::accept::{
-        openssl::{
-            reexports::{Error as SslError, SslAcceptor},
-            Acceptor, TlsStream,
-        },
+        openssl::{Acceptor, SslAcceptor, SslError, TlsStream},
        TlsError,
    };

@@ -273,7 +270,7 @@ mod rustls {

    use actix_service::ServiceFactoryExt as _;
    use actix_tls::accept::{
-        rustls::{reexports::ServerConfig, Acceptor, TlsStream},
+        rustls::{Acceptor, ServerConfig, TlsStream},
        TlsError,
    };

--- a/actix-http/tests/test_rustls.rs
+++ b/actix-http/tests/test_rustls.rs
@@ -20,7 +20,7 @@ use actix_http::{
 };
 use actix_http_test::test_server;
 use actix_service::{fn_factory_with_config, fn_service};
-use actix_tls::connect::rustls::webpki_roots_cert_store;
+use actix_tls::connect::tls::rustls::webpki_roots_cert_store;
 use actix_utils::future::{err, ok};
 use bytes::{Bytes, BytesMut};
 use derive_more::{Display, Error};
--- a/actix-multipart/CHANGES.md
+++ b/actix-multipart/CHANGES.md
@@ -10,10 +10,8 @@
 * Added `Field::name` method for getting the field name. [#2451]
 * `MultipartError` now marks variants with inner errors as the source. [#2451]
 * `MultipartError` is now marked as non-exhaustive. [#2451]
-* Polling `Field` after dropping `Multipart` now fails immediately instead of hanging forever. [#2463]

 [#2451]: https://github.com/actix/actix-web/pull/2451
-[#2463]: https://github.com/actix/actix-web/pull/2463


 ## 0.4.0-beta.7 - 2021-10-20
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@@ -28,7 +28,7 @@ twoway = "0.2"

 [dev-dependencies]
 actix-rt = "2.2"
-actix-http = "3.0.0-beta.14"
+actix-http = "3.0.0-beta.13"
 futures-util = { version = "0.3.7", default-features = false, features = ["alloc"] }
 tokio = { version = "1", features = ["sync"] }
 tokio-stream = "0.1"
--- a/actix-multipart/src/server.rs
+++ b/actix-multipart/src/server.rs
@@ -706,11 +706,8 @@ impl Clone for PayloadRef {
    }
 }

-/// Counter. It tracks of number of clones of payloads and give access to payload only to top most.
-/// * When dropped, parent task is awakened. This is to support the case where Field is
-/// dropped in a separate task than Multipart.
-/// * Assumes that parent owners don't move to different tasks; only the top-most is allowed to.
-/// * If dropped and is not top most owner, is_clean flag is set to false.
+/// Counter. It tracks of number of clones of payloads and give access to payload only to top most
+/// task panics if Safety get destroyed and it not top most task.
 #[derive(Debug)]
 struct Safety {
    task: LocalWaker,
@@ -753,9 +750,9 @@ impl Safety {

 impl Drop for Safety {
    fn drop(&mut self) {
+        // parent task is dead
        if Rc::strong_count(&self.payload) != self.level {
-            // Multipart dropped leaving a Field
-            self.clean.set(false);
+            self.clean.set(true);
        }

        self.task.wake();
@@ -856,12 +853,10 @@ mod tests {

    use actix_http::h1::Payload;
    use actix_web::http::header::{DispositionParam, DispositionType};
-    use actix_web::rt;
    use actix_web::test::TestRequest;
    use actix_web::FromRequest;
    use bytes::Bytes;
    use futures_util::{future::lazy, StreamExt};
-    use std::time::Duration;
    use tokio::sync::mpsc;
    use tokio_stream::wrappers::UnboundedReceiverStream;

@@ -1291,44 +1286,4 @@ mod tests {
            MultipartError::NoContentDisposition,
        ));
    }
-
-    #[actix_rt::test]
-    async fn test_drop_multipart_dont_hang() {
-        let (sender, payload) = create_stream();
-        let (bytes, headers) = create_simple_request_with_header();
-        sender.send(Ok(bytes)).unwrap();
-        drop(sender); // eof
-
-        let mut multipart = Multipart::new(&headers, payload);
-        let mut field = multipart.next().await.unwrap().unwrap();
-
-        drop(multipart);
-
-        // should fail immediately
-        match field.next().await {
-            Some(Err(MultipartError::NotConsumed)) => {}
-            _ => panic!(),
-        };
-    }
-
-    #[actix_rt::test]
-    async fn test_drop_field_awaken_multipart() {
-        let (sender, payload) = create_stream();
-        let (bytes, headers) = create_simple_request_with_header();
-        sender.send(Ok(bytes)).unwrap();
-        drop(sender); // eof
-
-        let mut multipart = Multipart::new(&headers, payload);
-        let mut field = multipart.next().await.unwrap().unwrap();
-
-        let task = rt::spawn(async move {
-            rt::time::sleep(Duration::from_secs(1)).await;
-            assert_eq!(field.next().await.unwrap().unwrap(), "test");
-            drop(field);
-        });
-
-        // dropping field should awaken current task
-        let _ = multipart.next().await.unwrap().unwrap();
-        task.await.unwrap();
-    }
 }
--- a/actix-test/Cargo.toml
+++ b/actix-test/Cargo.toml
@@ -29,7 +29,7 @@ openssl = ["tls-openssl", "actix-http/openssl", "awc/openssl"]

 [dependencies]
 actix-codec = "0.4.1"
-actix-http = "3.0.0-beta.14"
+actix-http = "3.0.0-beta.13"
 actix-http-test = "3.0.0-beta.7"
 actix-service = "2.0.0"
 actix-utils = "3.0.0"
--- a/actix-web-actors/Cargo.toml
+++ b/actix-web-actors/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/lib.rs"
 [dependencies]
 actix = { version = "0.12.0", default-features = false }
 actix-codec = "0.4.1"
-actix-http = "3.0.0-beta.14"
+actix-http = "3.0.0-beta.13"
 actix-web = { version = "4.0.0-beta.11", default-features = false }

 bytes = "1"
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -3,12 +3,6 @@
 ## Unreleased - 2021-xx-xx


-## 3.0.0-beta.12 - 2021-11-30
-* Update `actix-tls` to `3.0.0-rc.1`. [#2474]
-
-[#2474]: https://github.com/actix/actix-web/pull/2474
-
-
 ## 3.0.0-beta.11 - 2021-11-22
 * No significant changes from `3.0.0-beta.10`.

--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "awc"
-version = "3.0.0-beta.12"
+version = "3.0.0-beta.11"
 authors = [
    "Nikolay Kim <fafhrd91@gmail.com>",
    "fakeshadow <24548779@qq.com>",
@@ -60,9 +60,9 @@ dangerous-h2c = []
 [dependencies]
 actix-codec = "0.4.1"
 actix-service = "2.0.0"
-actix-http = "3.0.0-beta.14"
+actix-http = "3.0.0-beta.13"
 actix-rt = { version = "2.1", default-features = false }
-actix-tls = { version = "3.0.0-rc.1", features = ["connect", "uri"] }
+actix-tls = { version = "3.0.0-beta.9", features = ["connect"] }
 actix-utils = "3.0.0"

 ahash = "0.7"
@@ -94,11 +94,11 @@ trust-dns-resolver = { version = "0.20.0", optional = true }

 [dev-dependencies]
 actix-web = { version = "4.0.0-beta.11", features = ["openssl"] }
-actix-http = { version = "3.0.0-beta.14", features = ["openssl"] }
+actix-http = { version = "3.0.0-beta.13", features = ["openssl"] }
 actix-http-test = { version = "3.0.0-beta.7", features = ["openssl"] }
 actix-utils = "3.0.0"
 actix-server = "2.0.0-beta.9"
-actix-tls = { version = "3.0.0-rc.1", features = ["openssl", "rustls"] }
+actix-tls = { version = "3.0.0-beta.9", features = ["openssl", "rustls"] }
 actix-test = { version = "0.1.0-beta.7", features = ["openssl", "rustls"] }

 brotli2 = "0.3.2"
--- a/awc/README.md
+++ b/awc/README.md
@@ -3,9 +3,9 @@
 > Async HTTP and WebSocket client library.

 [![crates.io](https://img.shields.io/crates/v/awc?label=latest)](https://crates.io/crates/awc)
-[![Documentation](https://docs.rs/awc/badge.svg?version=3.0.0-beta.12)](https://docs.rs/awc/3.0.0-beta.12)
+[![Documentation](https://docs.rs/awc/badge.svg?version=3.0.0-beta.11)](https://docs.rs/awc/3.0.0-beta.11)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/awc)
-[![Dependency Status](https://deps.rs/crate/awc/3.0.0-beta.12/status.svg)](https://deps.rs/crate/awc/3.0.0-beta.12)
+[![Dependency Status](https://deps.rs/crate/awc/3.0.0-beta.11/status.svg)](https://deps.rs/crate/awc/3.0.0-beta.11)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)

 ## Documentation & Resources
--- a/awc/src/builder.rs
+++ b/awc/src/builder.rs
@@ -5,7 +5,7 @@ use actix_rt::net::{ActixStream, TcpStream};
 use actix_service::{boxed, Service};

 use crate::{
-    client::{ConnectInfo, Connector, ConnectorService, TcpConnectError, TcpConnection},
+    client::{Connector, ConnectorService, TcpConnect, TcpConnectError, TcpConnection},
    connect::DefaultConnector,
    error::SendRequestError,
    middleware::{NestTransform, Redirect, Transform},
@@ -33,7 +33,7 @@ impl ClientBuilder {
    #[allow(clippy::new_ret_no_self)]
    pub fn new() -> ClientBuilder<
        impl Service<
-                ConnectInfo<Uri>,
+                TcpConnect<Uri>,
                Response = TcpConnection<Uri, TcpStream>,
                Error = TcpConnectError,
            > + Clone,
@@ -56,7 +56,7 @@ impl ClientBuilder {

 impl<S, Io, M> ClientBuilder<S, M>
 where
-    S: Service<ConnectInfo<Uri>, Response = TcpConnection<Uri, Io>, Error = TcpConnectError>
+    S: Service<TcpConnect<Uri>, Response = TcpConnection<Uri, Io>, Error = TcpConnectError>
        + Clone
        + 'static,
    Io: ActixStream + fmt::Debug + 'static,
@@ -65,7 +65,7 @@ where
    pub fn connector<S1, Io1>(self, connector: Connector<S1>) -> ClientBuilder<S1, M>
    where
        S1: Service<
-                ConnectInfo<Uri>,
+                TcpConnect<Uri>,
                Response = TcpConnection<Uri, Io1>,
                Error = TcpConnectError,
            > + Clone
--- a/awc/src/client/connector.rs
+++ b/awc/src/client/connector.rs
@@ -15,8 +15,8 @@ use actix_rt::{
 };
 use actix_service::Service;
 use actix_tls::connect::{
-    ConnectError as TcpConnectError, ConnectInfo, Connection as TcpConnection,
-    Connector as TcpConnector, Resolver,
+    new_connector, Connect as TcpConnect, ConnectError as TcpConnectError,
+    Connection as TcpConnection, Resolver,
 };
 use futures_core::{future::LocalBoxFuture, ready};
 use http::Uri;
@@ -28,15 +28,13 @@ use super::error::ConnectError;
 use super::pool::ConnectionPool;
 use super::Connect;

-enum OurTlsConnector {
-    #[allow(dead_code)] // only dead when no TLS feature is enabled
+enum SslConnector {
+    #[allow(dead_code)]
    None,
-
    #[cfg(feature = "openssl")]
-    Openssl(actix_tls::connect::openssl::reexports::SslConnector),
-
+    Openssl(actix_tls::connect::ssl::openssl::SslConnector),
    #[cfg(feature = "rustls")]
-    Rustls(std::sync::Arc<actix_tls::connect::rustls::reexports::ClientConfig>),
+    Rustls(std::sync::Arc<actix_tls::connect::ssl::rustls::ClientConfig>),
 }

 /// Manages HTTP client network connectivity.
@@ -55,22 +53,21 @@ enum OurTlsConnector {
 pub struct Connector<T> {
    connector: T,
    config: ConnectorConfig,
-
-    #[allow(dead_code)] // only dead when no TLS feature is enabled
-    ssl: OurTlsConnector,
+    #[allow(dead_code)]
+    ssl: SslConnector,
 }

 impl Connector<()> {
    #[allow(clippy::new_ret_no_self, clippy::let_unit_value)]
    pub fn new() -> Connector<
        impl Service<
-                ConnectInfo<Uri>,
+                TcpConnect<Uri>,
                Response = TcpConnection<Uri, TcpStream>,
                Error = actix_tls::connect::ConnectError,
            > + Clone,
    > {
        Connector {
-            connector: TcpConnector::new(resolver::resolver()).service(),
+            connector: new_connector(resolver::resolver()),
            config: ConnectorConfig::default(),
            ssl: Self::build_ssl(vec![b"h2".to_vec(), b"http/1.1".to_vec()]),
        }
@@ -78,16 +75,16 @@ impl Connector<()> {

    /// Provides an empty TLS connector when no TLS feature is enabled.
    #[cfg(not(any(feature = "openssl", feature = "rustls")))]
-    fn build_ssl(_: Vec<Vec<u8>>) -> OurTlsConnector {
-        OurTlsConnector::None
+    fn build_ssl(_: Vec<Vec<u8>>) -> SslConnector {
+        SslConnector::None
    }

    /// Build TLS connector with rustls, based on supplied ALPN protocols
    ///
    /// Note that if both `openssl` and `rustls` features are enabled, rustls will be used.
    #[cfg(feature = "rustls")]
-    fn build_ssl(protocols: Vec<Vec<u8>>) -> OurTlsConnector {
-        use actix_tls::connect::rustls::{reexports::ClientConfig, webpki_roots_cert_store};
+    fn build_ssl(protocols: Vec<Vec<u8>>) -> SslConnector {
+        use actix_tls::connect::tls::rustls::{webpki_roots_cert_store, ClientConfig};

        let mut config = ClientConfig::builder()
            .with_safe_defaults()
@@ -96,13 +93,13 @@ impl Connector<()> {

        config.alpn_protocols = protocols;

-        OurTlsConnector::Rustls(std::sync::Arc::new(config))
+        SslConnector::Rustls(std::sync::Arc::new(config))
    }

    /// Build TLS connector with openssl, based on supplied ALPN protocols
    #[cfg(all(feature = "openssl", not(feature = "rustls")))]
-    fn build_ssl(protocols: Vec<Vec<u8>>) -> OurTlsConnector {
-        use actix_tls::connect::openssl::reexports::{SslConnector, SslMethod};
+    fn build_ssl(protocols: Vec<Vec<u8>>) -> SslConnector {
+        use actix_tls::connect::tls::openssl::{SslConnector as OpensslConnector, SslMethod};
        use bytes::{BufMut, BytesMut};

        let mut alpn = BytesMut::with_capacity(20);
@@ -111,12 +108,12 @@ impl Connector<()> {
            alpn.put(proto.as_slice());
        }

-        let mut ssl = SslConnector::builder(SslMethod::tls()).unwrap();
+        let mut ssl = OpensslConnector::builder(SslMethod::tls()).unwrap();
        if let Err(err) = ssl.set_alpn_protos(&alpn) {
            log::error!("Can not set ALPN protocol: {:?}", err);
        }

-        OurTlsConnector::Openssl(ssl.build())
+        SslConnector::Openssl(ssl.build())
    }
 }

@@ -126,7 +123,7 @@ impl<S> Connector<S> {
    where
        Io1: ActixStream + fmt::Debug + 'static,
        S1: Service<
-                ConnectInfo<Uri>,
+                TcpConnect<Uri>,
                Response = TcpConnection<Uri, Io1>,
                Error = TcpConnectError,
            > + Clone,
@@ -139,7 +136,7 @@ impl<S> Connector<S> {
    }
 }

-impl<S, IO> Connector<S>
+impl<S, Io> Connector<S>
 where
    // Note:
    // Input Io type is bound to ActixStream trait but internally in client module they
@@ -148,8 +145,8 @@ where
    //
    // This remap is to hide ActixStream's trait methods. They are not meant to be called
    // from user code.
-    IO: ActixStream + fmt::Debug + 'static,
-    S: Service<ConnectInfo<Uri>, Response = TcpConnection<Uri, IO>, Error = TcpConnectError>
+    Io: ActixStream + fmt::Debug + 'static,
+    S: Service<TcpConnect<Uri>, Response = TcpConnection<Uri, Io>, Error = TcpConnectError>
        + Clone
        + 'static,
 {
@@ -169,21 +166,18 @@ where

    #[cfg(feature = "openssl")]
    /// Use custom `SslConnector` instance.
-    pub fn ssl(
-        mut self,
-        connector: actix_tls::connect::openssl::reexports::SslConnector,
-    ) -> Self {
-        self.ssl = OurTlsConnector::Openssl(connector);
+    pub fn ssl(mut self, connector: actix_tls::connect::ssl::openssl::SslConnector) -> Self {
+        self.ssl = SslConnector::Openssl(connector);
        self
    }

    #[cfg(feature = "rustls")]
-    /// Use custom `ClientConfig` instance.
+    /// Use custom `SslConnector` instance.
    pub fn rustls(
        mut self,
-        connector: std::sync::Arc<actix_tls::connect::rustls::reexports::ClientConfig>,
+        connector: std::sync::Arc<actix_tls::connect::ssl::rustls::ClientConfig>,
    ) -> Self {
-        self.ssl = OurTlsConnector::Rustls(connector);
+        self.ssl = SslConnector::Rustls(connector);
        self
    }

@@ -272,7 +266,7 @@ where
    /// Finish configuration process and create connector service.
    /// The Connector builder always concludes by calling `finish()` last in
    /// its combinator chain.
-    pub fn finish(self) -> ConnectorService<S, IO> {
+    pub fn finish(self) -> ConnectorService<S, Io> {
        let local_address = self.config.local_address;
        let timeout = self.config.timeout;

@@ -285,18 +279,19 @@ where
        };

        let tls_service = match self.ssl {
-            OurTlsConnector::None => {
+            SslConnector::None => {
                #[cfg(not(feature = "dangerous-h2c"))]
                {
                    None
                }
-
                #[cfg(feature = "dangerous-h2c")]
                {
-                    use std::io;
+                    use std::{
+                        future::{ready, Ready},
+                        io,
+                    };

                    use actix_tls::connect::Connection;
-                    use actix_utils::future::{ready, Ready};

                    impl IntoConnectionIo for TcpConnection<Uri, Box<dyn ConnectionIo>> {
                        fn into_connection_io(self) -> (Box<dyn ConnectionIo>, Protocol) {
@@ -312,17 +307,17 @@ where
                    #[derive(Clone)]
                    struct NoOpTlsConnectorService;

-                    impl<R, IO> Service<Connection<R, IO>> for NoOpTlsConnectorService
+                    impl<T, U> Service<Connection<T, U>> for NoOpTlsConnectorService
                    where
-                        IO: ActixStream + 'static,
+                        U: ActixStream + 'static,
                    {
-                        type Response = Connection<R, Box<dyn ConnectionIo>>;
+                        type Response = Connection<T, Box<dyn ConnectionIo>>;
                        type Error = io::Error;
                        type Future = Ready<Result<Self::Response, Self::Error>>;

                        actix_service::always_ready!();

-                        fn call(&self, connection: Connection<R, IO>) -> Self::Future {
+                        fn call(&self, connection: Connection<T, U>) -> Self::Future {
                            let (io, connection) = connection.replace_io(());
                            let (_, connection) = connection.replace_io(Box::new(io) as _);

@@ -341,14 +336,13 @@ where
                    Some(actix_service::boxed::rc_service(tls_service))
                }
            }
-
            #[cfg(feature = "openssl")]
-            OurTlsConnector::Openssl(tls) => {
+            SslConnector::Openssl(tls) => {
                const H2: &[u8] = b"h2";

-                use actix_tls::connect::openssl::{reexports::AsyncSslStream, TlsConnector};
+                use actix_tls::connect::ssl::openssl::{OpensslConnector, SslStream};

-                impl<IO: ConnectionIo> IntoConnectionIo for TcpConnection<Uri, AsyncSslStream<IO>> {
+                impl<Io: ConnectionIo> IntoConnectionIo for TcpConnection<Uri, SslStream<Io>> {
                    fn into_connection_io(self) -> (Box<dyn ConnectionIo>, Protocol) {
                        let sock = self.into_parts().0;
                        let h2 = sock
@@ -367,20 +361,19 @@ where

                let tls_service = TlsConnectorService {
                    tcp_service: tcp_service_inner,
-                    tls_service: TlsConnector::service(tls),
+                    tls_service: OpensslConnector::service(tls),
                    timeout: handshake_timeout,
                };

                Some(actix_service::boxed::rc_service(tls_service))
            }
-
            #[cfg(feature = "rustls")]
-            OurTlsConnector::Rustls(tls) => {
+            SslConnector::Rustls(tls) => {
                const H2: &[u8] = b"h2";

-                use actix_tls::connect::rustls::{reexports::AsyncTlsStream, TlsConnector};
+                use actix_tls::connect::ssl::rustls::{RustlsConnector, TlsStream};

-                impl<Io: ConnectionIo> IntoConnectionIo for TcpConnection<Uri, AsyncTlsStream<Io>> {
+                impl<Io: ConnectionIo> IntoConnectionIo for TcpConnection<Uri, TlsStream<Io>> {
                    fn into_connection_io(self) -> (Box<dyn ConnectionIo>, Protocol) {
                        let sock = self.into_parts().0;
                        let h2 = sock
@@ -400,7 +393,7 @@ where

                let tls_service = TlsConnectorService {
                    tcp_service: tcp_service_inner,
-                    tls_service: TlsConnector::service(tls),
+                    tls_service: RustlsConnector::service(tls),
                    timeout: handshake_timeout,
                };

@@ -469,28 +462,26 @@ where

 /// service for establish tcp connection and do client tls handshake.
 /// operation is canceled when timeout limit reached.
-struct TlsConnectorService<Tcp, Tls> {
-    /// TCP connection is canceled on `TcpConnectorInnerService`'s timeout setting.
-    tcp_service: Tcp,
-
-    /// TLS connection is canceled on `TlsConnectorService`'s timeout setting.
-    tls_service: Tls,
-
+struct TlsConnectorService<S, St> {
+    /// tcp connection is canceled on `TcpConnectorInnerService`'s timeout setting.
+    tcp_service: S,
+    /// tls connection is canceled on `TlsConnectorService`'s timeout setting.
+    tls_service: St,
    timeout: Duration,
 }

-impl<Tcp, Tls, IO> Service<Connect> for TlsConnectorService<Tcp, Tls>
+impl<S, St, Io> Service<Connect> for TlsConnectorService<S, St>
 where
-    Tcp: Service<Connect, Response = TcpConnection<Uri, IO>, Error = ConnectError>
+    S: Service<Connect, Response = TcpConnection<Uri, Io>, Error = ConnectError>
        + Clone
        + 'static,
-    Tls: Service<TcpConnection<Uri, IO>, Error = std::io::Error> + Clone + 'static,
-    Tls::Response: IntoConnectionIo,
-    IO: ConnectionIo,
+    St: Service<TcpConnection<Uri, Io>, Error = std::io::Error> + Clone + 'static,
+    Io: ConnectionIo,
+    St::Response: IntoConnectionIo,
 {
    type Response = (Box<dyn ConnectionIo>, Protocol);
    type Error = ConnectError;
-    type Future = TlsConnectorFuture<Tls, Tcp::Future, Tls::Future>;
+    type Future = TlsConnectorFuture<St, S::Future, St::Future>;

    fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
        ready!(self.tcp_service.poll_ready(cx))?;
@@ -590,7 +581,7 @@ impl<S: Clone> TcpConnectorInnerService<S> {

 impl<S, Io> Service<Connect> for TcpConnectorInnerService<S>
 where
-    S: Service<ConnectInfo<Uri>, Response = TcpConnection<Uri, Io>, Error = TcpConnectError>
+    S: Service<TcpConnect<Uri>, Response = TcpConnection<Uri, Io>, Error = TcpConnectError>
        + Clone
        + 'static,
 {
@@ -601,7 +592,7 @@ where
    actix_service::forward_ready!(service);

    fn call(&self, req: Connect) -> Self::Future {
-        let mut req = ConnectInfo::new(req.uri).set_addr(req.addr);
+        let mut req = TcpConnect::new(req.uri).set_addr(req.addr);

        if let Some(local_addr) = self.local_address {
            req = req.set_local_addr(local_addr);
@@ -640,8 +631,8 @@ where
 }

 /// Connector service for pooled Plain/Tls Tcp connections.
-pub type ConnectorService<Svc, IO> = ConnectorServicePriv<
-    TcpConnectorService<TcpConnectorInnerService<Svc>>,
+pub type ConnectorService<S, Io> = ConnectorServicePriv<
+    TcpConnectorService<TcpConnectorInnerService<S>>,
    Rc<
        dyn Service<
            Connect,
@@ -653,7 +644,7 @@ pub type ConnectorService<Svc, IO> = ConnectorServicePriv<
            >,
        >,
    >,
-    IO,
+    Io,
    Box<dyn ConnectionIo>,
 >;

@@ -752,7 +743,7 @@ mod resolver {
    use super::*;

    pub(super) fn resolver() -> Resolver {
-        Resolver::default()
+        Resolver::Default
    }
 }

@@ -794,7 +785,8 @@ mod resolver {
            }
        }

-        // resolver struct is cached in thread local so new clients can reuse the existing instance
+        // dns struct is cached in thread local.
+        // so new client constructor can reuse the existing dns resolver.
        thread_local! {
            static TRUST_DNS_RESOLVER: RefCell<Option<Resolver>> = RefCell::new(None);
        }
@@ -802,10 +794,8 @@ mod resolver {
        // get from thread local or construct a new trust-dns resolver.
        TRUST_DNS_RESOLVER.with(|local| {
            let resolver = local.borrow().as_ref().map(Clone::clone);
-
            match resolver {
                Some(resolver) => resolver,
-
                None => {
                    let (cfg, opts) = match read_system_conf() {
                        Ok((cfg, opts)) => (cfg, opts),
@@ -818,9 +808,8 @@ mod resolver {
                    let resolver = TokioAsyncResolver::tokio(cfg, opts).unwrap();

                    // box trust dns resolver and put it in thread local.
-                    let resolver = Resolver::custom(TrustDnsResolver(resolver));
+                    let resolver = Resolver::new_custom(TrustDnsResolver(resolver));
                    *local.borrow_mut() = Some(resolver.clone());
-
                    resolver
                }
            }
@@ -851,9 +840,9 @@ mod tests {
        .await;

        let connector = Connector {
-            connector: TcpConnector::new(resolver::resolver()).service(),
+            connector: new_connector(resolver::resolver()),
            config: ConnectorConfig::default(),
-            ssl: OurTlsConnector::None,
+            ssl: SslConnector::None,
        };

        let client = Client::builder().connector(connector).finish();
--- a/awc/src/client/error.rs
+++ b/awc/src/client/error.rs
@@ -7,7 +7,7 @@ use actix_http::{
    http::Error as HttpError,
 };
 #[cfg(feature = "openssl")]
-use actix_tls::accept::openssl::reexports::Error as OpenSslError;
+use actix_tls::accept::openssl::SslError;

 /// A set of errors that can occur while connecting to an HTTP host
 #[derive(Debug, Display, From)]
@@ -20,7 +20,7 @@ pub enum ConnectError {
    /// SSL error
    #[cfg(feature = "openssl")]
    #[display(fmt = "{}", _0)]
-    SslError(OpenSslError),
+    SslError(SslError),

    /// Failed to resolve the hostname
    #[display(fmt = "Failed resolving hostname: {}", _0)]
--- a/awc/src/client/mod.rs
+++ b/awc/src/client/mod.rs
@@ -11,7 +11,7 @@ mod h2proto;
 mod pool;

 pub use actix_tls::connect::{
-    ConnectError as TcpConnectError, ConnectInfo, Connection as TcpConnection,
+    Connect as TcpConnect, ConnectError as TcpConnectError, Connection as TcpConnection,
 };

 pub use self::connection::{Connection, ConnectionIo};
--- a/awc/src/lib.rs
+++ b/awc/src/lib.rs
@@ -137,7 +137,7 @@ use actix_http::{
 use actix_rt::net::TcpStream;
 use actix_service::Service;

-use self::client::{ConnectInfo, TcpConnectError, TcpConnection};
+use self::client::{TcpConnect, TcpConnectError, TcpConnection};

 /// An asynchronous HTTP and WebSocket client.
 ///
@@ -186,7 +186,7 @@ impl Client {
    /// This function is equivalent of `ClientBuilder::new()`.
    pub fn builder() -> ClientBuilder<
        impl Service<
-                ConnectInfo<Uri>,
+                TcpConnect<Uri>,
                Response = TcpConnection<Uri, TcpStream>,
                Error = TcpConnectError,
            > + Clone,
--- a/awc/tests/test_client.rs
+++ b/awc/tests/test_client.rs
@@ -127,7 +127,7 @@ async fn test_timeout() {
    });

    let connector = awc::Connector::new()
-        .connector(actix_tls::connect::ConnectorService::default())
+        .connector(actix_tls::connect::default_connector())
        .timeout(Duration::from_secs(15));

    let client = awc::Client::builder()
--- a/awc/tests/test_rustls_client.rs
+++ b/awc/tests/test_rustls_client.rs
@@ -14,7 +14,7 @@ use std::{
 use actix_http::HttpService;
 use actix_http_test::test_server;
 use actix_service::{fn_service, map_config, ServiceFactoryExt};
-use actix_tls::connect::rustls::webpki_roots_cert_store;
+use actix_tls::connect::tls::rustls::webpki_roots_cert_store;
 use actix_utils::future::ok;
 use actix_web::{dev::AppConfig, http::Version, web, App, HttpResponse};
 use rustls::{
--- a/scripts/bump
+++ b/scripts/bump
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# developed on macOS and probably doesn't work on Linux yet due to minor
-# differences in flags on sed
-
-# requires github cli tool for automatic release draft creation
-
-set -euo pipefail
-
-DIR=$1
-
-LINUX=""
-MACOS=""
-
-if [ "$(uname)" = "Darwin" ]; then
-    MACOS="1"
-fi
-
-CARGO_MANIFEST=$DIR/Cargo.toml
-CHANGELOG_FILE=$DIR/CHANGES.md
-README_FILE=$DIR/README.md
-
-# get current version
-PACKAGE_NAME="$(sed -nE 's/^name ?= ?"([^"]+)"$/\1/ p' "$CARGO_MANIFEST" | head -n 1)"
-CURRENT_VERSION="$(sed -nE 's/^version ?= ?"([^"]+)"$/\1/ p' "$CARGO_MANIFEST")"
-
-CHANGE_CHUNK_FILE="$(mktemp)"
-echo saving changelog to $CHANGE_CHUNK_FILE
-echo
-
-# get changelog chunk and save to temp file
-cat "$CHANGELOG_FILE" |
-    # skip up to unreleased heading
-    sed '1,/Unreleased/ d' |
-    # take up to previous version heading
-    sed "/$CURRENT_VERSION/ q" |
-    # drop last line
-    sed '$d' \
-        >"$CHANGE_CHUNK_FILE"
-
-# if word count of changelog chunk is 0 then insert filler changelog chunk
-if [ "$(wc -w "$CHANGE_CHUNK_FILE" | awk '{ print $1 }')" = "0" ]; then
-    echo "* No significant changes since \`$CURRENT_VERSION\`." >"$CHANGE_CHUNK_FILE"
-fi
-
-if [ -n "${2-}" ]; then
-    NEW_VERSION="$2"
-else
-    echo
-    echo "--- Changes since $CURRENT_VERSION ----"
-    cat "$CHANGE_CHUNK_FILE"
-    echo
-    read -p "Update version to: " NEW_VERSION
-fi
-
-DATE="$(date -u +"%Y-%m-%d")"
-echo "updating from $CURRENT_VERSION => $NEW_VERSION ($DATE)"
-
-# update package.version field
-sed -i.bak -E "s/^version ?= ?\"[^\"]+\"$/version = \"$NEW_VERSION\"/" "$CARGO_MANIFEST"
-
-# update readme
-[ -f "$README_FILE" ] && sed -i.bak -E "s#$CURRENT_VERSION([/)])#$NEW_VERSION\1#g" "$README_FILE"
-
-# update changelog file
-(
-    sed '/Unreleased/ q' "$CHANGELOG_FILE"                   # up to unreleased heading
-    echo                                                     # blank line
-    echo                                                     # blank line
-    echo "## $NEW_VERSION - $DATE"                           # new version heading
-    cat "$CHANGE_CHUNK_FILE"                                 # previously unreleased changes
-    sed "/$CURRENT_VERSION/ q" "$CHANGELOG_FILE" | tail -n 1 # the previous version heading
-    sed "1,/$CURRENT_VERSION/ d" "$CHANGELOG_FILE"           # everything after previous version heading
-) >"$CHANGELOG_FILE.bak"
-mv "$CHANGELOG_FILE.bak" "$CHANGELOG_FILE"
-
-# done; remove backup files
-rm -f $CARGO_MANIFEST.bak
-rm -f $CHANGELOG_FILE.bak
-rm -f $README_FILE.bak
-
-echo "manifest, changelog, and readme updated"
-echo
-echo "check other references:"
-rg "$PACKAGE_NAME =" || true
-rg "package = \"$PACKAGE_NAME\"" || true
-
-if [ $MACOS ]; then
-    printf "prepare $PACKAGE_NAME release $NEW_VERSION" | pbcopy
-else
-    echo
-    echo "commit message:"
-    echo "prepare $PACKAGE_NAME release $NEW_VERSION"
-fi
-
-SHORT_PACKAGE_NAME="$(echo $PACKAGE_NAME | sed 's/^actix-web-//' | sed 's/^actix-//')"
-GIT_TAG="$(echo $SHORT_PACKAGE_NAME-v$NEW_VERSION)"
-RELEASE_TITLE="$(echo $PACKAGE_NAME: v$NEW_VERSION)"
-
-echo
-echo "GitHub release command:"
-echo "gh release create \"$GIT_TAG\" --draft --title \"$RELEASE_TITLE\" --notes-file \"$CHANGE_CHUNK_FILE\" --prerelease"
-
-read -p "Submit draft GH release: (y/N) " GH_RELEASE
-GH_RELEASE="${GH_RELEASE:-n}"
-
-if [ "$GH_RELEASE" = 'y' ] || [ "$GH_RELEASE" = 'Y' ]; then
-    gh release create "$GIT_TAG" --draft --title "$RELEASE_TITLE" --notes-file "$CHANGE_CHUNK_FILE" --prerelease
-fi
-
-echo
--- a/scripts/ci-test.sh
+++ b/scripts/ci-test.sh
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# run tests matching what CI does for non-linux feature sets
-
-set -x
-
-cargo test --lib --tests -p=actix-router --all-features
-cargo test --lib --tests -p=actix-http --all-features
-cargo test --lib --tests -p=actix-web --features=rustls,openssl -- --skip=test_reading_deflate_encoding_large_random_rustls
-cargo test --lib --tests -p=actix-web-codegen --all-features
-cargo test --lib --tests -p=awc --all-features
-cargo test --lib --tests -p=actix-http-test --all-features
-cargo test --lib --tests -p=actix-test --all-features
-cargo test --lib --tests -p=actix-files
-cargo test --lib --tests -p=actix-multipart --all-features
-cargo test --lib --tests -p=actix-web-actors --all-features
--- a/src/error/response_error.rs
+++ b/src/error/response_error.rs
@@ -49,7 +49,7 @@ downcast_dyn!(ResponseError);
 impl ResponseError for Box<dyn StdError + 'static> {}

 #[cfg(feature = "openssl")]
-impl ResponseError for actix_tls::accept::openssl::reexports::Error {}
+impl ResponseError for actix_tls::accept::openssl::SslError {}

 impl ResponseError for serde::de::value::Error {
    fn status_code(&self) -> StatusCode {
--- a/src/extract.rs
+++ b/src/extract.rs
@@ -10,7 +10,6 @@ use std::{
 use actix_http::http::{Method, Uri};
 use actix_utils::future::{ok, Ready};
 use futures_core::ready;
-use pin_project_lite::pin_project;

 use crate::{dev::Payload, Error, HttpRequest};

@@ -140,11 +139,10 @@ where
    }
 }

-pin_project! {
-    pub struct FromRequestOptFuture<Fut> {
-        #[pin]
-        fut: Fut,
-    }
+#[pin_project::pin_project]
+pub struct FromRequestOptFuture<Fut> {
+    #[pin]
+    fut: Fut,
 }

 impl<Fut, T, E> Future for FromRequestOptFuture<Fut>
@@ -228,11 +226,10 @@ where
    }
 }

-pin_project! {
-    pub struct FromRequestResFuture<Fut> {
-        #[pin]
-        fut: Fut,
-    }
+#[pin_project::pin_project]
+pub struct FromRequestResFuture<Fut> {
+    #[pin]
+    fut: Fut,
 }

 impl<Fut, T, E> Future for FromRequestResFuture<Fut>
@@ -300,104 +297,102 @@ impl FromRequest for () {
    }
 }

-#[doc(hidden)]
-#[allow(non_snake_case)]
-mod tuple_from_req {
-    use super::*;
+macro_rules! tuple_from_req ({$fut_type:ident, $(($n:tt, $T:ident)),+} => {

-    macro_rules! tuple_from_req {
-        ($fut: ident; $($T: ident),*) => {
-            /// FromRequest implementation for tuple
-            #[allow(unused_parens)]
-            impl<$($T: FromRequest + 'static),+> FromRequest for ($($T,)+)
-            {
-                type Error = Error;
-                type Future = $fut<$($T),+>;
+    // This module is a trick to get around the inability of
+    // `macro_rules!` macros to make new idents. We want to make
+    // a new `FutWrapper` struct for each distinct invocation of
+    // this macro. Ideally, we would name it something like
+    // `FutWrapper_$fut_type`, but this can't be done in a macro_rules
+    // macro.
+    //
+    // Instead, we put everything in a module named `$fut_type`, thus allowing
+    // us to use the name `FutWrapper` without worrying about conflicts.
+    // This macro only exists to generate trait impls for tuples - these
+    // are inherently global, so users don't have to care about this
+    // weird trick.
+    #[allow(non_snake_case)]
+    mod $fut_type {

-                fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
-                    $fut {
-                        $(
-                            $T: ExtractFuture::Future {
-                                fut: $T::from_request(req, payload)
-                            },
-                        )+
-                    }
+        // Bring everything into scope, so we don't need
+        // redundant imports
+        use super::*;
+
+        /// A helper struct to allow us to pin-project through
+        /// to individual fields
+        #[pin_project::pin_project]
+        struct FutWrapper<$($T: FromRequest),+>($(#[pin] $T::Future),+);
+
+        /// FromRequest implementation for tuple
+        #[doc(hidden)]
+        #[allow(unused_parens)]
+        impl<$($T: FromRequest + 'static),+> FromRequest for ($($T,)+)
+        {
+            type Error = Error;
+            type Future = $fut_type<$($T),+>;
+
+            fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
+                $fut_type {
+                    items: <($(Option<$T>,)+)>::default(),
+                    futs: FutWrapper($($T::from_request(req, payload),)+),
                }
            }
+        }

-            pin_project! {
-                pub struct $fut<$($T: FromRequest),+> {
-                    $(
-                        #[pin]
-                        $T: ExtractFuture<$T::Future, $T>,
-                    )+
-                }
-            }
+        #[doc(hidden)]
+        #[pin_project::pin_project]
+        pub struct $fut_type<$($T: FromRequest),+> {
+            items: ($(Option<$T>,)+),
+            #[pin]
+            futs: FutWrapper<$($T,)+>,
+        }

-            impl<$($T: FromRequest),+> Future for $fut<$($T),+>
-            {
-                type Output = Result<($($T,)+), Error>;
+        impl<$($T: FromRequest),+> Future for $fut_type<$($T),+>
+        {
+            type Output = Result<($($T,)+), Error>;

-                fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-                    let mut this = self.project();
+            fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+                let mut this = self.project();

-                    let mut ready = true;
-                    $(
-                        match this.$T.as_mut().project() {
-                            ExtractProj::Future { fut } => match fut.poll(cx) {
-                                Poll::Ready(Ok(output)) => {
-                                    let _ = this.$T.as_mut().project_replace(ExtractFuture::Done { output });
-                                },
-                                Poll::Ready(Err(e)) => return Poll::Ready(Err(e.into())),
-                                Poll::Pending => ready = false,
-                            },
-                            ExtractProj::Done { .. } => {},
-                            ExtractProj::Empty => unreachable!("FromRequest polled after finished"),
+                let mut ready = true;
+                $(
+                    if this.items.$n.is_none() {
+                        match this.futs.as_mut().project().$n.poll(cx) {
+                            Poll::Ready(Ok(item)) => {
+                                this.items.$n = Some(item);
+                            }
+                            Poll::Pending => ready = false,
+                            Poll::Ready(Err(e)) => return Poll::Ready(Err(e.into())),
                        }
-                    )+
-
-                    if ready {
-                        Poll::Ready(Ok(
-                            ($(
-                                match this.$T.project_replace(ExtractFuture::Empty) {
-                                    ExtractReplaceProj::Done { output } => output,
-                                    _ => unreachable!("FromRequest polled after finished"),
-                                },
-                            )+)
-                        ))
-                    } else {
-                        Poll::Pending
                    }
+                )+
+
+                if ready {
+                    Poll::Ready(Ok(
+                        ($(this.items.$n.take().unwrap(),)+)
+                    ))
+                } else {
+                    Poll::Pending
                }
            }
-        };
-    }
-
-    pin_project! {
-        #[project = ExtractProj]
-        #[project_replace = ExtractReplaceProj]
-        enum ExtractFuture<Fut, Res> {
-            Future {
-                #[pin]
-                fut: Fut
-            },
-            Done {
-                output: Res,
-            },
-            Empty
        }
    }
+});

-    tuple_from_req! { TupleFromRequest1; A }
-    tuple_from_req! { TupleFromRequest2; A, B }
-    tuple_from_req! { TupleFromRequest3; A, B, C }
-    tuple_from_req! { TupleFromRequest4; A, B, C, D }
-    tuple_from_req! { TupleFromRequest5; A, B, C, D, E }
-    tuple_from_req! { TupleFromRequest6; A, B, C, D, E, F }
-    tuple_from_req! { TupleFromRequest7; A, B, C, D, E, F, G }
-    tuple_from_req! { TupleFromRequest8; A, B, C, D, E, F, G, H }
-    tuple_from_req! { TupleFromRequest9; A, B, C, D, E, F, G, H, I }
-    tuple_from_req! { TupleFromRequest10; A, B, C, D, E, F, G, H, I, J }
+#[rustfmt::skip]
+mod m {
+    use super::*;
+
+    tuple_from_req!(TupleFromRequest1, (0, A));
+    tuple_from_req!(TupleFromRequest2, (0, A), (1, B));
+    tuple_from_req!(TupleFromRequest3, (0, A), (1, B), (2, C));
+    tuple_from_req!(TupleFromRequest4, (0, A), (1, B), (2, C), (3, D));
+    tuple_from_req!(TupleFromRequest5, (0, A), (1, B), (2, C), (3, D), (4, E));
+    tuple_from_req!(TupleFromRequest6, (0, A), (1, B), (2, C), (3, D), (4, E), (5, F));
+    tuple_from_req!(TupleFromRequest7, (0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G));
+    tuple_from_req!(TupleFromRequest8, (0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G), (7, H));
+    tuple_from_req!(TupleFromRequest9, (0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G), (7, H), (8, I));
+    tuple_from_req!(TupleFromRequest10, (0, A), (1, B), (2, C), (3, D), (4, E), (5, F), (6, G), (7, H), (8, I), (9, J));
 }

 #[cfg(test)]
@@ -499,26 +494,4 @@ mod tests {
        let method = Method::extract(&req).await.unwrap();
        assert_eq!(method, Method::GET);
    }
-
-    #[actix_rt::test]
-    async fn test_concurrent() {
-        let (req, mut pl) = TestRequest::default()
-            .uri("/foo/bar")
-            .method(Method::GET)
-            .insert_header((header::CONTENT_TYPE, "application/x-www-form-urlencoded"))
-            .insert_header((header::CONTENT_LENGTH, "11"))
-            .set_payload(Bytes::from_static(b"hello=world"))
-            .to_http_parts();
-        let (method, uri, form) = <(Method, Uri, Form<Info>)>::from_request(&req, &mut pl)
-            .await
-            .unwrap();
-        assert_eq!(method, Method::GET);
-        assert_eq!(uri.path(), "/foo/bar");
-        assert_eq!(
-            form,
-            Form(Info {
-                hello: "world".into()
-            })
-        );
-    }
 }
--- a/src/middleware/compat.rs
+++ b/src/middleware/compat.rs
@@ -10,7 +10,6 @@ use std::{
 use actix_http::body::{AnyBody, MessageBody};
 use actix_service::{Service, Transform};
 use futures_core::{future::LocalBoxFuture, ready};
-use pin_project_lite::pin_project;

 use crate::{error::Error, service::ServiceResponse};

@@ -90,11 +89,10 @@ where
    }
 }

-pin_project! {
-    pub struct CompatMiddlewareFuture<Fut> {
-        #[pin]
-        fut: Fut,
-    }
+#[pin_project::pin_project]
+pub struct CompatMiddlewareFuture<Fut> {
+    #[pin]
+    fut: Fut,
 }

 impl<Fut, T, E> Future for CompatMiddlewareFuture<Fut>
--- a/src/middleware/compress.rs
+++ b/src/middleware/compress.rs
@@ -20,7 +20,7 @@ use actix_utils::future::{ok, Either, Ready};
 use bytes::Bytes;
 use futures_core::ready;
 use once_cell::sync::Lazy;
-use pin_project_lite::pin_project;
+use pin_project::pin_project;

 use crate::{
    dev::BodyEncoding,
@@ -162,16 +162,15 @@ where
    }
 }

-pin_project! {
-    pub struct CompressResponse<S, B>
-    where
-        S: Service<ServiceRequest>,
-    {
-        #[pin]
-        fut: S::Future,
-        encoding: ContentEncoding,
-        _phantom: PhantomData<B>,
-    }
+#[pin_project]
+pub struct CompressResponse<S, B>
+where
+    S: Service<ServiceRequest>,
+{
+    #[pin]
+    fut: S::Future,
+    encoding: ContentEncoding,
+    _phantom: PhantomData<B>,
 }

 impl<S, B> Future for CompressResponse<S, B>
--- a/src/middleware/default_headers.rs
+++ b/src/middleware/default_headers.rs
@@ -11,7 +11,6 @@ use std::{

 use actix_utils::future::{ready, Ready};
 use futures_core::ready;
-use pin_project_lite::pin_project;

 use crate::{
    dev::{Service, Transform},
@@ -154,13 +153,12 @@ where
    }
 }

-pin_project! {
-    pub struct DefaultHeaderFuture<S: Service<ServiceRequest>, B> {
-        #[pin]
-        fut: S::Future,
-        inner: Rc<Inner>,
-        _body: PhantomData<B>,
-    }
+#[pin_project::pin_project]
+pub struct DefaultHeaderFuture<S: Service<ServiceRequest>, B> {
+    #[pin]
+    fut: S::Future,
+    inner: Rc<Inner>,
+    _body: PhantomData<B>,
 }

 impl<S, B> Future for DefaultHeaderFuture<S, B>
--- a/src/middleware/err_handlers.rs
+++ b/src/middleware/err_handlers.rs
@@ -10,7 +10,6 @@ use std::{
 use actix_service::{Service, Transform};
 use ahash::AHashMap;
 use futures_core::{future::LocalBoxFuture, ready};
-use pin_project_lite::pin_project;

 use crate::{
    dev::{ServiceRequest, ServiceResponse},
@@ -131,21 +130,19 @@ where
    }
 }

-pin_project! {
-    #[project = ErrorHandlersProj]
-    pub enum ErrorHandlersFuture<Fut, B>
-    where
-        Fut: Future,
-    {
-        ServiceFuture {
-            #[pin]
-            fut: Fut,
-            handlers: Handlers<B>,
-        },
-        HandlerFuture {
-            fut: LocalBoxFuture<'static, Fut::Output>,
-        },
-    }
+#[pin_project::pin_project(project = ErrorHandlersProj)]
+pub enum ErrorHandlersFuture<Fut, B>
+where
+    Fut: Future,
+{
+    ServiceFuture {
+        #[pin]
+        fut: Fut,
+        handlers: Handlers<B>,
+    },
+    HandlerFuture {
+        fut: LocalBoxFuture<'static, Fut::Output>,
+    },
 }

 impl<Fut, B> Future for ErrorHandlersFuture<Fut, B>
--- a/src/middleware/logger.rs
+++ b/src/middleware/logger.rs
@@ -13,11 +13,10 @@ use std::{
 };

 use actix_service::{Service, Transform};
-use actix_utils::future::{ready, Ready};
+use actix_utils::future::{ok, Ready};
 use bytes::Bytes;
 use futures_core::ready;
 use log::{debug, warn};
-use pin_project_lite::pin_project;
 use regex::{Regex, RegexSet};
 use time::{format_description::well_known::Rfc3339, OffsetDateTime};

@@ -181,8 +180,8 @@ where
 {
    type Response = ServiceResponse<StreamLog<B>>;
    type Error = Error;
-    type Transform = LoggerMiddleware<S>;
    type InitError = ();
+    type Transform = LoggerMiddleware<S>;
    type Future = Ready<Result<Self::Transform, Self::InitError>>;

    fn new_transform(&self, service: S) -> Self::Future {
@@ -196,10 +195,10 @@ where
            }
        }

-        ready(Ok(LoggerMiddleware {
+        ok(LoggerMiddleware {
            service,
            inner: self.0.clone(),
-        }))
+        })
    }
 }

@@ -247,18 +246,17 @@ where
    }
 }

-pin_project! {
-    pub struct LoggerResponse<S, B>
-    where
-        B: MessageBody,
-        S: Service<ServiceRequest>,
-    {
-        #[pin]
-        fut: S::Future,
-        time: OffsetDateTime,
-        format: Option<Format>,
-        _phantom: PhantomData<B>,
-    }
+#[pin_project::pin_project]
+pub struct LoggerResponse<S, B>
+where
+    B: MessageBody,
+    S: Service<ServiceRequest>,
+{
+    #[pin]
+    fut: S::Future,
+    time: OffsetDateTime,
+    format: Option<Format>,
+    _phantom: PhantomData<B>,
 }

 impl<S, B> Future for LoggerResponse<S, B>
@@ -298,25 +296,28 @@ where
    }
 }

-pin_project! {
-    pub struct StreamLog<B> {
-        #[pin]
-        body: B,
-        format: Option<Format>,
-        size: usize,
-        time: OffsetDateTime,
-    }
-    impl<B> PinnedDrop for StreamLog<B> {
-        fn drop(this: Pin<&mut Self>) {
-            if let Some(ref format) = this.format {
-                let render = |fmt: &mut fmt::Formatter<'_>| {
-                    for unit in &format.0 {
-                        unit.render(fmt, this.size, this.time)?;
-                    }
-                    Ok(())
-                };
-                log::info!("{}", FormatDisplay(&render));
-            }
+use pin_project::{pin_project, pinned_drop};
+
+#[pin_project(PinnedDrop)]
+pub struct StreamLog<B> {
+    #[pin]
+    body: B,
+    format: Option<Format>,
+    size: usize,
+    time: OffsetDateTime,
+}
+
+#[pinned_drop]
+impl<B> PinnedDrop for StreamLog<B> {
+    fn drop(self: Pin<&mut Self>) {
+        if let Some(ref format) = self.format {
+            let render = |fmt: &mut fmt::Formatter<'_>| {
+                for unit in &format.0 {
+                    unit.render(fmt, self.size, self.time)?;
+                }
+                Ok(())
+            };
+            log::info!("{}", FormatDisplay(&render));
        }
    }
 }
--- a/src/response/response.rs
+++ b/src/response/response.rs
@@ -296,7 +296,7 @@ impl Future for HttpResponse<AnyBody> {

 #[cfg(feature = "cookies")]
 pub struct CookieIter<'a> {
-    iter: header::map::GetAll<'a>,
+    iter: header::GetAll<'a>,
 }

 #[cfg(feature = "cookies")]
--- a/src/server.rs
+++ b/src/server.rs
@@ -15,9 +15,9 @@ use actix_service::{
 };

 #[cfg(feature = "openssl")]
-use actix_tls::accept::openssl::reexports::{AlpnError, SslAcceptor, SslAcceptorBuilder};
+use actix_tls::accept::openssl::{AlpnError, SslAcceptor, SslAcceptorBuilder};
 #[cfg(feature = "rustls")]
-use actix_tls::accept::rustls::reexports::ServerConfig as RustlsServerConfig;
+use actix_tls::accept::rustls::ServerConfig as RustlsServerConfig;

 use crate::{config::AppConfig, Error};

@@ -108,11 +108,11 @@ where
    /// [Extensions] container so that request-local data can be passed to middleware and handlers.
    ///
    /// For example:
-    /// - `actix_tls::accept::openssl::TlsStream<actix_web::rt::net::TcpStream>` when using openssl.
-    /// - `actix_tls::accept::rustls::TlsStream<actix_web::rt::net::TcpStream>` when using rustls.
+    /// - `actix_tls::openssl::SslStream<actix_web::rt::net::TcpStream>` when using openssl.
+    /// - `actix_tls::rustls::TlsStream<actix_web::rt::net::TcpStream>` when using rustls.
    /// - `actix_web::rt::net::TcpStream` when no encryption is used.
    ///
-    /// See the `on_connect` example for additional details.
+    /// See `on_connect` example for additional details.
    pub fn on_connect<CB>(self, f: CB) -> HttpServer<F, I, S, B>
    where
        CB: Fn(&dyn Any, &mut Extensions) + Send + Sync + 'static,
--- a/src/types/either.rs
+++ b/src/types/either.rs
@@ -9,7 +9,6 @@ use std::{

 use bytes::Bytes;
 use futures_core::ready;
-use pin_project_lite::pin_project;

 use crate::{
    dev,
@@ -199,40 +198,37 @@ where
    }
 }

-pin_project! {
-    pub struct EitherExtractFut<L, R>
-    where
-        R: FromRequest,
-        L: FromRequest,
-    {
-        req: HttpRequest,
-        #[pin]
-        state: EitherExtractState<L, R>,
-    }
+#[pin_project::pin_project]
+pub struct EitherExtractFut<L, R>
+where
+    R: FromRequest,
+    L: FromRequest,
+{
+    req: HttpRequest,
+    #[pin]
+    state: EitherExtractState<L, R>,
 }

-pin_project! {
-    #[project = EitherExtractProj]
-    pub enum EitherExtractState<L, R>
-    where
-        L: FromRequest,
-        R: FromRequest,
-    {
-        Bytes {
-            #[pin]
-            bytes: <Bytes as FromRequest>::Future,
-        },
-        Left {
-            #[pin]
-            left: L::Future,
-            fallback: Bytes,
-        },
-        Right {
-            #[pin]
-            right: R::Future,
-            left_err: Option<L::Error>,
-        },
-    }
+#[pin_project::pin_project(project = EitherExtractProj)]
+pub enum EitherExtractState<L, R>
+where
+    L: FromRequest,
+    R: FromRequest,
+{
+    Bytes {
+        #[pin]
+        bytes: <Bytes as FromRequest>::Future,
+    },
+    Left {
+        #[pin]
+        left: L::Future,
+        fallback: Bytes,
+    },
+    Right {
+        #[pin]
+        right: R::Future,
+        left_err: Option<L::Error>,
+    },
 }

 impl<R, RF, RE, L, LF, LE> Future for EitherExtractFut<L, R>
Author	SHA1	Message	Date
Rob Ede	e2a803d278	Merge branch 'master' into get-all-order	2021-11-28 00:20:08 +00:00
Rob Ede	67d2845882	guarantee ordering of header map get_all closes #2466	2021-11-28 00:18:15 +00:00