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

remove some unwraps

Browse Source
This commit is contained in:
Sean McArthur
2018-08-15 15:22:28 -07:00
parent 279725ee5e
commit 591b83a8b8
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/async_impl/request.rs
View File

@@ -186,7 +186,10 @@ impl RequestBuilder {
if let Ok(ref mut req) = self.request { 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_static("application/x-www-form-urlencoded")
);
*req.body_mut() = Some(body.into()); *req.body_mut() = Some(body.into());
}, },
Err(err) => error = Some(::error::from(err)), Err(err) => error = Some(::error::from(err)),
@@ -209,7 +212,10 @@ impl RequestBuilder {
if let Ok(ref mut req) = self.request { 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_static("application/json")
);
*req.body_mut() = Some(body.into()); *req.body_mut() = Some(body.into());
}, },
Err(err) => error = Some(::error::from(err)), Err(err) => error = Some(::error::from(err)),

24
src/request.rs
View File

@@ -174,7 +174,7 @@ 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.
@@ -306,7 +306,10 @@ impl RequestBuilder {
if let Ok(ref mut req) = self.request { 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_static("application/x-www-form-urlencoded")
);
*req.body_mut() = Some(body.into()); *req.body_mut() = Some(body.into());
}, },
Err(err) => error = Some(::error::from(err)), Err(err) => error = Some(::error::from(err)),
@@ -348,7 +351,10 @@ impl RequestBuilder {
if let Ok(ref mut req) = self.request { 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_static("application/json")
);
*req.body_mut() = Some(body.into()); *req.body_mut() = Some(body.into());
}, },
Err(err) => error = Some(::error::from(err)), Err(err) => error = Some(::error::from(err)),
@@ -379,23 +385,21 @@ impl RequestBuilder {
/// ``` /// ```
/// ///
/// See [`multipart`](multipart/) for more examples. /// See [`multipart`](multipart/) for more examples.
pub fn multipart(mut self, mut multipart: ::multipart::Form) -> RequestBuilder { pub fn multipart(self, mut multipart: ::multipart::Form) -> RequestBuilder {
if let Ok(ref mut req) = self.request { let mut builder = self.header(
req.headers_mut().insert( CONTENT_TYPE,
::header::CONTENT_TYPE,
HeaderValue::from_str(
format!( format!(
"multipart/form-data; boundary={}", "multipart/form-data; boundary={}",
::multipart_::boundary(&multipart) ::multipart_::boundary(&multipart)
).as_str() ).as_str()
).expect("")
); );
if let Ok(ref mut req) = builder.request {
*req.body_mut() = Some(match ::multipart_::compute_length(&mut multipart) { *req.body_mut() = Some(match ::multipart_::compute_length(&mut multipart) {
Some(length) => Body::sized(::multipart_::reader(multipart), length), Some(length) => Body::sized(::multipart_::reader(multipart), length),
None => Body::new(::multipart_::reader(multipart)), None => Body::new(::multipart_::reader(multipart)),
}) })
} }
self builder
} }
/// Build a `Request`, which can be inspected, modified and executed with /// Build a `Request`, which can be inspected, modified and executed with