rust upgrade

Author: seanmonstar

examples/server.rs

@@ -9,6 +9,7 @@ use std::io::net::ip::Ipv4Addr;
 use hyper::{Get, Post};
 use hyper::header::common::ContentLength;
 use hyper::server::{Server, Request, Response};
+use hyper::uri::RequestUri::AbsolutePath;
 
 macro_rules! try_return(
     ($e:expr) => {{
@@ -21,7 +22,7 @@ macro_rules! try_return(
 
 fn echo(mut req: Request, mut res: Response) {
     match req.uri {
-        hyper::uri::AbsolutePath(ref path) => match (&req.method, path.as_slice()) {
+        AbsolutePath(ref path) => match (&req.method, path.as_slice()) {
             (&Get, "/") | (&Get, "/echo") => {
                 let out = b"Try POST /echo";
 
@@ -33,7 +34,7 @@ fn echo(mut req: Request, mut res: Response) {
             },
             (&Post, "/echo") => (), // fall through, fighting mutable borrows
             _ => {
-                *res.status_mut() = hyper::status::NotFound;
+                *res.status_mut() = hyper::NotFound;
                 try_return!(res.start().and_then(|res| res.end()));
                 return;
             }

src/client/response.rs

@@ -95,7 +95,7 @@ impl Reader for Response {
 
 #[cfg(test)]
 mod tests {
-    use std::borrow::Borrowed;
+    use std::borrow::Cow::Borrowed;
     use std::boxed::BoxAny;
     use std::io::BufferedReader;
 

src/header/common/accept.rs

@@ -14,7 +14,9 @@ use mime::Mime;
 /// ```
 /// # use hyper::header::Headers;
 /// # use hyper::header::common::Accept;
-/// use hyper::mime::{Mime, Text, Html, Xml};
+/// use hyper::mime::Mime;
+/// use hyper::mime::TopLevel::Text;
+/// use hyper::mime::SubLevel::{Html, Xml};
 /// # let mut headers = Headers::new();
 /// headers.set(Accept(vec![ Mime(Text, Html, vec![]), Mime(Text, Xml, vec![]) ]));
 /// ```

src/header/common/transfer_encoding.rs

@@ -28,7 +28,8 @@ deref!(TransferEncoding -> Vec<Encoding>)
 /// Example:
 ///
 /// ```
-/// # use hyper::header::common::transfer_encoding::{TransferEncoding, Gzip, Chunked};
+/// # use hyper::header::TransferEncoding;
+/// # use hyper::header::transfer_encoding::Encoding::{Gzip, Chunked};
 /// # use hyper::header::Headers;
 /// # let mut headers = Headers::new();
 /// headers.set(TransferEncoding(vec![Gzip, Chunked]));

src/header/mod.rs

@@ -496,9 +496,11 @@ impl<'a, H: HeaderFormat> Show for HeaderFormatter<'a, H> {
 mod tests {
     use std::io::MemReader;
     use std::fmt;
-    use std::borrow::Borrowed;
+    use std::borrow::Cow::Borrowed;
     use std::hash::sip::hash;
-    use mime::{Mime, Text, Plain};
+    use mime::Mime;
+    use mime::TopLevel::Text;
+    use mime::SubLevel::Plain;
     use super::CaseInsensitive;
     use super::{Headers, Header, HeaderFormat};
     use super::common::{ContentLength, ContentType, Accept, Host};

src/http.rs

@@ -672,7 +672,7 @@ fn expect(r: IoResult<u8>, expected: u8) -> HttpResult<()> {
 #[cfg(test)]
 mod tests {
     use std::io::{mod, MemReader, MemWriter};
-    use std::borrow::{Borrowed, Owned};
+    use std::borrow::Cow::{Borrowed, Owned};
     use test::Bencher;
     use uri::RequestUri;
     use uri::RequestUri::{Star, AbsoluteUri, AbsolutePath, Authority};

src/status.rs

@@ -20,7 +20,7 @@ use std::mem::transmute;
 /// `self.class().default_code()`:
 ///
 /// ```rust
-/// # use hyper::status::{Code123, Continue};
+/// # use hyper::status::StatusCode::{Code123, Continue};
 /// assert_eq!(Code123.class().default_code(), Continue);
 /// ```
 pub enum StatusCode {
@@ -1572,7 +1572,7 @@ impl StatusCode {
 /// Formats the status code, *including* the canonical reason.
 ///
 /// ```rust
-/// # use hyper::status::{ImATeapot, Code123};
+/// # use hyper::status::StatusCode::{ImATeapot, Code123};
 /// assert_eq!(format!("{}", ImATeapot).as_slice(),
 ///            "418 I'm a teapot");
 /// assert_eq!(format!("{}", Code123).as_slice(),
@@ -1709,7 +1709,8 @@ impl StatusClass {
     /// produce `BadRequest` (400):
     ///
     /// ```rust
-    /// # use hyper::status::{ClientError, BadRequest};
+    /// # use hyper::status::StatusClass::ClientError;
+    /// # use hyper::status::StatusCode::BadRequest;
     /// assert_eq!(ClientError.default_code(), BadRequest);
     /// ```
     ///
@@ -1733,7 +1734,7 @@ impl StatusClass {
     /// This is demonstrated thusly (I’ll use 432 rather than 431 as 431 *is* now in use):
     ///
     /// ```rust
-    /// # use hyper::status::{Code432, BadRequest};
+    /// # use hyper::status::StatusCode::{Code432, BadRequest};
     /// // Suppose we have received this status code.
     /// let status = Code432;
     ///