From 1b6e6a040fa26a8b3855ac46ccbcd5ee78065c71 Mon Sep 17 00:00:00 2001
From: Robin Gloster <robin@loc-com.de>
Date: Thu, 26 Feb 2015 19:06:15 +0100
Subject: [PATCH] fix(rustup): str.split and associated type changes

---
 src/header/common/accept_language.rs   | 2 +-
 src/header/common/transfer_encoding.rs | 2 +-
 src/header/mod.rs                      | 2 +-
 src/net.rs                             | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/header/common/accept_language.rs b/src/header/common/accept_language.rs
index d1f337c45d..1a3dc206b3 100644
--- a/src/header/common/accept_language.rs
+++ b/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) {
diff --git a/src/header/common/transfer_encoding.rs b/src/header/common/transfer_encoding.rs
index de169d71ae..c031f2f55d 100644
--- a/src/header/common/transfer_encoding.rs
+++ b/src/header/common/transfer_encoding.rs
@@ -1,4 +1,4 @@
-use header::{self, Encoding};
+use header::Encoding;
 
 /// The `Transfer-Encoding` header.
 ///
diff --git a/src/header/mod.rs b/src/header/mod.rs
index d38c41433f..46c9dd8256 100644
--- a/src/header/mod.rs
+++ b/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");
diff --git a/src/net.rs b/src/net.rs
index f7ff2554f6..2ed32668be 100644
--- a/src/net.rs
+++ b/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>;