Merge pull request #340 from globin/rustup-4db0b3246-2015-02-25

Update to 4db0b3246 2015-02-25

src/header/common/accept_language.rs

@@ -13,7 +13,7 @@ pub struct Language{
 impl FromStr for Language {
     type Err = ();
     fn from_str(s: &str) -> Result<Language, ()> {
-        let mut i = s.split_str("-");
+        let mut i = s.split("-");
         let p = i.next();
         let s = i.next();
         match (p, s) {

src/header/common/transfer_encoding.rs

@@ -1,4 +1,4 @@
-use header::{self, Encoding};
+use header::Encoding;
 
 /// The `Transfer-Encoding` header.
 ///

src/header/mod.rs

@@ -645,7 +645,7 @@ mod tests {
 
         let s = headers.to_string();
         // hashmap's iterators have arbitrary order, so we must sort first
-        let mut pieces = s.split_str("\r\n").collect::<Vec<&str>>();
+        let mut pieces = s.split("\r\n").collect::<Vec<&str>>();
         pieces.sort();
         let s = pieces.into_iter().rev().collect::<Vec<&str>>().connect("\r\n");
         assert_eq!(s, "Host: foo.bar\r\nContent-Length: 15\r\n");

src/net.rs

@@ -33,6 +33,7 @@ pub struct Streaming;
 
 /// An abstraction to listen for connections on a certain port.
 pub trait NetworkListener {
+    /// Type of Acceptor
     type Acceptor: NetworkAcceptor;
     /// Listens on a socket.
     fn listen<To: ToSocketAddr>(&mut self, addr: To) -> IoResult<Self::Acceptor>;
@@ -40,6 +41,7 @@ pub trait NetworkListener {
 
 /// An abstraction to receive `NetworkStream`s.
 pub trait NetworkAcceptor: Clone + Send {
+    /// Type of Stream to receive
     type Stream: NetworkStream + Send + Clone;
 
     /// Returns an iterator of streams.
@@ -89,6 +91,7 @@ impl<T: NetworkStream + Send + Clone> StreamClone for T {
 
 /// A connector creates a NetworkStream.
 pub trait NetworkConnector {
+    /// Type of Stream to create
     type Stream: NetworkStream + Send;
     /// Connect to a remote address.
     fn connect(&mut self, host: &str, port: Port, scheme: &str) -> IoResult<Self::Stream>;