Update to rust-master.

Author: am0d

src/codegen/branchify.rs

@@ -1,6 +1,6 @@
 #[macro_escape];
 
-use std::str::CharIterator;
+use std::str::Chars;
 use std::io::Writer;
 
 struct ParseBranch {
@@ -22,7 +22,7 @@ impl ParseBranch {
 pub fn branchify(options: &[(&str, &str)], case_sensitive: bool) -> ~[ParseBranch] {
     let mut root = ParseBranch::new();
 
-    fn go_down_moses(branch: &mut ParseBranch, mut chariter: CharIterator, result: &str, case_sensitive: bool) {
+    fn go_down_moses(branch: &mut ParseBranch, mut chariter: Chars, result: &str, case_sensitive: bool) {
         match chariter.next() {
             Some(c) => {
                 let first_case = if case_sensitive { c as u8 } else { c.to_ascii().to_upper().to_byte() };

src/http/common.rs

@@ -8,7 +8,7 @@
 use std::num::{Zero, cast};
 use std::io::Reader;
 #[cfg(test)]
-use std::io::mem::MemReader;
+use std::io::MemReader;
 
 /**
  * Read a positive decimal integer from the given reader.

src/http/headers/connection.rs

@@ -41,7 +41,7 @@ impl super::HeaderConvertible for Connection {
 
     fn to_stream<T: Writer>(&self, writer: &mut T) {
         writer.write(match *self {
-            Close => bytes!("close"),
+            Close => "close".as_bytes(),
             Token(ref s) => s.as_bytes(),
         });
     }

src/http/headers/mod.rs

@@ -874,7 +874,7 @@ macro_rules! headers_mod {
 
             use extra;
             use std::io::{Reader, Writer};
-            use extra::treemap::{TreeMap, TreeMapIterator};
+            use extra::treemap::{TreeMap, Entries};
             use headers;
             use headers::{HeaderEnum, HeaderConvertible, HeaderValueByteIterator};
 
@@ -926,7 +926,7 @@ macro_rules! headers_mod {
             pub struct HeaderCollectionIterator<'a> {
                 pos: uint,
                 coll: &'a HeaderCollection,
-                ext_iter: Option<TreeMapIterator<'a, ~str, ~str>>
+                ext_iter: Option<Entries<'a, ~str, ~str>>
             }
 
             impl<'a> Iterator<Header> for HeaderCollectionIterator<'a> {
@@ -988,9 +988,10 @@ macro_rules! headers_mod {
                     }
 
                     writer.write(match *self {
-                        $($caps_ident(_) => bytes!($output_name, ": "),)*
+                        $($caps_ident(_) => $output_name.as_bytes(),)*
                         ExtensionHeader(..) => unreachable!(),  // Already returned
                     });
+                    writer.write(bytes!(": "));
 
                     // FIXME: all the `h` cases satisfy HeaderConvertible, can it be simplified?
                     match *self {

src/http/headers/serialization_utils.rs

@@ -50,7 +50,7 @@ pub fn comma_split(value: &str) -> ~[~str] {
 }
 
 pub fn comma_split_iter<'a>(value: &'a str)
-        -> ::std::iter::Map<'a, &'a str, &'a str, ::std::str::CharSplitIterator<'a, char>> {
+        -> ::std::iter::Map<'a, &'a str, &'a str, ::std::str::CharSplits<'a, char>> {
     value.split(',').map(|w| w.trim_left())
 }
 

src/http/headers/test_utils.rs

@@ -1,4 +1,4 @@
-use std::io::mem::{MemReader, MemWriter};
+use std::io::{MemReader, MemWriter};
 use std::str;
 use headers::{HeaderConvertible, HeaderValueByteIterator};
 

src/http/memstream.rs

@@ -1,7 +1,7 @@
 /// TODO: submit upstream
 
 use std::io::{Reader, Writer, Seek, SeekStyle};
-use std::io::mem::{MemReader, MemWriter};
+use std::io::{MemReader, MemWriter};
 
 /// Writes to an owned, growable byte vector but also implements read with fail-on-call methods.
 struct MemWriterFakeStream(MemWriter);

src/http/method.rs

@@ -65,15 +65,15 @@ impl FromStr for Method {
 impl fmt::Default for Method {
     fn fmt(s: &Method, f: &mut fmt::Formatter) {
         f.buf.write(match *s {
-            Options                => bytes!("OPTIONS"),
-            Get                    => bytes!("GET"),
-            Head                   => bytes!("HEAD"),
-            Post                   => bytes!("POST"),
-            Put                    => bytes!("PUT"),
-            Delete                 => bytes!("DELETE"),
-            Trace                  => bytes!("TRACE"),
-            Connect                => bytes!("CONNECT"),
-            Patch                  => bytes!("PATCH"),
+            Options                => "OPTIONS".as_bytes(),
+            Get                    => "GET".as_bytes(),
+            Head                   => "HEAD".as_bytes(),
+            Post                   => "POST".as_bytes(),
+            Put                    => "PUT".as_bytes(),
+            Delete                 => "DELETE".as_bytes(),
+            Trace                  => "TRACE".as_bytes(),
+            Connect                => "CONNECT".as_bytes(),
+            Patch                  => "PATCH".as_bytes(),
             ExtensionMethod(ref s) => s.as_bytes(),
         })
     }