RubyGems - wreq-rb - Versions diffs - 0.4.0 → 0.5.1 - Mend

wreq-rb 0.4.0 → 0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (150) hide show

checksums.yaml +4 -4
data/Cargo.lock +1922 -397
data/LICENSE +203 -0
data/README.md +47 -16
data/exe/wreq +211 -0
data/ext/wreq_rb/Cargo.toml +4 -6
data/ext/wreq_rb/src/client.rs +145 -41
data/lib/wreq-rb/version.rb +1 -1
data/patches/0001-add-transfer-size-tracking.patch +76 -67
data/vendor/wreq/Cargo.toml +119 -71
data/vendor/wreq/README.md +25 -20
data/vendor/wreq/bench/http1.rs +25 -0
data/vendor/wreq/bench/http1_over_tls.rs +25 -0
data/vendor/wreq/bench/http2.rs +25 -0
data/vendor/wreq/bench/http2_over_tls.rs +25 -0
data/vendor/wreq/bench/support/bench.rs +91 -0
data/vendor/wreq/bench/support/client.rs +217 -0
data/vendor/wreq/bench/support/server.rs +188 -0
data/vendor/wreq/bench/support.rs +56 -0
data/vendor/wreq/examples/cert_store.rs +4 -4
data/vendor/wreq/examples/{emulation.rs → emulate.rs} +2 -2
data/vendor/wreq/examples/http2_websocket.rs +2 -2
data/vendor/wreq/examples/keylog.rs +3 -3
data/vendor/wreq/examples/{request_with_emulation.rs → request_with_emulate.rs} +2 -2
data/vendor/wreq/examples/rt.rs +23 -0
data/vendor/wreq/src/client/body.rs +23 -61
data/vendor/wreq/src/client/emulate.rs +119 -0
data/vendor/wreq/src/client/{http/future.rs → future.rs} +11 -32
data/vendor/wreq/src/client/{http → layer}/client/pool.rs +66 -61
data/vendor/wreq/src/client/{http → layer}/client.rs +416 -270
data/vendor/wreq/src/client/layer/config.rs +27 -6
data/vendor/wreq/src/client/layer/decoder.rs +9 -4
data/vendor/wreq/src/client/layer/redirect/future.rs +6 -3
data/vendor/wreq/src/client/layer/redirect.rs +4 -5
data/vendor/wreq/src/client/layer/retry.rs +8 -5
data/vendor/wreq/src/client/layer/timeout/body.rs +15 -6
data/vendor/wreq/src/client/layer/timeout/future.rs +23 -18
data/vendor/wreq/src/client/layer/timeout.rs +24 -74
data/vendor/wreq/src/client/layer.rs +1 -2
data/vendor/wreq/src/client/multipart.rs +137 -154
data/vendor/wreq/src/client/request.rs +202 -118
data/vendor/wreq/src/client/response.rs +46 -45
data/vendor/wreq/src/client/upgrade.rs +15 -0
data/vendor/wreq/src/client/ws.rs +73 -25
data/vendor/wreq/src/client.rs +1655 -17
data/vendor/wreq/src/config.rs +11 -11
data/vendor/wreq/src/{client/conn → conn}/connector.rs +139 -137
data/vendor/wreq/src/conn/descriptor.rs +143 -0
data/vendor/wreq/src/conn/http.rs +484 -0
data/vendor/wreq/src/conn/net/io.rs +75 -0
data/vendor/wreq/src/conn/net/tcp/compio.rs +71 -0
data/vendor/wreq/src/conn/net/tcp/tokio.rs +57 -0
data/vendor/wreq/src/conn/net/tcp.rs +561 -0
data/vendor/wreq/src/conn/net/uds/compio.rs +60 -0
data/vendor/wreq/src/{client/conn/uds.rs → conn/net/uds/tokio.rs} +18 -12
data/vendor/wreq/src/conn/net/uds.rs +11 -0
data/vendor/wreq/src/conn/net.rs +130 -0
data/vendor/wreq/src/{client/conn → conn}/proxy/socks.rs +2 -9
data/vendor/wreq/src/{client/conn → conn}/proxy/tunnel.rs +21 -56
data/vendor/wreq/src/conn/tls_info.rs +47 -0
data/vendor/wreq/src/{client/conn.rs → conn.rs} +202 -54
data/vendor/wreq/src/cookie.rs +302 -142
data/vendor/wreq/src/dns/gai/compio.rs +77 -0
data/vendor/wreq/src/dns/gai/tokio.rs +90 -0
data/vendor/wreq/src/dns/gai.rs +14 -164
data/vendor/wreq/src/dns/hickory.rs +16 -23
data/vendor/wreq/src/dns/resolve.rs +7 -41
data/vendor/wreq/src/dns.rs +90 -7
data/vendor/wreq/src/error.rs +57 -31
data/vendor/wreq/src/ext.rs +25 -0
data/vendor/wreq/src/group.rs +211 -0
data/vendor/wreq/src/header.rs +100 -112
data/vendor/wreq/src/lib.rs +124 -73
data/vendor/wreq/src/proxy.rs +6 -20
data/vendor/wreq/src/redirect.rs +1 -1
data/vendor/wreq/src/rt.rs +208 -0
data/vendor/wreq/src/sync.rs +97 -98
data/vendor/wreq/src/tls/compress.rs +124 -0
data/vendor/wreq/src/tls/conn/ext.rs +54 -45
data/vendor/wreq/src/tls/conn/service.rs +14 -18
data/vendor/wreq/src/tls/conn.rs +169 -241
data/vendor/wreq/src/tls/keylog.rs +68 -5
data/vendor/wreq/src/tls/session.rs +205 -0
data/vendor/wreq/src/tls/{x509 → trust}/identity.rs +4 -21
data/vendor/wreq/src/tls/{x509/parser.rs → trust/parse.rs} +1 -1
data/vendor/wreq/src/tls/{x509 → trust}/store.rs +42 -81
data/vendor/wreq/src/tls/{x509.rs → trust.rs} +8 -2
data/vendor/wreq/src/tls.rs +489 -25
data/vendor/wreq/src/trace.rs +0 -12
data/vendor/wreq/src/util.rs +1 -1
data/vendor/wreq/tests/badssl.rs +10 -10
data/vendor/wreq/tests/client.rs +3 -9
data/vendor/wreq/tests/cookie.rs +6 -8
data/vendor/wreq/tests/{emulation.rs → emulate.rs} +130 -22
data/vendor/wreq/tests/multipart.rs +43 -1
data/vendor/wreq/tests/proxy.rs +1 -1
data/vendor/wreq/tests/support/layer.rs +1 -0
metadata +53 -72
data/vendor/wreq/src/client/conn/conn.rs +0 -231
data/vendor/wreq/src/client/conn/http.rs +0 -1023
data/vendor/wreq/src/client/conn/tls_info.rs +0 -98
data/vendor/wreq/src/client/core/body/incoming.rs +0 -485
data/vendor/wreq/src/client/core/body/length.rs +0 -118
data/vendor/wreq/src/client/core/body.rs +0 -34
data/vendor/wreq/src/client/core/common/buf.rs +0 -149
data/vendor/wreq/src/client/core/common/rewind.rs +0 -141
data/vendor/wreq/src/client/core/common/watch.rs +0 -76
data/vendor/wreq/src/client/core/common.rs +0 -3
data/vendor/wreq/src/client/core/conn/http1.rs +0 -342
data/vendor/wreq/src/client/core/conn/http2.rs +0 -307
data/vendor/wreq/src/client/core/conn.rs +0 -11
data/vendor/wreq/src/client/core/dispatch.rs +0 -299
data/vendor/wreq/src/client/core/error.rs +0 -435
data/vendor/wreq/src/client/core/ext.rs +0 -201
data/vendor/wreq/src/client/core/http1.rs +0 -178
data/vendor/wreq/src/client/core/http2.rs +0 -483
data/vendor/wreq/src/client/core/proto/h1/conn.rs +0 -988
data/vendor/wreq/src/client/core/proto/h1/decode.rs +0 -1170
data/vendor/wreq/src/client/core/proto/h1/dispatch.rs +0 -684
data/vendor/wreq/src/client/core/proto/h1/encode.rs +0 -580
data/vendor/wreq/src/client/core/proto/h1/io.rs +0 -879
data/vendor/wreq/src/client/core/proto/h1/role.rs +0 -694
data/vendor/wreq/src/client/core/proto/h1.rs +0 -104
data/vendor/wreq/src/client/core/proto/h2/client.rs +0 -650
data/vendor/wreq/src/client/core/proto/h2/ping.rs +0 -539
data/vendor/wreq/src/client/core/proto/h2.rs +0 -379
data/vendor/wreq/src/client/core/proto/headers.rs +0 -138
data/vendor/wreq/src/client/core/proto.rs +0 -58
data/vendor/wreq/src/client/core/rt/bounds.rs +0 -57
data/vendor/wreq/src/client/core/rt/timer.rs +0 -150
data/vendor/wreq/src/client/core/rt/tokio.rs +0 -99
data/vendor/wreq/src/client/core/rt.rs +0 -25
data/vendor/wreq/src/client/core/upgrade.rs +0 -267
data/vendor/wreq/src/client/core.rs +0 -16
data/vendor/wreq/src/client/emulation.rs +0 -161
data/vendor/wreq/src/client/http/client/error.rs +0 -142
data/vendor/wreq/src/client/http/client/exec.rs +0 -29
data/vendor/wreq/src/client/http/client/extra.rs +0 -77
data/vendor/wreq/src/client/http/client/util.rs +0 -104
data/vendor/wreq/src/client/http.rs +0 -1629
data/vendor/wreq/src/client/layer/config/options.rs +0 -156
data/vendor/wreq/src/client/layer/cookie.rs +0 -161
data/vendor/wreq/src/hash.rs +0 -143
data/vendor/wreq/src/tls/conn/cache.rs +0 -123
data/vendor/wreq/src/tls/conn/cert_compression.rs +0 -125
data/vendor/wreq/src/tls/keylog/handle.rs +0 -64
data/vendor/wreq/src/tls/options.rs +0 -464
/data/vendor/wreq/src/client/{http → layer}/client/lazy.rs +0 -0
/data/vendor/wreq/src/{client/conn → conn}/proxy.rs +0 -0
/data/vendor/wreq/src/{client/conn → conn}/verbose.rs +0 -0

