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

Agent tweaks for 2.0

Browse Source 
Replace `this` idiom with `mut self`.

Move idle connections constants from pool.rs to agent.rs.

Remove Agent.set and some convenience request methods
(leaving get, post, and put).

Move max_idle_connections setting from AgentConfig to AgentBuilder
(since the builder passes these to ConnectionPool and the Agent
doesn't subsequently need them).

Eliminate duplicate copy of proxy in AgentState; use the one in
AgentConfig.
This commit is contained in:
Jacob Hoffman-Andrews
2020-10-28 23:55:30 -07:00
committed by Martin Algesten
parent e3bf7c73f3
commit aae05c5614
3 changed files with 29 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/request.rs
View File

@@ -118,12 +118,11 @@ impl Request {
/// }
/// ```
#[cfg(feature = "json")]
pub fn send_json(self, data: SerdeValue) -> Result<Response> {
let mut this = self;
if this.header("Content-Type").is_none() {
this = this.set("Content-Type", "application/json");
pub fn send_json(mut self, data: SerdeValue) -> Result<Response> {
if self.header("Content-Type").is_none() {
self = self.set("Content-Type", "application/json");
}
this.do_call(Payload::JSON(data))
self.do_call(Payload::JSON(data))
}
/// Send data as bytes.
@@ -182,15 +181,14 @@ impl Request {
/// println!("{:?}", r);
/// }
/// ```
pub fn send_form(self, data: &[(&str, &str)]) -> Result<Response> {
let mut this = self;
if this.header("Content-Type").is_none() {
this = this.set("Content-Type", "application/x-www-form-urlencoded");
pub fn send_form(mut self, data: &[(&str, &str)]) -> Result<Response> {
if self.header("Content-Type").is_none() {
self = self.set("Content-Type", "application/x-www-form-urlencoded");
}
let encoded = form_urlencoded::Serializer::new(String::new())
.extend_pairs(data)
.finish();
this.do_call(Payload::Bytes(&encoded.into_bytes()))
self.do_call(Payload::Bytes(&encoded.into_bytes()))
}
/// Send data from a reader.
@@ -423,7 +421,7 @@ impl Request {
}
pub(crate) fn proxy(&self) -> Option<Proxy> {
if let Some(proxy) = &self.agent.state.proxy {
if let Some(proxy) = &self.agent.config.proxy {
Some(proxy.clone())
} else {
None