From db93ca0697c3668a3f6c5d8d2504c2a7a8786150 Mon Sep 17 00:00:00 2001 From: Pyfisch Date: Sat, 27 Jun 2015 16:01:08 +0200 Subject: [PATCH] style(rustfmt): run rustfmt on hyper correct overlong lines --- src/client/mod.rs | 2 +- src/client/response.rs | 3 +- src/error.rs | 3 +- src/header/common/accept.rs | 7 +- .../common/access_control_allow_origin.rs | 2 +- src/header/common/authorization.rs | 2 +- src/header/common/connection.rs | 3 +- src/header/common/cookie.rs | 2 +- src/header/common/referer.rs | 2 +- src/header/common/set_cookie.rs | 2 +- src/header/common/upgrade.rs | 10 +- src/header/internals/item.rs | 6 +- src/header/mod.rs | 15 ++- src/header/shared/entity.rs | 100 ++++++++++-------- src/http/h1.rs | 15 ++- src/mock.rs | 3 +- src/server/listener.rs | 1 - src/server/mod.rs | 8 +- src/server/response.rs | 9 +- src/status.rs | 12 ++- src/uri.rs | 2 - src/version.rs | 1 - 22 files changed, 124 insertions(+), 86 deletions(-) diff --git a/src/client/mod.rs b/src/client/mod.rs index 91034694..dd72dd90 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -42,7 +42,7 @@ //! use std::sync::Arc; //! use std::thread; //! -//! // Note: an Arc is used here because `thread::spawn` creates threads that +//! // Note: an Arc is used here because `thread::spawn` creates threads that //! // can outlive the main thread, so we must use reference counting to keep //! // the Client alive long enough. Scoped threads could skip the Arc. //! let client = Arc::new(Client::new()); diff --git a/src/client/response.rs b/src/client/response.rs index f3611cf5..eb906e77 100644 --- a/src/client/response.rs +++ b/src/client/response.rs @@ -108,7 +108,8 @@ mod tests { #[test] fn test_into_inner() { - let message: Box = Box::new(Http11Message::with_stream(Box::new(MockStream::new()))); + let message: Box = Box::new( + Http11Message::with_stream(Box::new(MockStream::new()))); let message = message.downcast::().ok().unwrap(); let b = message.into_inner().downcast::().ok().unwrap(); assert_eq!(b, Box::new(MockStream::new())); diff --git a/src/error.rs b/src/error.rs index 2f8a73be..00199fb7 100644 --- a/src/error.rs +++ b/src/error.rs @@ -211,7 +211,8 @@ mod tests { fn test_from_ssl() { use openssl::ssl::error::SslError; - from!(SslError::StreamError(io::Error::new(io::ErrorKind::Other, "ssl negotiation")) => Io(..)); + from!(SslError::StreamError( + io::Error::new(io::ErrorKind::Other, "ssl negotiation")) => Io(..)); from_and_cause!(SslError::SslSessionClosed => Ssl(..)); } } diff --git a/src/header/common/accept.rs b/src/header/common/accept.rs index 9433280c..c425a94b 100644 --- a/src/header/common/accept.rs +++ b/src/header/common/accept.rs @@ -61,11 +61,12 @@ header! { #[doc="headers.set("] #[doc=" Accept(vec!["] #[doc=" qitem(Mime(TopLevel::Text, SubLevel::Html, vec![])),"] - #[doc=" qitem(Mime(TopLevel::Application, SubLevel::Ext(\"xhtml+xml\".to_owned()), vec![])),"] + #[doc=" qitem(Mime(TopLevel::Application,"] + #[doc=" SubLevel::Ext(\"xhtml+xml\".to_owned()), vec![])),"] #[doc=" QualityItem::new(Mime(TopLevel::Application, SubLevel::Xml, vec![]),"] #[doc=" Quality(900)),"] - #[doc=" qitem(Mime(TopLevel::Image, SubLevel::Ext(\"webp\".to_owned()), vec![])), -"] + #[doc=" qitem(Mime(TopLevel::Image,"] + #[doc=" SubLevel::Ext(\"webp\".to_owned()), vec![])),"] #[doc=" QualityItem::new(Mime(TopLevel::Star, SubLevel::Star, vec![]),"] #[doc=" Quality(800))"] #[doc=" ])"] diff --git a/src/header/common/access_control_allow_origin.rs b/src/header/common/access_control_allow_origin.rs index 2441aeb5..0fd01a2e 100644 --- a/src/header/common/access_control_allow_origin.rs +++ b/src/header/common/access_control_allow_origin.rs @@ -20,7 +20,7 @@ use header::{Header, HeaderFormat}; /// * `null` /// * `*` /// * `http://google.com/` -/// +/// /// # Examples /// ``` /// use hyper::header::{Headers, AccessControlAllowOrigin}; diff --git a/src/header/common/authorization.rs b/src/header/common/authorization.rs index 37757916..d8179405 100644 --- a/src/header/common/authorization.rs +++ b/src/header/common/authorization.rs @@ -21,7 +21,7 @@ use header::{Header, HeaderFormat}; /// # Example values /// * `Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==` /// * `Bearer fpKL54jvWmEGVoRdCNjG` -/// +/// /// # Examples /// ``` /// use hyper::header::{Headers, Authorization}; diff --git a/src/header/common/connection.rs b/src/header/common/connection.rs index e5182b2e..cbc0156a 100644 --- a/src/header/common/connection.rs +++ b/src/header/common/connection.rs @@ -131,6 +131,7 @@ mod tests { fn test_parse() { assert_eq!(Connection::close(),parse_option(b"close".to_vec())); assert_eq!(Connection::keep_alive(),parse_option(b"keep-alive".to_vec())); - assert_eq!(Connection(vec![ConnectionHeader(UniCase("upgrade".to_owned()))]),parse_option(b"upgrade".to_vec())); + assert_eq!(Connection(vec![ConnectionHeader(UniCase("upgrade".to_owned()))]), + parse_option(b"upgrade".to_vec())); } } diff --git a/src/header/common/cookie.rs b/src/header/common/cookie.rs index acc0685f..904a1b5a 100644 --- a/src/header/common/cookie.rs +++ b/src/header/common/cookie.rs @@ -17,7 +17,7 @@ use cookie::CookieJar; /// # Example values /// * `SID=31d4d96e407aad42` /// * `SID=31d4d96e407aad42; lang=en-US` -/// +/// /// # Example /// ``` /// # extern crate hyper; diff --git a/src/header/common/referer.rs b/src/header/common/referer.rs index d73635ec..2f6c8329 100644 --- a/src/header/common/referer.rs +++ b/src/header/common/referer.rs @@ -29,7 +29,7 @@ header! { #[doc="let mut headers = Headers::new();"] #[doc="headers.set(Referer(\"http://www.example.com/index.html\".to_owned()));"] #[doc="```"] - // TODO: Use URL + // TODO Use URL (Referer, "Referer") => [String] test_referer { diff --git a/src/header/common/set_cookie.rs b/src/header/common/set_cookie.rs index 62f70807..ba095615 100644 --- a/src/header/common/set_cookie.rs +++ b/src/header/common/set_cookie.rs @@ -61,7 +61,7 @@ use cookie::CookieJar; /// # extern crate cookie; /// # fn main() { /// // extern crate cookie; -/// +/// /// use hyper::header::{Headers, SetCookie}; /// use cookie::Cookie as CookiePair; /// diff --git a/src/header/common/upgrade.rs b/src/header/common/upgrade.rs index 638dc366..35d1d822 100644 --- a/src/header/common/upgrade.rs +++ b/src/header/common/upgrade.rs @@ -41,9 +41,10 @@ header! { #[doc="headers.set("] #[doc=" Upgrade(vec!["] #[doc=" Protocol::new(ProtocolName::Http, Some(\"2.0\".to_owned())),"] - #[doc=" Protocol::new(ProtocolName::Unregistered(\"SHTTP\".to_owned()), Some(\"1.3\".to_owned())),"] - #[doc=" Protocol::new(ProtocolName::Unregistered(\"IRC\".to_owned()), Some(\"6.9\".to_owned())),"] - #[doc=" Protocol::new(ProtocolName::Unregistered(\"RTA\".to_owned()), Some(\"x11\".to_owned())),"] + #[doc=" Protocol::new(ProtocolName::Unregistered(\"SHTTP\".to_owned()),"] + #[doc=" Some(\"1.3\".to_owned())),"] + #[doc=" Protocol::new(ProtocolName::Unregistered(\"IRC\".to_owned()),"] + #[doc=" Some(\"6.9\".to_owned())),"] #[doc=" ])"] #[doc=");"] #[doc="```"] @@ -56,7 +57,8 @@ header! { vec![b"HTTP/2.0, SHTTP/1.3, IRC/6.9, RTA/x11"], Some(Upgrade(vec![ Protocol::new(ProtocolName::Http, Some("2.0".to_owned())), - Protocol::new(ProtocolName::Unregistered("SHTTP".to_owned()), Some("1.3".to_owned())), + Protocol::new(ProtocolName::Unregistered("SHTTP".to_owned()), + Some("1.3".to_owned())), Protocol::new(ProtocolName::Unregistered("IRC".to_owned()), Some("6.9".to_owned())), Protocol::new(ProtocolName::Unregistered("RTA".to_owned()), Some("x11".to_owned())), ]))); diff --git a/src/header/internals/item.rs b/src/header/internals/item.rs index 81a63743..e735e9e5 100644 --- a/src/header/internals/item.rs +++ b/src/header/internals/item.rs @@ -85,7 +85,8 @@ impl Item { } #[inline] -fn parse(raw: &Vec>) -> ::Result> { +fn parse(raw: &Vec>) -> + ::Result> { Header::parse_header(&raw[..]).map(|h: H| { // FIXME: Use Type ascription let h: Box = Box::new(h); @@ -101,7 +102,8 @@ impl fmt::Display for Item { match from_utf8(&part[..]) { Ok(s) => try!(f.write_str(s)), Err(e) => { - error!("raw header value is not utf8. header={:?}, error={:?}", part, e); + error!("raw header value is not utf8. header={:?}, error={:?}", + part, e); return Err(fmt::Error); } } diff --git a/src/header/mod.rs b/src/header/mod.rs index 9dd8f30b..7044d29f 100644 --- a/src/header/mod.rs +++ b/src/header/mod.rs @@ -237,7 +237,8 @@ impl Headers { /// # let mut headers = Headers::new(); /// headers.set_raw("content-length", vec![b"5".to_vec()]); /// ``` - pub fn set_raw> + fmt::Debug>(&mut self, name: K, value: Vec>) { + pub fn set_raw> + fmt::Debug>(&mut self, name: K, + value: Vec>) { trace!("Headers.set_raw( {:?}, {:?} )", name, value); self.data.insert(UniCase(CowStr(name.into())), Item::new_raw(value)); } @@ -252,12 +253,14 @@ impl Headers { /// Get a reference to the header field's value, if it exists. pub fn get(&self) -> Option<&H> { - self.data.get(&UniCase(CowStr(Cow::Borrowed(header_name::())))).and_then(Item::typed::) + self.data.get(&UniCase(CowStr(Cow::Borrowed(header_name::())))) + .and_then(Item::typed::) } /// Get a mutable reference to the header field's value, if it exists. pub fn get_mut(&mut self) -> Option<&mut H> { - self.data.get_mut(&UniCase(CowStr(Cow::Borrowed(header_name::())))).and_then(Item::typed_mut::) + self.data.get_mut(&UniCase(CowStr(Cow::Borrowed(header_name::())))) + .and_then(Item::typed_mut::) } /// Returns a boolean of whether a certain header is in the map. @@ -509,7 +512,8 @@ mod tests { let accept = Header::parse_header([b"text/plain".to_vec()].as_ref()); assert_eq!(accept.ok(), Some(Accept(vec![text_plain.clone()]))); - let accept = Header::parse_header([b"application/vnd.github.v3.full+json; q=0.5, text/plain".to_vec()].as_ref()); + let bytevec = [b"application/vnd.github.v3.full+json; q=0.5, text/plain".to_vec()]; + let accept = Header::parse_header(bytevec.as_ref()); assert_eq!(accept.ok(), Some(Accept(vec![application_vendor, text_plain]))); } @@ -568,7 +572,8 @@ mod tests { #[test] fn test_different_reads() { - let headers = Headers::from_raw(&raw!(b"Content-Length: 10", b"Content-Type: text/plain")).unwrap(); + let headers = Headers::from_raw( + &raw!(b"Content-Length: 10", b"Content-Type: text/plain")).unwrap(); let ContentLength(_) = *headers.get::().unwrap(); let ContentType(_) = *headers.get::().unwrap(); } diff --git a/src/header/shared/entity.rs b/src/header/shared/entity.rs index 0b2afe7e..30f5c6c0 100644 --- a/src/header/shared/entity.rs +++ b/src/header/shared/entity.rs @@ -52,10 +52,22 @@ impl EntityTag { /// # Panics /// If the tag contains invalid characters. pub fn new(weak: bool, tag: String) -> EntityTag { - match check_slice_validity(&tag) { - true => EntityTag { weak: weak, tag: tag }, - false => panic!("Invalid tag: {:?}", tag), - } + assert!(check_slice_validity(&tag), "Invalid tag: {:?}", tag); + EntityTag { weak: weak, tag: tag } + } + + /// Constructs a new weak EntityTag. + /// # Panics + /// If the tag contains invalid characters. + pub fn weak(tag: String) -> EntityTag { + EntityTag::new(true, tag) + } + + /// Constructs a new strong EntityTag. + /// # Panics + /// If the tag contains invalid characters. + pub fn strong(tag: String) -> EntityTag { + EntityTag::new(false, tag) } /// Get the tag. @@ -67,16 +79,14 @@ impl EntityTag { /// # Panics /// If the tag contains invalid characters. pub fn set_tag(&mut self, tag: String) { - match check_slice_validity(&tag[..]) { - true => self.tag = tag, - false => panic!("Invalid tag: {:?}", tag), - } + assert!(check_slice_validity(&tag), "Invalid tag: {:?}", tag); + self.tag = tag } /// For strong comparison two entity-tags are equivalent if both are not weak and their /// opaque-tags match character-by-character. pub fn strong_eq(&self, other: &EntityTag) -> bool { - self.weak == false && other.weak == false && self.tag == other.tag + !self.weak && !other.weak && self.tag == other.tag } /// For weak comparison two entity-tags are equivalent if their @@ -134,11 +144,15 @@ mod tests { #[test] fn test_etag_parse_success() { // Expected success - assert_eq!("\"foobar\"".parse::().unwrap(), EntityTag::new(false, "foobar".to_owned())); - assert_eq!("\"\"".parse::().unwrap(), EntityTag::new(false, "".to_owned())); - assert_eq!("W/\"weaktag\"".parse::().unwrap(), EntityTag::new(true, "weaktag".to_owned())); - assert_eq!("W/\"\x65\x62\"".parse::().unwrap(), EntityTag::new(true, "\x65\x62".to_owned())); - assert_eq!("W/\"\"".parse::().unwrap(), EntityTag::new(true, "".to_owned())); + assert_eq!("\"foobar\"".parse::().unwrap(), + EntityTag::strong("foobar".to_owned())); + assert_eq!("\"\"".parse::().unwrap(), + EntityTag::strong("".to_owned())); + assert_eq!("W/\"weaktag\"".parse::().unwrap(), + EntityTag::weak("weaktag".to_owned())); + assert_eq!("W/\"\x65\x62\"".parse::().unwrap(), + EntityTag::weak("\x65\x62".to_owned())); + assert_eq!("W/\"\"".parse::().unwrap(), EntityTag::weak("".to_owned())); } #[test] @@ -154,11 +168,11 @@ mod tests { #[test] fn test_etag_fmt() { - assert_eq!(format!("{}", EntityTag::new(false, "foobar".to_owned())), "\"foobar\""); - assert_eq!(format!("{}", EntityTag::new(false, "".to_owned())), "\"\""); - assert_eq!(format!("{}", EntityTag::new(true, "weak-etag".to_owned())), "W/\"weak-etag\""); - assert_eq!(format!("{}", EntityTag::new(true, "\u{0065}".to_owned())), "W/\"\x65\""); - assert_eq!(format!("{}", EntityTag::new(true, "".to_owned())), "W/\"\""); + assert_eq!(format!("{}", EntityTag::strong("foobar".to_owned())), "\"foobar\""); + assert_eq!(format!("{}", EntityTag::strong("".to_owned())), "\"\""); + assert_eq!(format!("{}", EntityTag::weak("weak-etag".to_owned())), "W/\"weak-etag\""); + assert_eq!(format!("{}", EntityTag::weak("\u{0065}".to_owned())), "W/\"\x65\""); + assert_eq!(format!("{}", EntityTag::weak("".to_owned())), "W/\"\""); } #[test] @@ -169,32 +183,32 @@ mod tests { // | `W/"1"` | `W/"2"` | no match | no match | // | `W/"1"` | `"1"` | no match | match | // | `"1"` | `"1"` | match | match | - let mut etag1 = EntityTag::new(true, "1".to_owned()); - let mut etag2 = EntityTag::new(true, "1".to_owned()); - assert_eq!(etag1.strong_eq(&etag2), false); - assert_eq!(etag1.weak_eq(&etag2), true); - assert_eq!(etag1.strong_ne(&etag2), true); - assert_eq!(etag1.weak_ne(&etag2), false); + let mut etag1 = EntityTag::weak("1".to_owned()); + let mut etag2 = EntityTag::weak("1".to_owned()); + assert!(!etag1.strong_eq(&etag2)); + assert!(etag1.weak_eq(&etag2)); + assert!(etag1.strong_ne(&etag2)); + assert!(!etag1.weak_ne(&etag2)); - etag1 = EntityTag::new(true, "1".to_owned()); - etag2 = EntityTag::new(true, "2".to_owned()); - assert_eq!(etag1.strong_eq(&etag2), false); - assert_eq!(etag1.weak_eq(&etag2), false); - assert_eq!(etag1.strong_ne(&etag2), true); - assert_eq!(etag1.weak_ne(&etag2), true); + etag1 = EntityTag::weak("1".to_owned()); + etag2 = EntityTag::weak("2".to_owned()); + assert!(!etag1.strong_eq(&etag2)); + assert!(!etag1.weak_eq(&etag2)); + assert!(etag1.strong_ne(&etag2)); + assert!(etag1.weak_ne(&etag2)); - etag1 = EntityTag::new(true, "1".to_owned()); - etag2 = EntityTag::new(false, "1".to_owned()); - assert_eq!(etag1.strong_eq(&etag2), false); - assert_eq!(etag1.weak_eq(&etag2), true); - assert_eq!(etag1.strong_ne(&etag2), true); - assert_eq!(etag1.weak_ne(&etag2), false); + etag1 = EntityTag::weak("1".to_owned()); + etag2 = EntityTag::strong("1".to_owned()); + assert!(!etag1.strong_eq(&etag2)); + assert!(etag1.weak_eq(&etag2)); + assert!(etag1.strong_ne(&etag2)); + assert!(!etag1.weak_ne(&etag2)); - etag1 = EntityTag::new(false, "1".to_owned()); - etag2 = EntityTag::new(false, "1".to_owned()); - assert_eq!(etag1.strong_eq(&etag2), true); - assert_eq!(etag1.weak_eq(&etag2), true); - assert_eq!(etag1.strong_ne(&etag2), false); - assert_eq!(etag1.weak_ne(&etag2), false); + etag1 = EntityTag::strong("1".to_owned()); + etag2 = EntityTag::strong("1".to_owned()); + assert!(etag1.strong_eq(&etag2)); + assert!(etag1.weak_eq(&etag2)); + assert!(!etag1.strong_ne(&etag2)); + assert!(!etag1.weak_ne(&etag2)); } } diff --git a/src/http/h1.rs b/src/http/h1.rs index c36323a1..abfe8dd0 100644 --- a/src/http/h1.rs +++ b/src/http/h1.rs @@ -280,7 +280,8 @@ impl Http11Protocol { struct ConnAdapter(C); -impl + Send + Sync, S: NetworkStream + Send> NetworkConnector for ConnAdapter { +impl + Send + Sync, S: NetworkStream + Send> + NetworkConnector for ConnAdapter { type Stream = Box; #[inline] fn connect(&self, host: &str, port: u16, scheme: &str) @@ -668,7 +669,8 @@ fn try_parse, I>(rdr: &mut BufReader) -> TryP #[doc(hidden)] trait TryParse { type Subject; - fn try_parse<'a>(headers: &'a mut [httparse::Header<'a>], buf: &'a [u8]) -> TryParseResult; + fn try_parse<'a>(headers: &'a mut [httparse::Header<'a>], buf: &'a [u8]) -> + TryParseResult; } type TryParseResult = Result, usize)>, Error>; @@ -676,7 +678,8 @@ type TryParseResult = Result, usize)>, Error>; impl<'a> TryParse for httparse::Request<'a, 'a> { type Subject = (Method, RequestUri); - fn try_parse<'b>(headers: &'b mut [httparse::Header<'b>], buf: &'b [u8]) -> TryParseResult<(Method, RequestUri)> { + fn try_parse<'b>(headers: &'b mut [httparse::Header<'b>], buf: &'b [u8]) -> + TryParseResult<(Method, RequestUri)> { let mut req = httparse::Request::new(headers); Ok(match try!(req.parse(buf)) { httparse::Status::Complete(len) => { @@ -697,7 +700,8 @@ impl<'a> TryParse for httparse::Request<'a, 'a> { impl<'a> TryParse for httparse::Response<'a, 'a> { type Subject = RawStatus; - fn try_parse<'b>(headers: &'b mut [httparse::Header<'b>], buf: &'b [u8]) -> TryParseResult { + fn try_parse<'b>(headers: &'b mut [httparse::Header<'b>], buf: &'b [u8]) -> + TryParseResult { let mut res = httparse::Response::new(headers); Ok(match try!(res.parse(buf)) { httparse::Status::Complete(len) => { @@ -773,7 +777,8 @@ mod tests { } fn read_err(s: &str) { - assert_eq!(read_chunk_size(&mut s.as_bytes()).unwrap_err().kind(), io::ErrorKind::InvalidInput); + assert_eq!(read_chunk_size(&mut s.as_bytes()).unwrap_err().kind(), + io::ErrorKind::InvalidInput); } read("1\r\n", 1); diff --git a/src/mock.rs b/src/mock.rs index bb4716c6..d9d3d648 100644 --- a/src/mock.rs +++ b/src/mock.rs @@ -144,7 +144,8 @@ macro_rules! mock_connector ( impl ::net::NetworkConnector for $name { type Stream = ::mock::MockStream; - fn connect(&self, host: &str, port: u16, scheme: &str) -> $crate::Result<::mock::MockStream> { + fn connect(&self, host: &str, port: u16, scheme: &str) + -> $crate::Result<::mock::MockStream> { use std::collections::HashMap; use std::io::Cursor; debug!("MockStream::connect({:?}, {:?}, {:?})", host, port, scheme); diff --git a/src/server/listener.rs b/src/server/listener.rs index 7c4463f1..5fadc0fb 100644 --- a/src/server/listener.rs +++ b/src/server/listener.rs @@ -77,4 +77,3 @@ impl Drop for Sentinel { let _ = self.supervisor.send(self.value.take().unwrap()); } } - diff --git a/src/server/mod.rs b/src/server/mod.rs index 57675a87..60352c6c 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -187,7 +187,8 @@ impl Server { } /// Binds to a socket and starts handling connections with the provided /// number of threads. - pub fn handle_threads(self, handler: H, threads: usize) -> ::Result { + pub fn handle_threads(self, handler: H, + threads: usize) -> ::Result { with_listener(handler, self.listener, threads) } } @@ -232,7 +233,8 @@ impl<'a, H: Handler + 'static> Worker<'a, H> { debug!("keep_alive loop ending for {}", addr); } - fn keep_alive_loop(&self, mut rdr: BufReader<&mut NetworkStream>, mut wrt: W, addr: SocketAddr) { + fn keep_alive_loop(&self, mut rdr: BufReader<&mut NetworkStream>, + mut wrt: W, addr: SocketAddr) { let mut keep_alive = true; while keep_alive { let req = match Request::new(&mut rdr, addr) { @@ -277,7 +279,7 @@ impl<'a, H: Handler + 'static> Worker<'a, H> { debug!("keep_alive = {:?} for {}", keep_alive, addr); } - + } fn handle_expect(&self, req: &Request, wrt: &mut W) -> bool { diff --git a/src/server/response.rs b/src/server/response.rs index b2d493e2..d836b1e6 100644 --- a/src/server/response.rs +++ b/src/server/response.rs @@ -81,7 +81,8 @@ impl<'a, W: Any> Response<'a, W> { fn write_head(&mut self) -> io::Result { debug!("writing head: {:?} {:?}", self.version, self.status); - try!(write!(&mut self.body, "{} {}{}{}", self.version, self.status, CR as char, LF as char)); + try!(write!(&mut self.body, "{} {}{}{}", self.version, self.status, + CR as char, LF as char)); if !self.headers.has::() { self.headers.set(header::Date(header::HttpDate(now_utc()))); @@ -123,7 +124,8 @@ impl<'a, W: Any> Response<'a, W> { impl<'a> Response<'a, Fresh> { /// Creates a new Response that can be used to write to a network stream. #[inline] - pub fn new(stream: &'a mut (Write + 'a), headers: &'a mut header::Headers) -> Response<'a, Fresh> { + pub fn new(stream: &'a mut (Write + 'a), headers: &'a mut header::Headers) -> + Response<'a, Fresh> { Response { status: status::StatusCode::Ok, version: version::HttpVersion::Http11, @@ -168,7 +170,8 @@ impl<'a> Response<'a, Fresh> { stream.end() } - /// Consume this Response, writing the Headers and Status and creating a Response + /// Consume this Response, writing the Headers and Status and + /// creating a Response pub fn start(mut self) -> io::Result> { let body_type = try!(self.write_head()); let (version, body, status, headers) = self.deconstruct(); diff --git a/src/status.rs b/src/status.rs index 101305f5..c46fd9b3 100644 --- a/src/status.rs +++ b/src/status.rs @@ -691,7 +691,8 @@ mod tests { validate(404, NotFound, BadRequest, Some("Not Found")); validate(405, MethodNotAllowed, BadRequest, Some("Method Not Allowed")); validate(406, NotAcceptable, BadRequest, Some("Not Acceptable")); - validate(407, ProxyAuthenticationRequired, BadRequest, Some("Proxy Authentication Required")); + validate(407, ProxyAuthenticationRequired, BadRequest, + Some("Proxy Authentication Required")); validate(408, RequestTimeout, BadRequest, Some("Request Timeout")); validate(409, Conflict, BadRequest, Some("Conflict")); validate(410, Gone, BadRequest, Some("Gone")); @@ -709,19 +710,22 @@ mod tests { validate(426, UpgradeRequired, BadRequest, Some("Upgrade Required")); validate(428, PreconditionRequired, BadRequest, Some("Precondition Required")); validate(429, TooManyRequests, BadRequest, Some("Too Many Requests")); - validate(431, RequestHeaderFieldsTooLarge, BadRequest, Some("Request Header Fields Too Large")); + validate(431, RequestHeaderFieldsTooLarge, BadRequest, + Some("Request Header Fields Too Large")); validate(500, InternalServerError, InternalServerError, Some("Internal Server Error")); validate(501, NotImplemented, InternalServerError, Some("Not Implemented")); validate(502, BadGateway, InternalServerError, Some("Bad Gateway")); validate(503, ServiceUnavailable, InternalServerError, Some("Service Unavailable")); validate(504, GatewayTimeout, InternalServerError, Some("Gateway Timeout")); - validate(505, HttpVersionNotSupported, InternalServerError, Some("HTTP Version Not Supported")); + validate(505, HttpVersionNotSupported, InternalServerError, + Some("HTTP Version Not Supported")); validate(506, VariantAlsoNegotiates, InternalServerError, Some("Variant Also Negotiates")); validate(507, InsufficientStorage, InternalServerError, Some("Insufficient Storage")); validate(508, LoopDetected, InternalServerError, Some("Loop Detected")); validate(510, NotExtended, InternalServerError, Some("Not Extended")); - validate(511, NetworkAuthenticationRequired, InternalServerError, Some("Network Authentication Required")); + validate(511, NetworkAuthenticationRequired, InternalServerError, + Some("Network Authentication Required")); } } diff --git a/src/uri.rs b/src/uri.rs index b2e09e87..c053b902 100644 --- a/src/uri.rs +++ b/src/uri.rs @@ -83,5 +83,3 @@ fn test_uri_fromstr() { read("hyper.rs", RequestUri::Authority("hyper.rs".to_owned())); read("/", RequestUri::AbsolutePath("/".to_owned())); } - - diff --git a/src/version.rs b/src/version.rs index af7aa8bc..ad4c5c87 100644 --- a/src/version.rs +++ b/src/version.rs @@ -29,4 +29,3 @@ impl fmt::Display for HttpVersion { }) } } -