data/vendor/wreq/src/client/body.rs CHANGED Viewed

@@ -5,16 +5,14 @@ use std::{
 use bytes::Bytes;
 use http_body::{Body as HttpBody, SizeHint};
-use http_body_util::{BodyExt, Either, combinators::BoxBody};
+use http_body_util::{BodyExt, Either, Full, combinators::BoxBody};
 use pin_project_lite::pin_project;
-#[cfg(feature = "stream")]
-use {tokio::fs::File, tokio_util::io::ReaderStream};
 use crate::error::{BoxError, Error};
 /// An request body.
 #[derive(Debug)]
-pub struct Body(Either<Bytes, BoxBody<Bytes, BoxError>>);
+pub struct Body(Either<Full<Bytes>, BoxBody<Bytes, BoxError>>);
 pin_project! {
     /// We can't use `map_frame()` because that loses the hint data (for good reason).
@@ -28,16 +26,6 @@ pin_project! {
 // ===== impl Body =====
 impl Body {
-    /// Returns a reference to the internal data of the `Body`.
-    ///
-    /// `None` is returned, if the underlying data is a stream.
-    pub fn as_bytes(&self) -> Option<&[u8]> {
-        match &self.0 {
-            Either::Left(bytes) => Some(bytes.as_ref()),
-            Either::Right(..) => None,
-        }
-    }
     /// Wrap a [`HttpBody`] in a box inside `Body`.
     ///
     /// # Example
@@ -120,20 +108,19 @@ impl Body {
     #[inline]
     pub(crate) fn reusable(chunk: Bytes) -> Body {
-        Body(Either::Left(chunk))
+        Body(Either::Left(Full::new(chunk)))
     }
+    #[inline]
     #[cfg(feature = "multipart")]
     pub(crate) fn content_length(&self) -> Option<u64> {
-        match self.0 {
-            Either::Left(ref bytes) => Some(bytes.len() as u64),
-            Either::Right(ref body) => body.size_hint().exact(),
-        }
+        self.0.size_hint().exact()
     }
+    #[inline]
     pub(crate) fn try_clone(&self) -> Option<Body> {
         match self.0 {
-            Either::Left(ref chunk) => Some(Body::reusable(chunk.clone())),
+            Either::Left(ref chunk) => Some(Body(Either::Left(chunk.clone()))),
             Either::Right { .. } => None,
         }
     }
@@ -188,11 +175,11 @@ impl From<&'static str> for Body {
     }
 }
-#[cfg(feature = "stream")]
-impl From<File> for Body {
+#[cfg(all(feature = "tokio-rt", feature = "stream"))]
+impl From<tokio::fs::File> for Body {
     #[inline]
-    fn from(file: File) -> Body {
-        Body::wrap_stream(ReaderStream::new(file))
+    fn from(file: tokio::fs::File) -> Body {
+        Body::wrap_stream(tokio_util::io::ReaderStream::new(file))
     }
 }
@@ -200,44 +187,25 @@ impl HttpBody for Body {
     type Data = Bytes;
     type Error = Error;
+    #[inline(always)]
     fn poll_frame(
         mut self: Pin<&mut Self>,
         cx: &mut Context,
     ) -> Poll<Option<Result<http_body::Frame<Self::Data>, Self::Error>>> {
-        match self.0 {
-            Either::Left(ref mut bytes) => {
-                let out = bytes.split_off(0);
-                if out.is_empty() {
-                    Poll::Ready(None)
-                } else {
-                    Poll::Ready(Some(Ok(http_body::Frame::data(out))))
-                }
-            }
-            Either::Right(ref mut body) => {
-                Poll::Ready(ready!(Pin::new(body).poll_frame(cx)).map(|opt_chunk| {
-                    opt_chunk.map_err(|err| match err.downcast::<Error>() {
-                        Ok(err) => *err,
-                        Err(err) => Error::body(err),
-                    })
-                }))
-            }
-        }
+        Pin::new(&mut self.0).poll_frame(cx).map_err(|err| {
+            err.downcast::<Error>()
+                .map_or_else(Error::request, |err| *err)
+        })
     }
-    #[inline]
+    #[inline(always)]
     fn size_hint(&self) -> SizeHint {
-        match self.0 {
-            Either::Left(ref bytes) => SizeHint::with_exact(bytes.len() as u64),
-            Either::Right(ref body) => body.size_hint(),
-        }
+        self.0.size_hint()
     }
-    #[inline]
+    #[inline(always)]
     fn is_end_stream(&self) -> bool {
-        match self.0 {
-            Either::Left(ref bytes) => bytes.is_empty(),
-            Either::Right(ref body) => body.is_end_stream(),
-        }
+        self.0.is_end_stream()
     }
 }
@@ -251,6 +219,7 @@ where
     type Data = Bytes;
     type Error = B::Error;
+    #[inline(always)]
     fn poll_frame(
         self: Pin<&mut Self>,
         cx: &mut Context,
@@ -262,12 +231,12 @@ where
         }
     }
-    #[inline]
+    #[inline(always)]
     fn size_hint(&self) -> SizeHint {
         self.inner.size_hint()
     }
-    #[inline]
+    #[inline(always)]
     fn is_end_stream(&self) -> bool {
         self.inner.is_end_stream()
     }
@@ -279,13 +248,6 @@ mod tests {
     use super::Body;
-    #[test]
-    fn test_as_bytes() {
-        let test_data = b"Test body";
-        let body = Body::from(&test_data[..]);
-        assert_eq!(body.as_bytes(), Some(&test_data[..]));
-    }
     #[test]
     fn body_exact_length() {
         let empty_body = Body::empty();

data/vendor/wreq/src/client/emulate.rs ADDED Viewed

@@ -0,0 +1,119 @@
+use http::HeaderMap;
+use wreq_proto::{http1::Http1Options, http2::Http2Options};
+use crate::{group::Group, header::OrigHeaderMap, tls::TlsOptions};
+/// Converts a value into an [`Emulation`] configuration.
+///
+/// This trait lets multiple input types provide a unified way to produce
+/// an emulation profile. Typical inputs include:
+/// - Predefined browser profiles
+/// - Transport option sets (e.g. HTTP/1, HTTP/2, TLS)
+/// - User-defined strategy types
+pub trait IntoEmulation {
+    /// Converts `self` into an [`Emulation`] configuration.
+    fn into_emulation(self) -> Emulation;
+}
+/// Builder for creating an [`Emulation`] configuration.
+#[must_use]
+#[derive(Debug)]
+pub struct EmulationBuilder {
+    emulation: Emulation,
+}
+/// HTTP emulation settings for a client profile.
+///
+/// Combines protocol options (HTTP/1, HTTP/2, TLS) and default headers.
+#[non_exhaustive]
+#[derive(Debug, Clone)]
+pub struct Emulation {
+    pub(crate) group: Group,
+    /// Default headers applied to outgoing requests.
+    pub headers: HeaderMap,
+    /// Original headers with preserved case and duplicates.
+    pub orig_headers: OrigHeaderMap,
+    /// TLS configuration.
+    pub tls_options: Option<TlsOptions>,
+    /// HTTP/1 configuration.
+    pub http1_options: Option<Http1Options>,
+    /// HTTP/2 configuration.
+    pub http2_options: Option<Http2Options>,
+}
+// ==== impl EmulationBuilder ====
+impl EmulationBuilder {
+    /// Sets the  HTTP/1 options configuration.
+    #[inline]
+    pub fn http1_options(mut self, opts: Http1Options) -> Self {
+        self.emulation.http1_options = Some(opts);
+        self
+    }
+    /// Sets the HTTP/2 options configuration.
+    #[inline]
+    pub fn http2_options(mut self, opts: Http2Options) -> Self {
+        self.emulation.http2_options = Some(opts);
+        self
+    }
+    /// Sets the  TLS options configuration.
+    #[inline]
+    pub fn tls_options(mut self, opts: TlsOptions) -> Self {
+        self.emulation.tls_options = Some(opts);
+        self
+    }
+    /// Sets the default headers.
+    #[inline]
+    pub fn headers(mut self, src: HeaderMap) -> Self {
+        crate::util::replace_headers(&mut self.emulation.headers, src);
+        self
+    }
+    /// Sets the original headers.
+    #[inline]
+    pub fn orig_headers(mut self, src: OrigHeaderMap) -> Self {
+        self.emulation.orig_headers.extend(src);
+        self
+    }
+    /// Builds the [`Emulation`] instance.
+    #[inline]
+    pub fn build(mut self, group: Group) -> Emulation {
+        self.emulation.group.emulate(group);
+        self.emulation
+    }
+}
+// ==== impl Emulation ====
+impl Emulation {
+    /// Creates a new [`EmulationBuilder`].
+    #[inline]
+    pub fn builder() -> EmulationBuilder {
+        EmulationBuilder {
+            emulation: Emulation {
+                group: Group::default(),
+                headers: HeaderMap::new(),
+                orig_headers: OrigHeaderMap::new(),
+                tls_options: None,
+                http1_options: None,
+                http2_options: None,
+            },
+        }
+    }
+}
+impl<T: Into<Emulation>> IntoEmulation for T {
+    #[inline]
+    fn into_emulation(self) -> Emulation {
+        self.into()
+    }
+}

data/vendor/wreq/src/client/{http/future.rs → future.rs} RENAMED Viewed

@@ -5,12 +5,9 @@ use std::{
 use http::{Request, Uri};
 use pin_project_lite::pin_project;
-use tower::util::Oneshot;
+use tower::util::{Either, Oneshot};
-use super::{Body, ClientRef, Response};
-use crate::{Error, ext::RequestUri};
-type ResponseFuture = Oneshot<ClientRef, Request<Body>>;
+use super::{Body, BoxedClientService, ClientService, Error, Response};
 pin_project! {
     /// [`Pending`] is a future representing the state of an HTTP request, which may be either
@@ -19,8 +16,8 @@ pin_project! {
     #[project = PendingProj]
     pub enum Pending {
         Request {
-            uri: Uri,
-            fut: Pin<Box<ResponseFuture>>,
+            uri: Option<Uri>,
+            fut: Pin<Box<Oneshot<Either<ClientService, BoxedClientService>, Request<Body>>>>,
         },
         Error {
             error: Option<Error>,
@@ -28,23 +25,6 @@ pin_project! {
     }
 }
-impl Pending {
-    /// Creates a new [`Pending`] with a request future and its associated URI.
-    #[inline]
-    pub(crate) fn request(uri: Uri, fut: ResponseFuture) -> Self {
-        Pending::Request {
-            uri,
-            fut: Box::pin(fut),
-        }
-    }
-    /// Creates a new [`Pending`] with an error.
-    #[inline]
-    pub(crate) fn error(error: Error) -> Self {
-        Pending::Error { error: Some(error) }
-    }
-}
 impl Future for Pending {
     type Output = Result<Response, Error>;
@@ -59,19 +39,18 @@ impl Future for Pending {
             }
         };
-        let res = match ready!(res) {
-            Ok(mut res) => {
-                if let Some(redirect_uri) = res.extensions_mut().remove::<RequestUri>() {
-                    *uri = redirect_uri.0;
-                }
-                Ok(Response::new(res, uri.clone()))
-            }
+        let res = ready!(res);
+        let uri = uri
+            .take()
+            .expect("Pending::Request polled after completion");
+        let res = match res {
+            Ok(res) => Ok(Response::new(res, uri)),
             Err(err) => {
                 let mut err = err
                     .downcast::<Error>()
                     .map_or_else(Error::request, |err| *err);
                 if err.uri().is_none() {
-                    err = err.with_uri(uri.clone());
+                    err = err.with_uri(uri);
                 }
                 Err(err)
             }

data/vendor/wreq/src/client/{http → layer}/client/pool.rs RENAMED Viewed

@@ -1,11 +1,11 @@
 use std::{
-    collections::VecDeque,
+    collections::{HashMap, HashSet, VecDeque},
     convert::Infallible,
     error::Error as StdError,
     fmt::{self, Debug},
     future::Future,
     hash::Hash,
-    num::NonZero,
+    num::NonZeroUsize,
     ops::{Deref, DerefMut},
     pin::Pin,
     sync::{Arc, Weak},
@@ -13,13 +13,12 @@ use std::{
     time::{Duration, Instant},
 };
-use schnellru::ByLength;
+use lru::LruCache;
 use tokio::sync::oneshot;
+use wreq_proto::rt::{Executor as _, Timer as _};
-use super::exec::{self, Exec};
 use crate::{
-    client::core::rt::{ArcTimer, Executor, Timer},
-    hash::{HASHER, HashMap, HashSet, LruMap},
+    rt::{Executor, Timer},
     sync::Mutex,
 };
@@ -79,7 +78,7 @@ struct PoolInner<T, K: Eq + Hash> {
     connecting: HashSet<K>,
     // These are internal Conns sitting in the event loop in the KeepAlive
     // state, waiting to receive a new Request to send on the socket.
-    idle: LruMap<K, Vec<Idle<T>>>,
+    idle: LruCache<K, Vec<Idle<T>>>,
     max_idle_per_host: usize,
     // These are outstanding Checkouts that are waiting for a socket to be
     // able to send a Request one. This is used when "racing" for a new
@@ -94,8 +93,8 @@ struct PoolInner<T, K: Eq + Hash> {
     // A oneshot channel is used to allow the interval to be notified when
     // the Pool completely drops. That way, the interval can cancel immediately.
     idle_interval_ref: Option<oneshot::Sender<Infallible>>,
-    exec: Exec,
-    timer: Option<ArcTimer>,
+    exec: Executor,
+    timer: Timer,
     timeout: Option<Duration>,
 }
@@ -107,7 +106,7 @@ struct WeakOpt<T>(Option<Weak<T>>);
 pub struct Config {
     pub idle_timeout: Option<Duration>,
     pub max_idle_per_host: usize,
-    pub max_pool_size: Option<NonZero<u32>>,
+    pub max_pool_size: Option<NonZeroUsize>,
 }
 impl Config {
@@ -117,23 +116,18 @@ impl Config {
 }
 impl<T, K: Key> Pool<T, K> {
-    pub fn new<E, M>(config: Config, executor: E, timer: Option<M>) -> Pool<T, K>
-    where
-        E: Executor<exec::BoxSendFuture> + Send + Sync + Clone + 'static,
-        M: Timer + Send + Sync + Clone + 'static,
-    {
+    pub fn new(config: Config, exec: Executor, timer: Timer) -> Pool<T, K> {
         let inner = if config.is_enabled() {
             Some(Arc::new(Mutex::new(PoolInner {
-                connecting: HashSet::with_hasher(HASHER),
-                idle: LruMap::with_hasher(
-                    ByLength::new(config.max_pool_size.map_or(u32::MAX, NonZero::get)),
-                    HASHER,
-                ),
+                connecting: HashSet::default(),
+                idle: config
+                    .max_pool_size
+                    .map_or_else(LruCache::unbounded, LruCache::new),
                 idle_interval_ref: None,
                 max_idle_per_host: config.max_idle_per_host,
-                waiters: HashMap::with_hasher(HASHER),
-                exec: Exec::new(executor),
-                timer: timer.map(ArcTimer::new),
+                waiters: HashMap::default(),
+                exec,
+                timer,
                 timeout: config.idle_timeout,
             })))
         } else {
@@ -262,7 +256,7 @@ struct IdlePopper<'a, T, K> {
 }
 impl<'a, T: Poolable + 'a, K: Debug> IdlePopper<'a, T, K> {
-    fn pop(self, expiration: &Expiration) -> Option<Idle<T>> {
+    fn pop(self, expiration: &Expiration, now: Instant) -> Option<Idle<T>> {
         while let Some(entry) = self.list.pop() {
             // If the connection has been closed, or is older than our idle
             // timeout, simply drop it and keep looking...
@@ -276,7 +270,7 @@ impl<'a, T: Poolable + 'a, K: Debug> IdlePopper<'a, T, K> {
             //
             // In that case, we could just break out of the loop and drop the
             // whole list...
-            if expiration.expires(entry.idle_at) {
+            if expiration.expires(entry.idle_at, now) {
                 trace!("removing expired connection for {:?}", self.key);
                 continue;
             }
@@ -284,7 +278,7 @@ impl<'a, T: Poolable + 'a, K: Debug> IdlePopper<'a, T, K> {
             let value = match entry.value.reserve() {
                 Reservation::Shared(to_reinsert, to_checkout) => {
                     self.list.push(Idle {
-                        idle_at: Instant::now(),
+                        idle_at: now,
                         value: to_reinsert,
                     });
                     to_checkout
@@ -303,6 +297,10 @@ impl<'a, T: Poolable + 'a, K: Debug> IdlePopper<'a, T, K> {
 }
 impl<T: Poolable, K: Key> PoolInner<T, K> {
+    fn now(&self) -> Instant {
+        self.timer.now()
+    }
     fn put(&mut self, key: &K, value: T, __pool_ref: &Arc<Mutex<PoolInner<T, K>>>) {
         if value.can_share() && self.idle.peek(key).is_some() {
             trace!("put; existing idle HTTP/2 connection for {:?}", key);
@@ -348,22 +346,21 @@ impl<T: Poolable, K: Key> PoolInner<T, K> {
         if let Some(value) = value {
             // borrow-check scope...
             {
+                let now = self.now();
                 let idle_list = self
                     .idle
-                    .get_or_insert(key.clone(), Vec::<Idle<T>>::default);
+                    .get_or_insert_mut(key.clone(), Vec::<Idle<T>>::default);
-                if let Some(idle_list) = idle_list {
-                    if self.max_idle_per_host <= idle_list.len() {
-                        trace!("max idle per host for {:?}, dropping connection", key);
-                        return;
-                    }
-                    debug!("pooling idle connection for {:?}", key);
-                    idle_list.push(Idle {
-                        value,
-                        idle_at: Instant::now(),
-                    });
+                if self.max_idle_per_host <= idle_list.len() {
+                    trace!("max idle per host for {:?}, dropping connection", key);
+                    return;
                 }
+                debug!("pooling idle connection for {:?}", key);
+                idle_list.push(Idle {
+                    value,
+                    idle_at: now,
+                });
             }
             self.spawn_idle_interval(__pool_ref);
@@ -398,11 +395,9 @@ impl<T: Poolable, K: Key> PoolInner<T, K> {
             return;
         }
-        let timer = if let Some(timer) = self.timer.clone() {
-            timer
-        } else {
+        if self.timer.is_empty() {
             return;
-        };
+        }
         // While someone might want a shorter duration, and it will be respected
         // at checkout time, there's no need to wake up and proactively evict
@@ -421,7 +416,7 @@ impl<T: Poolable, K: Key> PoolInner<T, K> {
         self.idle_interval_ref = Some(tx);
         let interval = IdleTask {
-            timer: timer.clone(),
+            timer: self.timer.clone(),
             duration: dur,
             pool: WeakOpt::downgrade(pool_ref),
             pool_drop_notifier: rx,
@@ -452,7 +447,7 @@ impl<T: Poolable, K: Key> PoolInner<T, K> {
     /// This should *only* be called by the IdleTask
     fn clear_expired(&mut self) {
         let dur = self.timeout.expect("interval assumes timeout");
-        let now = Instant::now();
+        let now = self.now();
         let mut keys_to_remove = Vec::new();
         for (key, values) in self.idle.iter_mut() {
@@ -480,7 +475,7 @@ impl<T: Poolable, K: Key> PoolInner<T, K> {
         for key in keys_to_remove {
             trace!("idle interval removing empty key {:?}", key);
-            self.idle.remove(&key);
+            self.idle.pop(&key);
         }
     }
 }
@@ -628,7 +623,8 @@ impl<T: Poolable, K: Key> Checkout<T, K> {
         let entry = {
             let mut inner = self.pool.inner.as_ref()?.lock();
             let expiration = Expiration::new(inner.timeout);
-            let maybe_entry = inner.idle.get(&self.key).and_then(|list| {
+            let now = inner.now();
+            let maybe_entry = inner.idle.get_mut(&self.key).and_then(|list| {
                 trace!("take? {:?}: expiration = {:?}", self.key, expiration.0);
                 // A block to end the mutable borrow on list,
                 // so the map below can check is_empty()
@@ -637,7 +633,7 @@ impl<T: Poolable, K: Key> Checkout<T, K> {
                         key: &self.key,
                         list,
                     };
-                    popper.pop(&expiration)
+                    popper.pop(&expiration, now)
                 }
                 .map(|e| (e, list.is_empty()))
             });
@@ -650,7 +646,7 @@ impl<T: Poolable, K: Key> Checkout<T, K> {
             };
             if empty {
-                inner.idle.remove(&self.key);
+                inner.idle.pop(&self.key);
             }
             if entry.is_none() && self.waiter.is_none() {
@@ -738,17 +734,17 @@ impl Expiration {
         Expiration(dur)
     }
-    fn expires(&self, instant: Instant) -> bool {
+    fn expires(&self, instant: Instant, now: Instant) -> bool {
         match self.0 {
             // Avoid `Instant::elapsed` to avoid issues like rust-lang/rust#86470.
-            Some(timeout) => Instant::now().saturating_duration_since(instant) > timeout,
+            Some(timeout) => now.saturating_duration_since(instant) > timeout,
             None => false,
         }
     }
 }
 struct IdleTask<T, K: Key> {
-    timer: ArcTimer,
+    timer: Timer,
     duration: Duration,
     pool: WeakOpt<Mutex<PoolInner<T, K>>>,
     // This allows the IdleTask to be notified as soon as the entire
@@ -761,7 +757,7 @@ impl<T: Poolable + 'static, K: Key> IdleTask<T, K> {
     async fn run(self) {
         use futures_util::future;
-        let mut sleep = self.timer.sleep_until(Instant::now() + self.duration);
+        let mut sleep = self.timer.sleep_until(self.timer.now() + self.duration);
         let mut on_pool_drop = self.pool_drop_notifier;
         loop {
             match future::select(&mut on_pool_drop, &mut sleep).await {
@@ -777,7 +773,7 @@ impl<T: Poolable + 'static, K: Key> IdleTask<T, K> {
                         drop(inner);
                     }
-                    let deadline = Instant::now() + self.duration;
+                    let deadline = self.timer.now() + self.duration;
                     self.timer.reset(&mut sleep, deadline);
                 }
             }
@@ -815,7 +811,7 @@ mod tests {
     use super::{Connecting, Key, Pool, Poolable, Reservation, WeakOpt};
     use crate::{
-        client::core::rt::{ArcTimer, TokioExecutor, TokioTimer},
+        rt::{Executor, Timer},
         sync::MutexGuard,
     };
@@ -862,8 +858,8 @@ mod tests {
                 max_idle_per_host: max_idle,
                 max_pool_size: None,
             },
-            TokioExecutor::new(),
-            Option::<ArcTimer>::None,
+            Executor::default(),
+            Timer::empty(),
         )
     }
@@ -960,15 +956,24 @@ mod tests {
     }
     #[tokio::test]
-    async fn test_pool_timer_removes_expired() {
+    async fn test_pool_timer_removes_expired_realtime() {
+        test_pool_timer_removes_expired_inner().await
+    }
+    #[tokio::test(start_paused = true)]
+    async fn test_pool_timer_removes_expired_faketime() {
+        test_pool_timer_removes_expired_inner().await
+    }
+    async fn test_pool_timer_removes_expired_inner() {
         let pool = Pool::new(
             super::Config {
                 idle_timeout: Some(Duration::from_millis(10)),
                 max_idle_per_host: usize::MAX,
                 max_pool_size: None,
             },
-            TokioExecutor::new(),
-            Some(TokioTimer::new()),
+            Executor::default(),
+            Timer::default(),
         );
         let key = host_key("foo");
@@ -1087,8 +1092,8 @@ mod tests {
                 max_idle_per_host: usize::MAX,
                 max_pool_size: Some(NonZero::new(2).expect("max pool size")),
             },
-            TokioExecutor::new(),
-            Option::<ArcTimer>::None,
+            Executor::default(),
+            Timer::default(),
         );
         let key1 = host_key("foo");
         let key2 = host_key("bar");