diff --git a/.gitignore b/.gitignore index 06057a1..9208baf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /Cargo.lock *.swp *.swo +.cargo diff --git a/Cargo.toml b/Cargo.toml index 51cffbf..6a15263 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,4 +12,4 @@ description = "A binary serialization / deserialization strategy and implementat [dependencies] rustc-serialize = "0.3.*" -byteorder = "0.3.1" +byteorder = "0.3.*" diff --git a/examples/basic.rs b/examples/basic.rs index 103c6f2..66972cb 100644 --- a/examples/basic.rs +++ b/examples/basic.rs @@ -1,5 +1,5 @@ extern crate bincode; -extern crate "rustc-serialize" as rustc_serialize; +extern crate rustc_serialize; use bincode::SizeLimit; diff --git a/src/lib.rs b/src/lib.rs index fe7b676..87b9309 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,7 +5,7 @@ #![doc(html_logo_url = "./icon.png")] #![feature(core, io, unicode)] -extern crate "rustc-serialize" as rustc_serialize; +extern crate rustc_serialize; extern crate byteorder; extern crate unicode; diff --git a/src/test.rs b/src/test.rs index 4ae7cce..84cb275 100644 --- a/src/test.rs +++ b/src/test.rs @@ -200,27 +200,27 @@ fn decoding_errors() { } } - isize_invalid_encoding(decode::(vec![0xA].as_slice())); - isize_invalid_encoding(decode::(vec![0, 0, 0, 0, 0, 0, 0, 1, 0xFF].as_slice())); + isize_invalid_encoding(decode::(&vec![0xA][..])); + isize_invalid_encoding(decode::(&vec![0, 0, 0, 0, 0, 0, 0, 1, 0xFF][..])); // Out-of-bounds variant #[derive(RustcEncodable, RustcDecodable)] enum Test { One, Two, }; - isize_invalid_encoding(decode::(vec![0, 0, 0, 5].as_slice())); - isize_invalid_encoding(decode::>(vec![5, 0].as_slice())); + isize_invalid_encoding(decode::(&vec![0, 0, 0, 5][..])); + isize_invalid_encoding(decode::>(&vec![5, 0][..])); } #[test] fn too_big_decode() { let encoded = vec![0,0,0,3]; - let mut encoded_ref = encoded.as_slice(); + let mut encoded_ref = &encoded[..]; let decoded: Result = decode_from(&mut encoded_ref, Bounded(3)); assert!(decoded.is_err()); let encoded = vec![0,0,0,3]; - let mut encoded_ref = encoded.as_slice(); + let mut encoded_ref = &encoded[..]; let decoded: Result = decode_from(&mut encoded_ref, Bounded(4)); assert!(decoded.is_ok()); } @@ -228,7 +228,7 @@ fn too_big_decode() { #[test] fn too_big_char_decode() { let encoded = vec![0x41]; - let mut encoded_ref = encoded.as_slice(); + let mut encoded_ref = &encoded[..]; let decoded: Result = decode_from(&mut encoded_ref, Bounded(1)); assert_eq!(decoded, Ok('A')); }