Update to current rust (2014-03-25)

src/codegen/status.rs

@@ -9,7 +9,7 @@
 
 use collections::hashmap::HashSet;
 use std::ascii::StrAsciiExt;
-use std::vec;
+use std::slice;
 use std::io::IoResult;
 use super::get_writer;
 
@@ -52,7 +52,7 @@ impl Status {
 /// "ImATeaPot"
 fn camel_case(msg: &str) -> ~str {
     let msg = msg.replace("-", " ").replace("'", "");
-    let mut result: ~[Ascii] = vec::with_capacity(msg.len());
+    let mut result: ~[Ascii] = slice::with_capacity(msg.len());
     let mut capitalise = true;
     for c in msg.chars() {
         let c = match capitalise {

src/http/buffer.rs

@@ -2,8 +2,9 @@
 
 use std::io::{IoResult, Stream};
 use std::cmp::min;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 use std::vec;
+use std::slice;
 use std::num::ToStrRadix;
 
 // 64KB chunks (moderately arbitrary)
@@ -111,7 +112,7 @@ impl<T: Reader> Reader for BufferedStream<T> {
             try!(self.fill_buffer());
         }
         let size = min(self.read_max - self.read_pos, buf.len());
-        vec::bytes::copy_memory(buf, self.read_buffer.slice_from(self.read_pos).slice_to(size));
+        slice::bytes::copy_memory(buf, self.read_buffer.slice_from(self.read_pos).slice_to(size));
         self.read_pos += size;
         Ok(size)
     }

src/http/headers/accept_ranges.rs

@@ -1,6 +1,6 @@
 //! The Accept-Ranges request header, defined in RFC 2616, Section 14.5.
 
-use std::vec_ng::Vec;
+use std::vec::Vec;
 use std::io::IoResult;
 use std::ascii::StrAsciiExt;
 

src/http/headers/content_type.rs

@@ -1,6 +1,6 @@
 //! The Content-Type entity header, defined in RFC 2616, Section 14.17.
 use headers::serialization_utils::{push_parameters, WriterUtil};
-use std::vec_ng::Vec;
+use std::vec::Vec;
 use std::io::IoResult;
 use std::fmt;
 

src/http/headers/mod.rs

@@ -5,7 +5,7 @@
 //! unknown headers are stored in a map in the traditional way.
 
 use url::Url;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 use std::io::IoResult;
 use time::{Tm, strptime};
 use rfc2616::{is_token_item, is_separator, CR, LF, SP, HT, COLON};
@@ -872,7 +872,7 @@ macro_rules! headers_mod {
             $attr;
 
             #[allow(unused_imports)];
-            use std::vec_ng::Vec;
+            use std::vec::Vec;
             use std::io::IoResult;
             use time;
             use collections::treemap::{TreeMap, Entries};

src/http/headers/serialization_utils.rs

@@ -1,7 +1,7 @@
 //! Utility functions for assisting with conversion of headers from and to the HTTP text form.
 
-use std::vec_ng::Vec;
-use std::vec;
+use std::vec::Vec;
+use std::slice;
 use std::ascii::Ascii;
 use std::io::IoResult;
 use rfc2616::is_token;
@@ -23,7 +23,7 @@ use rfc2616::is_token;
 /// assert_eq!(normalise_header_name("FOO-BAR"), "Foo-Bar");
 /// ~~~
 pub fn normalise_header_name(name: &str) -> ~str {
-    let mut result: ~[Ascii] = vec::with_capacity(name.len());
+    let mut result: ~[Ascii] = slice::with_capacity(name.len());
     let mut capitalise = true;
     for c in name.chars() {
         let c = match capitalise {

src/http/headers/transfer_encoding.rs

@@ -2,7 +2,7 @@
 //!
 //! Transfer-Encoding       = "Transfer-Encoding" ":" 1#transfer-coding
 
-use std::vec_ng::Vec;
+use std::vec::Vec;
 use std::ascii::StrAsciiExt;
 use std::io::IoResult;
 use headers::serialization_utils::{WriterUtil, push_parameters};

src/http/server/request.rs

@@ -372,7 +372,7 @@ impl Request {
         // Read body if its length is specified
         match request.headers.content_length {
             Some(length) => {
-                match buffer.read_bytes(length) {
+                match buffer.read_exact(length) {
                     Ok(body) => match str::from_utf8(body) {
                         Some(body_str) => request.body = body_str.to_owned(),
                         None => return (request, Err(status::BadRequest))

src/http/server/response.rs

@@ -1,4 +1,4 @@
-use std::vec_ng::Vec;
+use std::vec::Vec;
 use std::io::IoResult;
 use std::io::net::tcp::TcpStream;