lib/ureq
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak import paths

Browse Source 
Group together all cookie imports in agent.rs; consistently use `Duration`.
This commit is contained in:
Jacob Hoffman-Andrews
2020-10-25 15:02:57 -07:00
parent 0cfa06c80c
commit 72e7e06334
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/smoke-test/main.rs
View File

@@ -58,7 +58,7 @@ fn get_and_write(agent: &ureq::Agent, url: &String) -> Result<()> {
fn get_many(urls: Vec<String>, simultaneous_fetches: usize) -> Result<()> { fn get_many(urls: Vec<String>, simultaneous_fetches: usize) -> Result<()> {
let agent = ureq::builder() let agent = ureq::builder()
.timeout_connect(std::time::Duration::from_secs(5)) .timeout_connect(Duration::from_secs(5))
.timeout(Duration::from_secs(20)) .timeout(Duration::from_secs(20))
.build(); .build();
let pool = rayon::ThreadPoolBuilder::new() let pool = rayon::ThreadPoolBuilder::new()

30
src/agent.rs
View File

@@ -5,16 +5,10 @@ use crate::pool::ConnectionPool;
use crate::proxy::Proxy; use crate::proxy::Proxy;
use crate::request::Request; use crate::request::Request;
use crate::resolve::{ArcResolver, StdResolver}; use crate::resolve::{ArcResolver, StdResolver};
use std::time; use std::time::Duration;
#[cfg(feature = "cookies")] #[cfg(feature = "cookies")]
use crate::cookies::CookieTin; use {crate::cookies::CookieTin, cookie::Cookie, cookie_store::CookieStore, url::Url};
#[cfg(feature = "cookies")]
use cookie::Cookie;
#[cfg(feature = "cookies")]
use cookie_store::CookieStore;
#[cfg(feature = "cookies")]
use url::Url;
#[derive(Debug)] #[derive(Debug)]
pub struct AgentBuilder { pub struct AgentBuilder {
@@ -33,10 +27,10 @@ pub(crate) struct AgentConfig {
pub max_idle_connections: usize, pub max_idle_connections: usize,
pub max_idle_connections_per_host: usize, pub max_idle_connections_per_host: usize,
pub proxy: Option<Proxy>, pub proxy: Option<Proxy>,
pub timeout_connect: Option<time::Duration>, pub timeout_connect: Option<Duration>,
pub timeout_read: Option<time::Duration>, pub timeout_read: Option<Duration>,
pub timeout_write: Option<time::Duration>, pub timeout_write: Option<Duration>,
pub timeout: Option<time::Duration>, pub timeout: Option<Duration>,
pub redirects: u32, pub redirects: u32,
#[cfg(feature = "tls")] #[cfg(feature = "tls")]
pub tls_config: Option<TLSClientConfig>, pub tls_config: Option<TLSClientConfig>,
@@ -207,7 +201,7 @@ impl AgentBuilder {
max_idle_connections: crate::pool::DEFAULT_MAX_IDLE_CONNECTIONS, max_idle_connections: crate::pool::DEFAULT_MAX_IDLE_CONNECTIONS,
max_idle_connections_per_host: crate::pool::DEFAULT_MAX_IDLE_CONNECTIONS_PER_HOST, max_idle_connections_per_host: crate::pool::DEFAULT_MAX_IDLE_CONNECTIONS_PER_HOST,
proxy: None, proxy: None,
timeout_connect: Some(time::Duration::from_secs(30)), timeout_connect: Some(Duration::from_secs(30)),
timeout_read: None, timeout_read: None,
timeout_write: None, timeout_write: None,
timeout: None, timeout: None,
@@ -343,7 +337,7 @@ impl AgentBuilder {
/// .build(); /// .build();
/// let r = agent.get("/my_page").call(); /// let r = agent.get("/my_page").call();
/// ``` /// ```
pub fn timeout_connect(mut self, timeout: time::Duration) -> Self { pub fn timeout_connect(mut self, timeout: Duration) -> Self {
self.config.timeout_connect = Some(timeout); self.config.timeout_connect = Some(timeout);
self self
} }
@@ -360,7 +354,7 @@ impl AgentBuilder {
/// .build(); /// .build();
/// let r = agent.get("/my_page").call(); /// let r = agent.get("/my_page").call();
/// ``` /// ```
pub fn timeout_read(mut self, timeout: time::Duration) -> Self { pub fn timeout_read(mut self, timeout: Duration) -> Self {
self.config.timeout_read = Some(timeout); self.config.timeout_read = Some(timeout);
self self
} }
@@ -377,7 +371,7 @@ impl AgentBuilder {
/// .build(); /// .build();
/// let r = agent.get("/my_page").call(); /// let r = agent.get("/my_page").call();
/// ``` /// ```
pub fn timeout_write(mut self, timeout: time::Duration) -> Self { pub fn timeout_write(mut self, timeout: Duration) -> Self {
self.config.timeout_write = Some(timeout); self.config.timeout_write = Some(timeout);
self self
} }
@@ -397,7 +391,7 @@ impl AgentBuilder {
/// .build(); /// .build();
/// let r = agent.get("/my_page").call(); /// let r = agent.get("/my_page").call();
/// ``` /// ```
pub fn timeout(mut self, timeout: time::Duration) -> Self { pub fn timeout(mut self, timeout: Duration) -> Self {
self.config.timeout = Some(timeout); self.config.timeout = Some(timeout);
self self
} }
@@ -424,8 +418,6 @@ impl AgentBuilder {
/// Set the TLS client config to use for the connection. See [`ClientConfig`](https://docs.rs/rustls/latest/rustls/struct.ClientConfig.html). /// Set the TLS client config to use for the connection. See [`ClientConfig`](https://docs.rs/rustls/latest/rustls/struct.ClientConfig.html).
/// ///
/// See [`ClientConfig`](https://docs.rs/rustls/latest/rustls/struct.ClientConfig.html).
///
/// Example: /// Example:
/// ``` /// ```
/// let tls_config = std::sync::Arc::new(rustls::ClientConfig::new()); /// let tls_config = std::sync::Arc::new(rustls::ClientConfig::new());