From 1756c797df25674ce9314f59b49aed297c8dc881 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 24 Mar 2014 16:42:56 +0100 Subject: [PATCH 1/2] Update to current rust: use read_exact rather than read_bytes. --- src/http/server/request.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) From dcec6f9ee26f545c0655acf02a005bd943cb7515 Mon Sep 17 00:00:00 2001 From: Alex Morega Date: Wed, 26 Mar 2014 17:01:54 +0200 Subject: [PATCH 2/2] rust renamed some symbols related to `vec` --- src/codegen/status.rs | 4 ++-- src/http/buffer.rs | 5 +++-- src/http/headers/accept_ranges.rs | 2 +- src/http/headers/content_type.rs | 2 +- src/http/headers/mod.rs | 4 ++-- src/http/headers/serialization_utils.rs | 6 +++--- src/http/headers/transfer_encoding.rs | 2 +- src/http/server/response.rs | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/codegen/status.rs b/src/codegen/status.rs index f9e0690..b231044 100644 --- a/src/codegen/status.rs +++ b/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 { diff --git a/src/http/buffer.rs b/src/http/buffer.rs index 200b89b..b9d8a1d 100644 --- a/src/http/buffer.rs +++ b/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 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..a784e65 100644 --- a/src/http/headers/accept_ranges.rs +++ b/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; diff --git a/src/http/headers/content_type.rs b/src/http/headers/content_type.rs index 55af084..6dbdf7b 100644 --- a/src/http/headers/content_type.rs +++ b/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; diff --git a/src/http/headers/mod.rs b/src/http/headers/mod.rs index 4838129..e0160a0 100644 --- a/src/http/headers/mod.rs +++ b/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}; diff --git a/src/http/headers/serialization_utils.rs b/src/http/headers/serialization_utils.rs index c3ac7fd..e3e0223 100644 --- a/src/http/headers/serialization_utils.rs +++ b/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 { diff --git a/src/http/headers/transfer_encoding.rs b/src/http/headers/transfer_encoding.rs index c92dbd3..7bb3668 100644 --- a/src/http/headers/transfer_encoding.rs +++ b/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}; diff --git a/src/http/server/response.rs b/src/http/server/response.rs index 16a23f5..89bf305 100644 --- a/src/http/server/response.rs +++ b/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;