Rename option to “pool_max_idle_per_host” (#917)

reqwest exposes the “pool_max_idle_per_host” option of hyper’s client
builder. This option used to be called “max_idle_per_host” in the hyper
crate, but it has recently been renamed [1].

This patch renames the reqwest representation of this option to make it
consistent with its name in the hyper crate again.

[1] https://github.com/hyperium/hyper/pull/2142
This commit is contained in:
Patrick Lühne
2020-05-22 17:05:44 +02:00
committed by GitHub
parent b5706f2d89
commit ecf1df572c
2 changed files with 18 additions and 6 deletions

View File

@@ -77,7 +77,7 @@ struct Config {
connect_timeout: Option<Duration>, connect_timeout: Option<Duration>,
connection_verbose: bool, connection_verbose: bool,
pool_idle_timeout: Option<Duration>, pool_idle_timeout: Option<Duration>,
max_idle_per_host: usize, pool_max_idle_per_host: usize,
#[cfg(feature = "__tls")] #[cfg(feature = "__tls")]
identity: Option<Identity>, identity: Option<Identity>,
proxies: Vec<Proxy>, proxies: Vec<Proxy>,
@@ -127,7 +127,7 @@ impl ClientBuilder {
connect_timeout: None, connect_timeout: None,
connection_verbose: false, connection_verbose: false,
pool_idle_timeout: Some(Duration::from_secs(90)), pool_idle_timeout: Some(Duration::from_secs(90)),
max_idle_per_host: std::usize::MAX, pool_max_idle_per_host: std::usize::MAX,
proxies: Vec::new(), proxies: Vec::new(),
auto_sys_proxy: true, auto_sys_proxy: true,
redirect_policy: redirect::Policy::default(), redirect_policy: redirect::Policy::default(),
@@ -307,7 +307,7 @@ impl ClientBuilder {
} }
builder.pool_idle_timeout(config.pool_idle_timeout); builder.pool_idle_timeout(config.pool_idle_timeout);
builder.pool_max_idle_per_host(config.max_idle_per_host); builder.pool_max_idle_per_host(config.pool_max_idle_per_host);
if config.http1_title_case_headers { if config.http1_title_case_headers {
builder.http1_title_case_headers(true); builder.http1_title_case_headers(true);
@@ -613,11 +613,17 @@ impl ClientBuilder {
} }
/// Sets the maximum idle connection per host allowed in the pool. /// Sets the maximum idle connection per host allowed in the pool.
pub fn max_idle_per_host(mut self, max: usize) -> ClientBuilder { pub fn pool_max_idle_per_host(mut self, max: usize) -> ClientBuilder {
self.config.max_idle_per_host = max; self.config.pool_max_idle_per_host = max;
self self
} }
#[doc(hidden)]
#[deprecated(note = "renamed to `pool_max_idle_per_host`")]
pub fn max_idle_per_host(self, max: usize) -> ClientBuilder {
self.pool_max_idle_per_host(max)
}
/// Enable case sensitive headers. /// Enable case sensitive headers.
pub fn http1_title_case_headers(mut self) -> ClientBuilder { pub fn http1_title_case_headers(mut self) -> ClientBuilder {
self.config.http1_title_case_headers = true; self.config.http1_title_case_headers = true;

View File

@@ -309,8 +309,14 @@ impl ClientBuilder {
} }
/// Sets the maximum idle connection per host allowed in the pool. /// Sets the maximum idle connection per host allowed in the pool.
pub fn pool_max_idle_per_host(self, max: usize) -> ClientBuilder {
self.with_inner(move |inner| inner.pool_max_idle_per_host(max))
}
#[doc(hidden)]
#[deprecated(note = "use pool_max_idle_per_host instead")]
pub fn max_idle_per_host(self, max: usize) -> ClientBuilder { pub fn max_idle_per_host(self, max: usize) -> ClientBuilder {
self.with_inner(move |inner| inner.max_idle_per_host(max)) self.pool_max_idle_per_host(max)
} }
/// Enable case sensitive headers. /// Enable case sensitive headers.