Update to latest Rust
Signed-off-by: Peter Atashian <retep998@gmail.com>
This commit is contained in:
		| @@ -6,7 +6,7 @@ | |||||||
| //! are already provided, such as `Host`, `ContentType`, `UserAgent`, and others. | //! are already provided, such as `Host`, `ContentType`, `UserAgent`, and others. | ||||||
| use std::any::Any; | use std::any::Any; | ||||||
| use std::ascii::{AsciiExt, AsciiCast}; | use std::ascii::{AsciiExt, AsciiCast}; | ||||||
| use std::borrow::{Borrowed, Owned}; | use std::borrow::Cow::{Borrowed, Owned}; | ||||||
| use std::fmt::{mod, Show}; | use std::fmt::{mod, Show}; | ||||||
| use std::intrinsics::TypeId; | use std::intrinsics::TypeId; | ||||||
| use std::raw::TraitObject; | use std::raw::TraitObject; | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| //! Pieces pertaining to the HTTP message protocol. | //! Pieces pertaining to the HTTP message protocol. | ||||||
| use std::borrow::{Borrowed, Owned}; | use std::borrow::Cow::{Borrowed, Owned}; | ||||||
| use std::cmp::min; | use std::cmp::min; | ||||||
| use std::fmt; | use std::fmt; | ||||||
| use std::io::{mod, Reader, IoResult, BufWriter}; | use std::io::{mod, Reader, IoResult, BufWriter}; | ||||||
|   | |||||||
| @@ -12,7 +12,8 @@ use std::raw::{mod, TraitObject}; | |||||||
| use std::sync::{Arc, Mutex}; | use std::sync::{Arc, Mutex}; | ||||||
|  |  | ||||||
| use uany::UncheckedBoxAnyDowncast; | use uany::UncheckedBoxAnyDowncast; | ||||||
| use openssl::ssl::{SslStream, SslContext, Sslv23}; | use openssl::ssl::{SslStream, SslContext}; | ||||||
|  | use openssl::ssl::SslMethod::Sslv23; | ||||||
| use openssl::ssl::error::{SslError, StreamError, OpenSslErrors, SslSessionClosed}; | use openssl::ssl::error::{SslError, StreamError, OpenSslErrors, SslSessionClosed}; | ||||||
|  |  | ||||||
| use self::HttpStream::{Http, Https}; | use self::HttpStream::{Http, Https}; | ||||||
| @@ -103,7 +104,7 @@ impl UncheckedBoxAnyDowncast for Box<NetworkStream + Send> { | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| impl<'a> AnyRefExt<'a> for &'a NetworkStream + 'a { | impl<'a> AnyRefExt<'a> for &'a (NetworkStream + 'a) { | ||||||
|     #[inline] |     #[inline] | ||||||
|     fn is<T: 'static>(self) -> bool { |     fn is<T: 'static>(self) -> bool { | ||||||
|         self.get_type_id() == TypeId::of::<T>() |         self.get_type_id() == TypeId::of::<T>() | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ use http::HttpReader; | |||||||
| use http::HttpReader::{SizedReader, ChunkedReader, EmptyReader}; | use http::HttpReader::{SizedReader, ChunkedReader, EmptyReader}; | ||||||
| use uri::RequestUri; | use uri::RequestUri; | ||||||
|  |  | ||||||
| pub type InternalReader<'a> = &'a mut Reader + 'a; | pub type InternalReader<'a> = &'a mut (Reader + 'a); | ||||||
|  |  | ||||||
| /// A request bundles several parts of an incoming `NetworkStream`, given to a `Handler`. | /// A request bundles several parts of an incoming `NetworkStream`, given to a `Handler`. | ||||||
| pub struct Request<'a> { | pub struct Request<'a> { | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ use status; | |||||||
| use net::{Fresh, Streaming}; | use net::{Fresh, Streaming}; | ||||||
| use version; | use version; | ||||||
|  |  | ||||||
| pub type InternalWriter<'a> = &'a mut Writer + 'a; | pub type InternalWriter<'a> = &'a mut (Writer + 'a); | ||||||
|  |  | ||||||
| /// The outgoing half for a Tcp connection, created by a `Server` and given to a `Handler`. | /// The outgoing half for a Tcp connection, created by a `Server` and given to a `Handler`. | ||||||
| pub struct Response<'a, W = Fresh> { | pub struct Response<'a, W = Fresh> { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user