Skip to content

Commit

Permalink
Follow the latest changes up to 2014-03-23
Browse files Browse the repository at this point in the history
related issues of mozilla/rust:
- rust-lang/rust#12772  rename std::vec -> std::slice
- rust-lang/rust#13028  rename std::vec_ng -> std::vec
- rust-lang/rust@0305ed5d22e4  std: Add Vec to the prelude
- rust-lang/rust#12907  std: Rename {push,read}_bytes to {push,read}_exact
  • Loading branch information
Kroisse committed Mar 22, 2014
1 parent 785e9b4 commit 8a2f493
Show file tree
Hide file tree
Showing 13 changed files with 5 additions and 23 deletions.
2 changes: 0 additions & 2 deletions src/examples/server/apache_fake/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions src/examples/server/hello_world/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions src/examples/server/info/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions src/examples/server/request_uri/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
5 changes: 2 additions & 3 deletions src/http/buffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -111,7 +110,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)
}
Expand Down
1 change: 0 additions & 1 deletion src/http/headers/accept_ranges.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
1 change: 0 additions & 1 deletion src/http/headers/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
1 change: 0 additions & 1 deletion src/http/headers/content_type.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 0 additions & 2 deletions src/http/headers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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};
Expand Down
6 changes: 2 additions & 4 deletions src/http/headers/serialization_utils.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -217,7 +216,6 @@ pub fn push_parameters<K: Str, V: Str>(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,
Expand Down
1 change: 0 additions & 1 deletion src/http/headers/transfer_encoding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/http/server/request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
1 change: 0 additions & 1 deletion src/http/server/response.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::vec_ng::Vec;
use std::io::IoResult;
use std::io::net::tcp::TcpStream;

Expand Down

0 comments on commit 8a2f493

Please sign in to comment.