Use slicing syntax instead of .as_slice()

This commit is contained in:
Thomas Bahn
2015-02-06 15:17:24 +01:00
parent 3022d7301a
commit 5dd077969c
13 changed files with 45 additions and 45 deletions
+16 -16
View File
@@ -681,7 +681,7 @@ fn test_encoder() {
log.encode(&mut encoder).unwrap();
}
assert_eq!(wr.as_slice(), JSON_STR.as_bytes());
assert_eq!(&wr[], JSON_STR.as_bytes());
}
#[bench]
@@ -780,7 +780,7 @@ fn test_serializer_my_mem_writer0() {
log.serialize(&mut serializer).unwrap();
}
assert_eq!(wr.buf.as_slice(), JSON_STR.as_bytes());
assert_eq!(&wr.buf[], JSON_STR.as_bytes());
}
#[bench]
@@ -811,7 +811,7 @@ fn test_serializer_my_mem_writer1() {
log.serialize(&mut serializer).unwrap();
}
assert_eq!(wr.buf.as_slice(), JSON_STR.as_bytes());
assert_eq!(&wr.buf[], JSON_STR.as_bytes());
}
#[bench]
@@ -1011,7 +1011,7 @@ fn test_manual_serialize_vec_no_escape() {
manual_serialize_no_escape(&mut wr, &log);
let json = String::from_utf8(wr).unwrap();
assert_eq!(JSON_STR, json.as_slice());
assert_eq!(JSON_STR, &json[]);
}
#[bench]
@@ -1036,7 +1036,7 @@ fn test_manual_serialize_vec_escape() {
manual_serialize_escape(&mut wr, &log);
let json = String::from_utf8(wr).unwrap();
assert_eq!(JSON_STR, json.as_slice());
assert_eq!(JSON_STR, &json[]);
}
#[bench]
@@ -1062,7 +1062,7 @@ fn test_manual_serialize_my_mem_writer0_no_escape() {
manual_serialize_no_escape(&mut wr, &log);
let json = String::from_utf8(wr.buf).unwrap();
assert_eq!(JSON_STR, json.as_slice());
assert_eq!(JSON_STR, &json[]);
}
#[bench]
@@ -1088,7 +1088,7 @@ fn test_manual_serialize_my_mem_writer0_escape() {
manual_serialize_escape(&mut wr, &log);
let json = String::from_utf8(wr.buf).unwrap();
assert_eq!(JSON_STR, json.as_slice());
assert_eq!(JSON_STR, &json[]);
}
#[bench]
@@ -1114,7 +1114,7 @@ fn test_manual_serialize_my_mem_writer1_no_escape() {
manual_serialize_no_escape(&mut wr, &log);
let json = String::from_utf8(wr.buf).unwrap();
assert_eq!(JSON_STR, json.as_slice());
assert_eq!(JSON_STR, &json[]);
}
#[bench]
@@ -1140,7 +1140,7 @@ fn test_manual_serialize_my_mem_writer1_escape() {
manual_serialize_escape(&mut wr, &log);
let json = String::from_utf8(wr.buf).unwrap();
assert_eq!(JSON_STR, json.as_slice());
assert_eq!(JSON_STR, &json[]);
}
#[bench]
@@ -1189,7 +1189,7 @@ fn test_direct_vec() {
direct(&mut wr, &log);
let json = String::from_utf8(wr).unwrap();
assert_eq!(JSON_STR, json.as_slice());
assert_eq!(JSON_STR, &json[]);
}
#[bench]
@@ -1214,7 +1214,7 @@ fn test_direct_my_mem_writer0() {
direct(&mut wr, &log);
let json = String::from_utf8(wr.buf).unwrap();
assert_eq!(JSON_STR, json.as_slice());
assert_eq!(JSON_STR, &json[]);
}
#[bench]
@@ -1240,7 +1240,7 @@ fn test_direct_my_mem_writer1() {
direct(&mut wr, &log);
let json = String::from_utf8(wr.buf).unwrap();
assert_eq!(JSON_STR, json.as_slice());
assert_eq!(JSON_STR, &json[]);
}
#[bench]
@@ -1291,7 +1291,7 @@ fn test_deserializer() {
#[inline]
fn manual_reader_ignore<R: Reader>(rdr: &mut R, buf: &mut [u8], key: &[u8]) {
let buf = buf.slice_mut(0, key.len());
let buf = &mut buf[0..key.len()];
rdr.read(buf).unwrap();
assert_eq!(buf, key);
}
@@ -1350,7 +1350,7 @@ fn manual_reader_string<R: Reader>(rdr: &mut R, buf: &mut [u8], key: &[u8]) -> S
let b = rdr.read_byte().unwrap();
assert!(b == b',' || b == b']' || b == b'}');
String::from_utf8(buf.slice_to(idx).to_vec()).unwrap()
String::from_utf8(buf[..idx].to_vec()).unwrap()
}
#[inline]
@@ -1432,7 +1432,7 @@ fn manual_reader_deserialize<R: Reader>(rdr: &mut R) -> Log {
#[inline]
fn manual_iter_ignore<R: Iterator<Item=u8>>(mut rdr: R, buf: &mut [u8], key: &[u8]) {
let buf = buf.slice_mut(0, key.len());
let buf = &mut buf[0..key.len()];
for idx in range(0, key.len()) {
buf[idx] = rdr.next().unwrap();
@@ -1494,7 +1494,7 @@ fn manual_iter_string<R: Iterator<Item=u8>>(mut rdr: R, buf: &mut [u8], key: &[u
let b = rdr.next().unwrap();
assert!(b == b',' || b == b']' || b == b'}');
String::from_utf8(buf.slice_to(idx).to_vec()).unwrap()
String::from_utf8(buf[..idx].to_vec()).unwrap()
}
#[inline]