forked/reqwest-impersonate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change RequestBuilder methods to own a builder

Browse Source 
This means that `build` cannot possibly panic anymore due to being
called multiple times. This is a breaking change as it breaks the
behaviour of builder methods called without assigning to a new variable
or chaining. It's rather easy to fix those usages, as they won't
compile anymore and can be fixed by assigning a result.

Additionally, this change reduces the size of `RequestBuilder`,
although this likely isn't all that meaningful, as usually there
is no reason to store builders in structures.
This commit is contained in:
Konrad Borowski
2018-02-17 14:26:35 +01:00
committed by Sean McArthur
parent d8e47babf6
commit 279725ee5e
2 changed files with 110 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/async_impl/request.rs
View File

@@ -23,8 +23,7 @@ pub struct Request {
/// A builder to construct the properties of a `Request`. /// A builder to construct the properties of a `Request`.
pub struct RequestBuilder { pub struct RequestBuilder {
client: Client, client: Client,
request: Option<Request>, request: ::Result<Request>,
err: Option<::Error>,
} }
impl Request { impl Request {
@@ -90,29 +89,33 @@ impl Request {
impl RequestBuilder { impl RequestBuilder {
/// Add a `Header` to this Request. /// Add a `Header` to this Request.
pub fn header<K, V>(&mut self, key: K, value: V) -> &mut RequestBuilder pub fn header<K, V>(mut self, key: K, value: V) -> RequestBuilder
where where
HeaderName: HttpTryFrom<K>, HeaderName: HttpTryFrom<K>,
HeaderValue: HttpTryFrom<V>, HeaderValue: HttpTryFrom<V>,
{ {
if let Some(req) = request_mut(&mut self.request, &self.err) { let mut error = None;
if let Ok(ref mut req) = self.request {
match <HeaderName as HttpTryFrom<K>>::try_from(key) { match <HeaderName as HttpTryFrom<K>>::try_from(key) {
Ok(key) => { Ok(key) => {
match <HeaderValue as HttpTryFrom<V>>::try_from(value) { match <HeaderValue as HttpTryFrom<V>>::try_from(value) {
Ok(value) => { req.headers_mut().append(key, value); } Ok(value) => { req.headers_mut().append(key, value); }
Err(e) => self.err = Some(::error::from(e.into())), Err(e) => error = Some(::error::from(e.into())),
} }
}, },
Err(e) => self.err = Some(::error::from(e.into())), Err(e) => error = Some(::error::from(e.into())),
}; };
} }
if let Some(err) = error {
self.request = Err(err);
}
self self
} }
/// Add a set of Headers to the existing ones on this Request. /// Add a set of Headers to the existing ones on this Request.
/// ///
/// The headers will be merged in to any already set. /// The headers will be merged in to any already set.
pub fn headers(&mut self, headers: ::header::HeaderMap) -> &mut RequestBuilder { pub fn headers(mut self, headers: ::header::HeaderMap) -> RequestBuilder {
if let Some(req) = request_mut(&mut self.request, &self.err) { if let Ok(ref mut req) = self.request {
for (key, value) in headers.iter() { for (key, value) in headers.iter() {
req.headers_mut().insert(key, value.clone()); req.headers_mut().insert(key, value.clone());
} }
@@ -121,7 +124,7 @@ impl RequestBuilder {
} }
/// Enable HTTP basic authentication. /// Enable HTTP basic authentication.
pub fn basic_auth<U, P>(&mut self, username: U, password: Option<P>) -> &mut RequestBuilder pub fn basic_auth<U, P>(mut self, username: U, password: Option<P>) -> RequestBuilder
where where
U: fmt::Display, U: fmt::Display,
P: fmt::Display, P: fmt::Display,
@@ -131,12 +134,12 @@ impl RequestBuilder {
None => format!("{}:", username) None => format!("{}:", username)
}; };
let header_value = format!("basic {}", encode(&auth)); let header_value = format!("basic {}", encode(&auth));
self.header(::header::AUTHORIZATION, HeaderValue::from_str(header_value.as_str()).expect("")) self.header(::header::AUTHORIZATION, &*header_value)
} }
/// Set the request body. /// Set the request body.
pub fn body<T: Into<Body>>(&mut self, body: T) -> &mut RequestBuilder { pub fn body<T: Into<Body>>(mut self, body: T) -> RequestBuilder {
if let Some(req) = request_mut(&mut self.request, &self.err) { if let Ok(ref mut req) = self.request {
*req.body_mut() = Some(body.into()); *req.body_mut() = Some(body.into());
} }
self self
@@ -160,30 +163,38 @@ impl RequestBuilder {
/// # Errors /// # Errors
/// This method will fail if the object you provide cannot be serialized /// This method will fail if the object you provide cannot be serialized
/// into a query string. /// into a query string.
pub fn query<T: Serialize + ?Sized>(&mut self, query: &T) -> &mut RequestBuilder { pub fn query<T: Serialize + ?Sized>(mut self, query: &T) -> RequestBuilder {
if let Some(req) = request_mut(&mut self.request, &self.err) { let mut error = None;
if let Ok(ref mut req) = self.request {
let url = req.url_mut(); let url = req.url_mut();
let mut pairs = url.query_pairs_mut(); let mut pairs = url.query_pairs_mut();
let serializer = serde_urlencoded::Serializer::new(&mut pairs); let serializer = serde_urlencoded::Serializer::new(&mut pairs);
if let Err(err) = query.serialize(serializer) { if let Err(err) = query.serialize(serializer) {
self.err = Some(::error::from(err)); error = Some(::error::from(err));
} }
} }
if let Some(err) = error {
self.request = Err(err);
}
self self
} }
/// Send a form body. /// Send a form body.
pub fn form<T: Serialize + ?Sized>(&mut self, form: &T) -> &mut RequestBuilder { pub fn form<T: Serialize + ?Sized>(mut self, form: &T) -> RequestBuilder {
if let Some(req) = request_mut(&mut self.request, &self.err) { let mut error = None;
if let Ok(ref mut req) = self.request {
match serde_urlencoded::to_string(form) { match serde_urlencoded::to_string(form) {
Ok(body) => { Ok(body) => {
req.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_str(mime::APPLICATION_WWW_FORM_URLENCODED.as_ref()).expect("")); req.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_str(mime::APPLICATION_WWW_FORM_URLENCODED.as_ref()).expect(""));
*req.body_mut() = Some(body.into()); *req.body_mut() = Some(body.into());
}, },
Err(err) => self.err = Some(::error::from(err)), Err(err) => error = Some(::error::from(err)),
} }
} }
if let Some(err) = error {
self.request = Err(err);
}
self self
} }
@@ -193,34 +204,27 @@ impl RequestBuilder {
/// ///
/// Serialization can fail if `T`'s implementation of `Serialize` decides to /// Serialization can fail if `T`'s implementation of `Serialize` decides to
/// fail, or if `T` contains a map with non-string keys. /// fail, or if `T` contains a map with non-string keys.
pub fn json<T: Serialize + ?Sized>(&mut self, json: &T) -> &mut RequestBuilder { pub fn json<T: Serialize + ?Sized>(mut self, json: &T) -> RequestBuilder {
if let Some(req) = request_mut(&mut self.request, &self.err) { let mut error = None;
if let Ok(ref mut req) = self.request {
match serde_json::to_vec(json) { match serde_json::to_vec(json) {
Ok(body) => { Ok(body) => {
req.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_str(mime::APPLICATION_JSON.as_ref()).expect("")); req.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_str(mime::APPLICATION_JSON.as_ref()).expect(""));
*req.body_mut() = Some(body.into()); *req.body_mut() = Some(body.into());
}, },
Err(err) => self.err = Some(::error::from(err)), Err(err) => error = Some(::error::from(err)),
} }
} }
if let Some(err) = error {
self.request = Err(err);
}
self self
} }
/// Build a `Request`, which can be inspected, modified and executed with /// Build a `Request`, which can be inspected, modified and executed with
/// `Client::execute()`. /// `Client::execute()`.
/// pub fn build(self) -> ::Result<Request> {
/// # Panics self.request
///
/// This method consumes builder internal state. It panics on an attempt to
/// reuse already consumed builder.
pub fn build(&mut self) -> ::Result<Request> {
if let Some(err) = self.err.take() {
Err(err)
} else {
Ok(self.request
.take()
.expect("RequestBuilder cannot be reused after builder a Request"))
}
} }
/// Constructs the Request and sends it the target URL, returning a Response. /// Constructs the Request and sends it the target URL, returning a Response.
@@ -229,22 +233,14 @@ impl RequestBuilder {
/// ///
/// This method fails if there was an error while sending request, /// This method fails if there was an error while sending request,
/// redirect loop was detected or redirect limit was exhausted. /// redirect loop was detected or redirect limit was exhausted.
pub fn send(&mut self) -> Pending { pub fn send(self) -> Pending {
match self.build() { match self.request {
Ok(req) => self.client.execute(req), Ok(req) => self.client.execute(req),
Err(err) => pending_err(err), Err(err) => pending_err(err),
} }
} }
} }
fn request_mut<'a>(req: &'a mut Option<Request>, err: &Option<::Error>) -> Option<&'a mut Request> {
if err.is_some() {
None
} else {
req.as_mut()
}
}
impl fmt::Debug for Request { impl fmt::Debug for Request {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt_request_fields(&mut f.debug_struct("Request"), self) fmt_request_fields(&mut f.debug_struct("Request"), self)
@@ -254,15 +250,19 @@ impl fmt::Debug for Request {
impl fmt::Debug for RequestBuilder { impl fmt::Debug for RequestBuilder {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if let Some(ref req) = self.request { let mut builder = f.debug_struct("RequestBuilder");
fmt_request_fields(&mut f.debug_struct("RequestBuilder"), req) match self.request {
Ok(ref req) => {
fmt_request_fields(&mut builder, req)
.finish() .finish()
} else { },
f.debug_tuple("RequestBuilder") Err(ref err) => {
.field(&"Consumed") builder
.field("error", err)
.finish() .finish()
} }
} }
}
} }
fn fmt_request_fields<'a, 'b>(f: &'a mut fmt::DebugStruct<'a, 'b>, req: &Request) -> &'a mut fmt::DebugStruct<'a, 'b> { fn fmt_request_fields<'a, 'b>(f: &'a mut fmt::DebugStruct<'a, 'b>, req: &Request) -> &'a mut fmt::DebugStruct<'a, 'b> {
@@ -274,18 +274,10 @@ fn fmt_request_fields<'a, 'b>(f: &'a mut fmt::DebugStruct<'a, 'b>, req: &Request
// pub(crate) // pub(crate)
#[inline] #[inline]
pub fn builder(client: Client, req: ::Result<Request>) -> RequestBuilder { pub fn builder(client: Client, request: ::Result<Request>) -> RequestBuilder {
match req { RequestBuilder {
Ok(req) => RequestBuilder { client,
client: client, request,
request: Some(req),
err: None,
},
Err(err) => RequestBuilder {
client: client,
request: None,
err: Some(err)
},
} }
} }

139
src/request.rs
View File

@@ -17,10 +17,10 @@ pub struct Request {
} }
/// A builder to construct the properties of a `Request`. /// A builder to construct the properties of a `Request`.
#[derive(Debug)]
pub struct RequestBuilder { pub struct RequestBuilder {
client: Client, client: Client,
request: Option<Request>, request: ::Result<Request>,
err: Option<::Error>,
} }
impl Request { impl Request {
@@ -96,22 +96,26 @@ impl RequestBuilder {
/// # Ok(()) /// # Ok(())
/// # } /// # }
/// ``` /// ```
pub fn header<K, V>(&mut self, key: K, value: V) -> &mut RequestBuilder pub fn header<K, V>(mut self, key: K, value: V) -> RequestBuilder
where where
HeaderName: HttpTryFrom<K>, HeaderName: HttpTryFrom<K>,
HeaderValue: HttpTryFrom<V>, HeaderValue: HttpTryFrom<V>,
{ {
if let Some(req) = request_mut(&mut self.request, &self.err) { let mut error = None;
if let Ok(ref mut req) = self.request {
match <HeaderName as HttpTryFrom<K>>::try_from(key) { match <HeaderName as HttpTryFrom<K>>::try_from(key) {
Ok(key) => { Ok(key) => {
match <HeaderValue as HttpTryFrom<V>>::try_from(value) { match <HeaderValue as HttpTryFrom<V>>::try_from(value) {
Ok(value) => { req.headers_mut().append(key, value); } Ok(value) => { req.headers_mut().append(key, value); }
Err(e) => self.err = Some(::error::from(e.into())), Err(e) => error = Some(::error::from(e.into())),
} }
}, },
Err(e) => self.err = Some(::error::from(e.into())), Err(e) => error = Some(::error::from(e.into())),
}; };
} }
if let Some(err) = error {
self.request = Err(err);
}
self self
} }
@@ -140,8 +144,8 @@ impl RequestBuilder {
/// # Ok(()) /// # Ok(())
/// # } /// # }
/// ``` /// ```
pub fn headers(&mut self, headers: ::header::HeaderMap) -> &mut RequestBuilder { pub fn headers(mut self, headers: ::header::HeaderMap) -> RequestBuilder {
if let Some(req) = request_mut(&mut self.request, &self.err) { if let Ok(ref mut req) = self.request {
for (key, value) in headers.iter() { for (key, value) in headers.iter() {
req.headers_mut().insert(key, value.clone()); req.headers_mut().insert(key, value.clone());
} }
@@ -160,7 +164,7 @@ impl RequestBuilder {
/// # Ok(()) /// # Ok(())
/// # } /// # }
/// ``` /// ```
pub fn basic_auth<U, P>(&mut self, username: U, password: Option<P>) -> &mut RequestBuilder pub fn basic_auth<U, P>(self, username: U, password: Option<P>) -> RequestBuilder
where where
U: fmt::Display, U: fmt::Display,
P: fmt::Display, P: fmt::Display,
@@ -217,8 +221,8 @@ impl RequestBuilder {
/// # Ok(()) /// # Ok(())
/// # } /// # }
/// ``` /// ```
pub fn body<T: Into<Body>>(&mut self, body: T) -> &mut RequestBuilder { pub fn body<T: Into<Body>>(mut self, body: T) -> RequestBuilder {
if let Some(req) = request_mut(&mut self.request, &self.err) { if let Ok(ref mut req) = self.request {
*req.body_mut() = Some(body.into()); *req.body_mut() = Some(body.into());
} }
self self
@@ -254,16 +258,20 @@ impl RequestBuilder {
/// # Errors /// # Errors
/// This method will fail if the object you provide cannot be serialized /// This method will fail if the object you provide cannot be serialized
/// into a query string. /// into a query string.
pub fn query<T: Serialize + ?Sized>(&mut self, query: &T) -> &mut RequestBuilder { pub fn query<T: Serialize + ?Sized>(mut self, query: &T) -> RequestBuilder {
if let Some(req) = request_mut(&mut self.request, &self.err) { let mut error = None;
if let Ok(ref mut req) = self.request {
let url = req.url_mut(); let url = req.url_mut();
let mut pairs = url.query_pairs_mut(); let mut pairs = url.query_pairs_mut();
let serializer = serde_urlencoded::Serializer::new(&mut pairs); let serializer = serde_urlencoded::Serializer::new(&mut pairs);
if let Err(err) = query.serialize(serializer) { if let Err(err) = query.serialize(serializer) {
self.err = Some(::error::from(err)); error = Some(::error::from(err));
} }
} }
if let Some(err) = error {
self.request = Err(err);
}
self self
} }
@@ -293,16 +301,20 @@ impl RequestBuilder {
/// ///
/// This method fails if the passed value cannot be serialized into /// This method fails if the passed value cannot be serialized into
/// url encoded format /// url encoded format
pub fn form<T: Serialize + ?Sized>(&mut self, form: &T) -> &mut RequestBuilder { pub fn form<T: Serialize + ?Sized>(mut self, form: &T) -> RequestBuilder {
if let Some(req) = request_mut(&mut self.request, &self.err) { let mut error = None;
if let Ok(ref mut req) = self.request {
match serde_urlencoded::to_string(form) { match serde_urlencoded::to_string(form) {
Ok(body) => { Ok(body) => {
req.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_str(::mime::APPLICATION_WWW_FORM_URLENCODED.as_ref()).expect("")); req.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_str(::mime::APPLICATION_WWW_FORM_URLENCODED.as_ref()).expect(""));
*req.body_mut() = Some(body.into()); *req.body_mut() = Some(body.into());
}, },
Err(err) => self.err = Some(::error::from(err)), Err(err) => error = Some(::error::from(err)),
} }
} }
if let Some(err) = error {
self.request = Err(err);
}
self self
} }
@@ -331,16 +343,20 @@ impl RequestBuilder {
/// ///
/// Serialization can fail if `T`'s implementation of `Serialize` decides to /// Serialization can fail if `T`'s implementation of `Serialize` decides to
/// fail, or if `T` contains a map with non-string keys. /// fail, or if `T` contains a map with non-string keys.
pub fn json<T: Serialize + ?Sized>(&mut self, json: &T) -> &mut RequestBuilder { pub fn json<T: Serialize + ?Sized>(mut self, json: &T) -> RequestBuilder {
if let Some(req) = request_mut(&mut self.request, &self.err) { let mut error = None;
if let Ok(ref mut req) = self.request {
match serde_json::to_vec(json) { match serde_json::to_vec(json) {
Ok(body) => { Ok(body) => {
req.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_str(::mime::APPLICATION_JSON.as_ref()).expect("")); req.headers_mut().insert(CONTENT_TYPE, HeaderValue::from_str(::mime::APPLICATION_JSON.as_ref()).expect(""));
*req.body_mut() = Some(body.into()); *req.body_mut() = Some(body.into());
}, },
Err(err) => self.err = Some(::error::from(err)), Err(err) => error = Some(::error::from(err)),
} }
} }
if let Some(err) = error {
self.request = Err(err);
}
self self
} }
@@ -363,8 +379,8 @@ impl RequestBuilder {
/// ``` /// ```
/// ///
/// See [`multipart`](multipart/) for more examples. /// See [`multipart`](multipart/) for more examples.
pub fn multipart(&mut self, mut multipart: ::multipart::Form) -> &mut RequestBuilder { pub fn multipart(mut self, mut multipart: ::multipart::Form) -> RequestBuilder {
if let Some(req) = request_mut(&mut self.request, &self.err) { if let Ok(ref mut req) = self.request {
req.headers_mut().insert( req.headers_mut().insert(
::header::CONTENT_TYPE, ::header::CONTENT_TYPE,
HeaderValue::from_str( HeaderValue::from_str(
@@ -384,19 +400,8 @@ impl RequestBuilder {
/// Build a `Request`, which can be inspected, modified and executed with /// Build a `Request`, which can be inspected, modified and executed with
/// `Client::execute()`. /// `Client::execute()`.
/// pub fn build(self) -> ::Result<Request> {
/// # Panics self.request
///
/// This method consumes builder internal state. It panics on an attempt to
/// reuse already consumed builder.
pub fn build(&mut self) -> ::Result<Request> {
if let Some(err) = self.err.take() {
Err(err)
} else {
Ok(self.request
.take()
.expect("RequestBuilder cannot be reused after builder a Request"))
}
} }
/// Constructs the Request and sends it the target URL, returning a Response. /// Constructs the Request and sends it the target URL, returning a Response.
@@ -405,22 +410,12 @@ impl RequestBuilder {
/// ///
/// This method fails if there was an error while sending request, /// This method fails if there was an error while sending request,
/// redirect loop was detected or redirect limit was exhausted. /// redirect loop was detected or redirect limit was exhausted.
pub fn send(&mut self) -> ::Result<::Response> { pub fn send(self) -> ::Result<::Response> {
let request = self.build()?; self.client.execute(self.request?)
self.client.execute(request)
} }
} }
fn request_mut<'a>(req: &'a mut Option<Request>, err: &Option<::Error>) -> Option<&'a mut Request> {
if err.is_some() {
None
} else {
req.as_mut()
}
}
impl fmt::Debug for Request { impl fmt::Debug for Request {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt_request_fields(&mut f.debug_struct("Request"), self) fmt_request_fields(&mut f.debug_struct("Request"), self)
@@ -428,19 +423,6 @@ impl fmt::Debug for Request {
} }
} }
impl fmt::Debug for RequestBuilder {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if let Some(ref req) = self.request {
fmt_request_fields(&mut f.debug_struct("RequestBuilder"), req)
.finish()
} else {
f.debug_tuple("RequestBuilder")
.field(&"Consumed")
.finish()
}
}
}
fn fmt_request_fields<'a, 'b>(f: &'a mut fmt::DebugStruct<'a, 'b>, req: &Request) -> &'a mut fmt::DebugStruct<'a, 'b> { fn fmt_request_fields<'a, 'b>(f: &'a mut fmt::DebugStruct<'a, 'b>, req: &Request) -> &'a mut fmt::DebugStruct<'a, 'b> {
f.field("method", req.method()) f.field("method", req.method())
.field("url", req.url()) .field("url", req.url())
@@ -450,19 +432,8 @@ fn fmt_request_fields<'a, 'b>(f: &'a mut fmt::DebugStruct<'a, 'b>, req: &Request
// pub(crate) // pub(crate)
#[inline] #[inline]
pub fn builder(client: Client, req: ::Result<Request>) -> RequestBuilder { pub fn builder(client: Client, request: ::Result<Request>) -> RequestBuilder {
match req { RequestBuilder { client, request }
Ok(req) => RequestBuilder {
client: client,
request: Some(req),
err: None,
},
Err(err) => RequestBuilder {
client: client,
request: None,
err: Some(err)
},
}
} }
#[inline] #[inline]
@@ -553,7 +524,7 @@ mod tests {
fn add_header() { fn add_header() {
let client = Client::new(); let client = Client::new();
let some_url = "https://google.com/"; let some_url = "https://google.com/";
let mut r = client.post(some_url); let r = client.post(some_url);
let header = HeaderValue::from_static("google.com"); let header = HeaderValue::from_static("google.com");
@@ -568,7 +539,7 @@ mod tests {
fn add_headers() { fn add_headers() {
let client = Client::new(); let client = Client::new();
let some_url = "https://google.com/"; let some_url = "https://google.com/";
let mut r = client.post(some_url); let r = client.post(some_url);
let header = HeaderValue::from_static("google.com"); let header = HeaderValue::from_static("google.com");
@@ -586,7 +557,7 @@ mod tests {
fn add_body() { fn add_body() {
let client = Client::new(); let client = Client::new();
let some_url = "https://google.com/"; let some_url = "https://google.com/";
let mut r = client.post(some_url); let r = client.post(some_url);
let body = "Some interesting content"; let body = "Some interesting content";
@@ -603,8 +574,8 @@ mod tests {
let some_url = "https://google.com/"; let some_url = "https://google.com/";
let mut r = client.get(some_url); let mut r = client.get(some_url);
r.query(&[("foo", "bar")]); r = r.query(&[("foo", "bar")]);
r.query(&[("qux", 3)]); r = r.query(&[("qux", 3)]);
let req = r.build().expect("request is valid"); let req = r.build().expect("request is valid");
assert_eq!(req.url().query(), Some("foo=bar&qux=3")); assert_eq!(req.url().query(), Some("foo=bar&qux=3"));
@@ -616,7 +587,7 @@ mod tests {
let some_url = "https://google.com/"; let some_url = "https://google.com/";
let mut r = client.get(some_url); let mut r = client.get(some_url);
r.query(&[("foo", "a"), ("foo", "b")]); r = r.query(&[("foo", "a"), ("foo", "b")]);
let req = r.build().expect("request is valid"); let req = r.build().expect("request is valid");
assert_eq!(req.url().query(), Some("foo=a&foo=b")); assert_eq!(req.url().query(), Some("foo=a&foo=b"));
@@ -636,7 +607,7 @@ mod tests {
let params = Params { foo: "bar".into(), qux: 3 }; let params = Params { foo: "bar".into(), qux: 3 };
r.query(&params); r = r.query(&params);
let req = r.build().expect("request is valid"); let req = r.build().expect("request is valid");
assert_eq!(req.url().query(), Some("foo=bar&qux=3")); assert_eq!(req.url().query(), Some("foo=bar&qux=3"));
@@ -652,7 +623,7 @@ mod tests {
let some_url = "https://google.com/"; let some_url = "https://google.com/";
let mut r = client.get(some_url); let mut r = client.get(some_url);
r.query(&params); r = r.query(&params);
let req = r.build().expect("request is valid"); let req = r.build().expect("request is valid");
assert_eq!(req.url().query(), Some("foo=bar&qux=three")); assert_eq!(req.url().query(), Some("foo=bar&qux=three"));
@@ -662,7 +633,7 @@ mod tests {
fn add_form() { fn add_form() {
let client = Client::new(); let client = Client::new();
let some_url = "https://google.com/"; let some_url = "https://google.com/";
let mut r = client.post(some_url); let r = client.post(some_url);
let mut form_data = HashMap::new(); let mut form_data = HashMap::new();
form_data.insert("foo", "bar"); form_data.insert("foo", "bar");
@@ -682,7 +653,7 @@ mod tests {
fn add_json() { fn add_json() {
let client = Client::new(); let client = Client::new();
let some_url = "https://google.com/"; let some_url = "https://google.com/";
let mut r = client.post(some_url); let r = client.post(some_url);
let mut json_data = HashMap::new(); let mut json_data = HashMap::new();
json_data.insert("foo", "bar"); json_data.insert("foo", "bar");
@@ -713,7 +684,7 @@ mod tests {
let client = Client::new(); let client = Client::new();
let some_url = "https://google.com/"; let some_url = "https://google.com/";
let mut r = client.post(some_url); let r = client.post(some_url);
let json_data = MyStruct; let json_data = MyStruct;
assert!(r.json(&json_data).build().unwrap_err().is_serialization()); assert!(r.json(&json_data).build().unwrap_err().is_serialization());
} }