From a2c24a4009b8718aa04102c785cf9d0c5039afad Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Wed, 31 May 2017 14:48:37 -0600 Subject: [PATCH] Some slightly less trivial rustfmt changes. --- examples/simple.rs | 3 +-- src/client.rs | 43 ++++++++++++++++++++------------ src/error.rs | 6 +++-- src/redirect.rs | 13 ++++------ src/response.rs | 21 +++++++--------- tests/client.rs | 61 +++++++++++++++++++++++----------------------- tests/server.rs | 3 ++- 7 files changed, 78 insertions(+), 72 deletions(-) diff --git a/examples/simple.rs b/examples/simple.rs index c188d31..12e2c00 100644 --- a/examples/simple.rs +++ b/examples/simple.rs @@ -12,8 +12,7 @@ error_chain! { } fn run() -> Result<()> { - env_logger::init() - .expect("Failed to initialize logger"); + env_logger::init().expect("Failed to initialize logger"); println!("GET https://www.rust-lang.org"); diff --git a/src/client.rs b/src/client.rs index 7d632c7..aca6e47 100644 --- a/src/client.rs +++ b/src/client.rs @@ -21,7 +21,8 @@ use body::{self, Body}; use redirect::{self, RedirectPolicy, check_redirect, remove_sensitive_headers}; use response::Response; -static DEFAULT_USER_AGENT: &'static str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION")); +static DEFAULT_USER_AGENT: &'static str = + concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION")); /// A `Client` to make Requests with. /// @@ -74,9 +75,8 @@ impl Certificate { /// /// If the provided buffer is not valid DER, an error will be returned. pub fn from_der(der: &[u8]) -> ::Result { - let inner = try_!( - native_tls::Certificate::from_der(der) - .map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); + let inner = try_!(native_tls::Certificate::from_der(der) + .map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); Ok(Certificate(inner)) } } @@ -119,9 +119,8 @@ struct Config { impl ClientBuilder { /// Constructs a new `ClientBuilder` pub fn new() -> ::Result { - let tls_connector_builder = try_!( - native_tls::TlsConnector::builder() - .map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); + let tls_connector_builder = try_!(native_tls::TlsConnector::builder() + .map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); Ok(ClientBuilder { config: Some(Config { hostname_verification: true, @@ -139,8 +138,10 @@ impl ClientBuilder { pub fn build(&mut self) -> ::Result { let config = self.take_config(); - let tls_connector = try_!( - config.tls.build().map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); + let tls_connector = try_!(config + .tls + .build() + .map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); let mut tls_client = NativeTlsClient::from(tls_connector); if !config.hostname_verification { tls_client.danger_disable_hostname_verification(true); @@ -149,7 +150,9 @@ impl ClientBuilder { let mut hyper_client = ::hyper::Client::with_connector( ::hyper::client::Pool::with_connector( Default::default(), - ::hyper::net::HttpsConnector::new(tls_client))); + ::hyper::net::HttpsConnector::new(tls_client), + ) + ); hyper_client.set_redirect_policy(::hyper::client::RedirectPolicy::FollowNone); @@ -168,8 +171,10 @@ impl ClientBuilder { /// This can be used to connect to a server that has a self-signed /// certificate for example. pub fn add_root_certificate(&mut self, cert: Certificate) -> ::Result<&mut ClientBuilder> { - try_!(self.config_mut().tls.add_root_certificate(cert.0) - .map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); + try_!(self.config_mut() + .tls + .add_root_certificate(cert.0) + .map_err(|e| ::hyper::Error::Ssl(Box::new(e)))); Ok(self) } @@ -192,11 +197,15 @@ impl ClientBuilder { // private fn config_mut(&mut self) -> &mut Config { - self.config.as_mut().expect("ClientBuilder cannot be reused after building a Client") + self.config + .as_mut() + .expect("ClientBuilder cannot be reused after building a Client") } fn take_config(&mut self) -> Config { - self.config.take().expect("ClientBuilder cannot be reused after building a Client") + self.config + .take() + .expect("ClientBuilder cannot be reused after building a Client") } } @@ -497,7 +506,8 @@ impl RequestBuilder { } } urls.push(url); - let action = check_redirect(&client.redirect_policy.lock().unwrap(), &loc, &urls); + let action = + check_redirect(&client.redirect_policy.lock().unwrap(), &loc, &urls); match action { redirect::Action::Follow => loc, @@ -688,7 +698,8 @@ mod tests { r = r.form(&form_data); // Make sure the content type was set - assert_eq!(r.headers.get::(), Some(&ContentType::form_url_encoded())); + assert_eq!(r.headers.get::(), + Some(&ContentType::form_url_encoded())); let buf = body::read_to_string(r.body.unwrap().unwrap()).unwrap(); diff --git a/src/error.rs b/src/error.rs index d696597..da77788 100644 --- a/src/error.rs +++ b/src/error.rs @@ -192,8 +192,10 @@ pub fn too_many_redirects(url: Url) -> Error { #[test] fn test_error_get_ref_downcasts() { let err: Error = from(::hyper::Error::Status); - let cause = err.get_ref().unwrap() - .downcast_ref::<::hyper::Error>().unwrap(); + let cause = err.get_ref() + .unwrap() + .downcast_ref::<::hyper::Error>() + .unwrap(); match cause { &::hyper::Error::Status => (), diff --git a/src/redirect.rs b/src/redirect.rs index 53a87da..101d8d3 100644 --- a/src/redirect.rs +++ b/src/redirect.rs @@ -189,8 +189,8 @@ pub fn check_redirect(policy: &RedirectPolicy, next: &Url, previous: &[Url]) -> pub fn remove_sensitive_headers(headers: &mut Headers, next: &Url, previous: &[Url]) { if let Some(previous) = previous.last() { - let cross_host = next.host_str() != previous.host_str() - || next.port_or_known_default() != previous.port_or_known_default(); + let cross_host = next.host_str() != previous.host_str() || + next.port_or_known_default() != previous.port_or_known_default(); if cross_host { headers.remove::>(); headers.remove::(); @@ -231,7 +231,8 @@ fn test_redirect_policy_limit() { previous.push(Url::parse("http://a.b.d/e/33").unwrap()); - assert_eq!(check_redirect(&policy, &next, &previous), Action::TooManyRedirects); + assert_eq!(check_redirect(&policy, &next, &previous), + Action::TooManyRedirects); } #[test] @@ -258,11 +259,7 @@ fn test_remove_sensitive_headers() { let mut headers = Headers::new(); headers.set(Accept::star()); headers.set(Authorization("let me in".to_owned())); - headers.set( - Cookie(vec![ - String::from("foo=bar") - ]) - ); + headers.set(Cookie(vec![String::from("foo=bar")])); let next = Url::parse("http://initial-domain.com/path").unwrap(); let mut prev = vec![Url::parse("http://initial-domain.com/new_path").unwrap()]; diff --git a/src/response.rs b/src/response.rs index 31d07d7..7abb5d4 100644 --- a/src/response.rs +++ b/src/response.rs @@ -148,12 +148,13 @@ impl Decoder { } let content_encoding_gzip: bool; let mut is_gzip = { - content_encoding_gzip = res.headers.get::().map_or(false, |encs|{ - encs.contains(&Encoding::Gzip) - }); - content_encoding_gzip || res.headers.get::().map_or(false, |encs|{ - encs.contains(&Encoding::Gzip) - }) + content_encoding_gzip = res.headers + .get::() + .map_or(false, |encs| encs.contains(&Encoding::Gzip)); + content_encoding_gzip || + res.headers + .get::() + .map_or(false, |encs| encs.contains(&Encoding::Gzip)) }; if is_gzip { if let Some(content_length) = res.headers.get::() { @@ -249,12 +250,8 @@ impl Read for Peeked { impl Read for Decoder { fn read(&mut self, buf: &mut [u8]) -> io::Result { match *self { - Decoder::PlainText(ref mut hyper_response) => { - hyper_response.read(buf) - }, - Decoder::Gzip{ref mut decoder, ..} => { - decoder.read(buf) - }, + Decoder::PlainText(ref mut hyper_response) => hyper_response.read(buf), + Decoder::Gzip { ref mut decoder, .. } => decoder.read(buf), Decoder::Errored { ref mut err, .. } => { Err(err.take().unwrap_or_else(previously_errored)) } diff --git a/tests/client.rs b/tests/client.rs index 9a23c6f..e2a6792 100644 --- a/tests/client.rs +++ b/tests/client.rs @@ -32,8 +32,10 @@ fn test_get() { assert_eq!(res.url().as_str(), &url); assert_eq!(res.status(), &reqwest::StatusCode::Ok); assert_eq!(res.version(), &reqwest::HttpVersion::Http11); - assert_eq!(res.headers().get(), Some(&reqwest::header::Server("test".to_string()))); - assert_eq!(res.headers().get(), Some(&reqwest::header::ContentLength(0))); + assert_eq!(res.headers().get(), + Some(&reqwest::header::Server("test".to_string()))); + assert_eq!(res.headers().get(), + Some(&reqwest::header::ContentLength(0))); let mut buf = [0; 1024]; let n = res.read(&mut buf).unwrap(); @@ -84,12 +86,11 @@ fn test_redirect_301_and_302_and_303_changes_post_to_get() { let url = format!("http://{}/{}", redirect.addr(), code); let dst = format!("http://{}/{}", redirect.addr(), "dst"); - let res = client.post(&url) - .send() - .unwrap(); + let res = client.post(&url).send().unwrap(); assert_eq!(res.url().as_str(), dst); assert_eq!(res.status(), &reqwest::StatusCode::Ok); - assert_eq!(res.headers().get(), Some(&reqwest::header::Server("test-dst".to_string()))); + assert_eq!(res.headers().get(), + Some(&reqwest::header::Server("test-dst".to_string()))); } } @@ -139,13 +140,11 @@ fn test_redirect_307_and_308_tries_to_post_again() { let url = format!("http://{}/{}", redirect.addr(), code); let dst = format!("http://{}/{}", redirect.addr(), "dst"); - let res = client.post(&url) - .body("Hello") - .send() - .unwrap(); + let res = client.post(&url).body("Hello").send().unwrap(); assert_eq!(res.url().as_str(), dst); assert_eq!(res.status(), &reqwest::StatusCode::Ok); - assert_eq!(res.headers().get(), Some(&reqwest::header::Server("test-dst".to_string()))); + assert_eq!(res.headers().get(), + Some(&reqwest::header::Server("test-dst".to_string()))); } } @@ -178,7 +177,8 @@ fn test_redirect_307_does_not_try_if_reader_cannot_reset() { }; let url = format!("http://{}/{}", redirect.addr(), code); - let res = client.post(&url) + let res = client + .post(&url) .body(reqwest::Body::new(&b"Hello"[..])) .send() .unwrap(); @@ -227,13 +227,11 @@ fn test_redirect_removes_sensitive_headers() { let mut client = reqwest::Client::new().unwrap(); client.referer(false); - client.get(&format!("http://{}/sensitive", mid_server.addr())) - .header( - reqwest::header::Cookie(vec![ - String::from("foo=bar") - ]) - ) - .send().unwrap(); + client + .get(&format!("http://{}/sensitive", mid_server.addr())) + .header(reqwest::header::Cookie(vec![String::from("foo=bar")])) + .send() + .unwrap(); } #[test] @@ -283,13 +281,12 @@ fn test_redirect_policy_can_stop_redirects_without_an_error() { client.redirect(reqwest::RedirectPolicy::none()); let url = format!("http://{}/no-redirect", server.addr()); - let res = client.get(&url) - .send() - .unwrap(); + let res = client.get(&url).send().unwrap(); assert_eq!(res.url().as_str(), url); assert_eq!(res.status(), &reqwest::StatusCode::Found); - assert_eq!(res.headers().get(), Some(&reqwest::header::Server("test-dont".to_string()))); + assert_eq!(res.headers().get(), + Some(&reqwest::header::Server("test-dont".to_string()))); } #[test] @@ -329,8 +326,10 @@ fn test_referer_is_not_set_if_disabled() { }; let mut client = reqwest::Client::new().unwrap(); client.referer(false); - client.get(&format!("http://{}/no-refer", server.addr())) - .send().unwrap(); + client + .get(&format!("http://{}/no-refer", server.addr())) + .send() + .unwrap(); } #[test] @@ -353,7 +352,8 @@ fn test_accept_header_is_not_changed_if_set() { }; let client = reqwest::Client::new().unwrap(); - let res = client.get(&format!("http://{}/accept", server.addr())) + let res = client + .get(&format!("http://{}/accept", server.addr())) .header(reqwest::header::Accept::json()) .send() .unwrap(); @@ -421,8 +421,7 @@ fn test_gzip_response() { ", response: response }; - let mut res = reqwest::get(&format!("http://{}/gzip", server.addr())) - .unwrap(); + let mut res = reqwest::get(&format!("http://{}/gzip", server.addr())).unwrap(); let mut body = ::std::string::String::new(); match res.read_to_string(&mut body) { @@ -453,7 +452,8 @@ fn test_gzip_empty_body() { }; let client = reqwest::Client::new().unwrap(); - let mut res = client.head(&format!("http://{}/gzip", server.addr())) + let mut res = client + .head(&format!("http://{}/gzip", server.addr())) .send() .unwrap(); @@ -483,8 +483,7 @@ fn test_gzip_invalid_body() { 0" }; - let mut res = reqwest::get(&format!("http://{}/gzip", server.addr())) - .unwrap(); + let mut res = reqwest::get(&format!("http://{}/gzip", server.addr())).unwrap(); // this tests that the request.send() didn't error, but that the error // is in reading the body diff --git a/tests/server.rs b/tests/server.rs index a97d7dd..74d3497 100644 --- a/tests/server.rs +++ b/tests/server.rs @@ -14,7 +14,8 @@ impl Server { } } -static DEFAULT_USER_AGENT: &'static str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION")); +static DEFAULT_USER_AGENT: &'static str = + concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION")); pub fn spawn(txns: Vec<(Vec, Vec)>) -> Server { let listener = net::TcpListener::bind("127.0.0.1:0").unwrap();