diff --git a/src/examples/server/apache_fake/main.rs b/src/examples/server/apache_fake/main.rs index cecd3d2..619fe3f 100644 --- a/src/examples/server/apache_fake/main.rs +++ b/src/examples/server/apache_fake/main.rs @@ -7,8 +7,6 @@ extern crate time; extern crate http; -use std::vec_ng::Vec; - use std::io::net::ip::{SocketAddr, Ipv4Addr}; use std::io::Writer; diff --git a/src/examples/server/hello_world/main.rs b/src/examples/server/hello_world/main.rs index a5ff7ec..3cdb66a 100644 --- a/src/examples/server/hello_world/main.rs +++ b/src/examples/server/hello_world/main.rs @@ -5,8 +5,6 @@ extern crate time; extern crate http; -use std::vec_ng::Vec; - use std::io::net::ip::{SocketAddr, Ipv4Addr}; use std::io::Writer; diff --git a/src/examples/server/info/main.rs b/src/examples/server/info/main.rs index 9d8047f..d1b42be 100644 --- a/src/examples/server/info/main.rs +++ b/src/examples/server/info/main.rs @@ -6,8 +6,6 @@ extern crate time; extern crate http; -use std::vec_ng::Vec; - use std::io::net::ip::{SocketAddr, Ipv4Addr}; use std::io::Writer; diff --git a/src/examples/server/request_uri/main.rs b/src/examples/server/request_uri/main.rs index 1ffd776..344ccce 100644 --- a/src/examples/server/request_uri/main.rs +++ b/src/examples/server/request_uri/main.rs @@ -9,8 +9,6 @@ extern crate time; extern crate http; -use std::vec_ng::Vec; - use std::io::net::ip::{SocketAddr, Ipv4Addr}; use std::io::Writer; diff --git a/src/http/buffer.rs b/src/http/buffer.rs index 200b89b..869863f 100644 --- a/src/http/buffer.rs +++ b/src/http/buffer.rs @@ -2,8 +2,7 @@ use std::io::{IoResult, Stream}; use std::cmp::min; -use std::vec_ng::Vec; -use std::vec; +use std::slice; use std::num::ToStrRadix; // 64KB chunks (moderately arbitrary) @@ -111,7 +110,7 @@ impl Reader for BufferedStream { 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) } diff --git a/src/http/headers/accept_ranges.rs b/src/http/headers/accept_ranges.rs index 44b36b9..03e60b9 100644 --- a/src/http/headers/accept_ranges.rs +++ b/src/http/headers/accept_ranges.rs @@ -1,6 +1,5 @@ //! The Accept-Ranges request header, defined in RFC 2616, Section 14.5. -use std::vec_ng::Vec; use std::io::IoResult; use std::ascii::StrAsciiExt; diff --git a/src/http/headers/connection.rs b/src/http/headers/connection.rs index bc892f9..7e5ff85 100644 --- a/src/http/headers/connection.rs +++ b/src/http/headers/connection.rs @@ -58,7 +58,6 @@ impl super::HeaderConvertible for Connection { #[test] fn test_connection() { - use std::vec_ng::Vec; use headers::test_utils::{assert_conversion_correct, assert_interpretation_correct, assert_invalid}; diff --git a/src/http/headers/content_type.rs b/src/http/headers/content_type.rs index 55af084..fb33ee6 100644 --- a/src/http/headers/content_type.rs +++ b/src/http/headers/content_type.rs @@ -1,6 +1,5 @@ //! 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::io::IoResult; use std::fmt; diff --git a/src/http/headers/mod.rs b/src/http/headers/mod.rs index 4838129..25f856d 100644 --- a/src/http/headers/mod.rs +++ b/src/http/headers/mod.rs @@ -5,7 +5,6 @@ //! unknown headers are stored in a map in the traditional way. use url::Url; -use std::vec_ng::Vec; use std::io::IoResult; use time::{Tm, strptime}; use rfc2616::{is_token_item, is_separator, CR, LF, SP, HT, COLON}; @@ -872,7 +871,6 @@ macro_rules! headers_mod { $attr; #[allow(unused_imports)]; - use std::vec_ng::Vec; use std::io::IoResult; use time; use collections::treemap::{TreeMap, Entries}; diff --git a/src/http/headers/serialization_utils.rs b/src/http/headers/serialization_utils.rs index c3ac7fd..d20c9aa 100644 --- a/src/http/headers/serialization_utils.rs +++ b/src/http/headers/serialization_utils.rs @@ -1,7 +1,6 @@ //! 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::slice; use std::ascii::Ascii; use std::io::IoResult; use rfc2616::is_token; @@ -23,7 +22,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 { @@ -217,7 +216,6 @@ pub fn push_parameters(mut s: ~str, parameters: &[(K, V)]) -> ~s #[cfg(test)] mod test { - use std::vec_ng::Vec; use super::{normalise_header_name, comma_split, comma_split_iter, comma_join, push_quality, push_parameter, push_parameters, push_maybe_quoted_string, push_quoted_string, maybe_quoted_string, quoted_string, diff --git a/src/http/headers/transfer_encoding.rs b/src/http/headers/transfer_encoding.rs index c92dbd3..53a162a 100644 --- a/src/http/headers/transfer_encoding.rs +++ b/src/http/headers/transfer_encoding.rs @@ -2,7 +2,6 @@ //! //! Transfer-Encoding = "Transfer-Encoding" ":" 1#transfer-coding -use std::vec_ng::Vec; use std::ascii::StrAsciiExt; use std::io::IoResult; use headers::serialization_utils::{WriterUtil, push_parameters}; diff --git a/src/http/server/request.rs b/src/http/server/request.rs index 336a914..8f14b22 100644 --- a/src/http/server/request.rs +++ b/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)) diff --git a/src/http/server/response.rs b/src/http/server/response.rs index 16a23f5..4ca9ee7 100644 --- a/src/http/server/response.rs +++ b/src/http/server/response.rs @@ -1,4 +1,3 @@ -use std::vec_ng::Vec; use std::io::IoResult; use std::io::net::tcp::TcpStream;