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
+10 -10
View File
@@ -989,7 +989,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]
@@ -1039,7 +1039,7 @@ fn test_serializer_vec() {
serializer.visit(&log).unwrap();
let json = serializer.into_inner();
assert_eq!(json.as_slice(), JSON_STR.as_bytes());
assert_eq!(&json[], JSON_STR.as_bytes());
}
#[bench]
@@ -1089,7 +1089,7 @@ fn test_serializer_my_mem_writer0() {
let _json = serializer.into_inner();
}
assert_eq!(wr.buf.as_slice(), JSON_STR.as_bytes());
assert_eq!(&wr.buf[], JSON_STR.as_bytes());
}
#[bench]
@@ -1121,7 +1121,7 @@ fn test_serializer_my_mem_writer1() {
let _json = serializer.into_inner();
}
assert_eq!(wr.buf.as_slice(), JSON_STR.as_bytes());
assert_eq!(&wr.buf[], JSON_STR.as_bytes());
}
#[bench]
@@ -1321,7 +1321,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]
@@ -1346,7 +1346,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]
@@ -1372,7 +1372,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]
@@ -1398,7 +1398,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]
@@ -1424,7 +1424,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]
@@ -1450,7 +1450,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]
+1 -1
View File
@@ -402,7 +402,7 @@ fn deserialize_struct_from_map(
) -> P<ast::Expr> {
let fields = match *fields {
Unnamed(_) => fail!(),
Named(ref fields) => fields.as_slice(),
Named(ref fields) => &fields[],
};
// Declare each field.
+1 -1
View File
@@ -352,7 +352,7 @@ impl<Iter: Iterator<Item=u8>> Parser<Iter> {
let buf = &mut [0; 4];
let len = c.encode_utf8(buf).unwrap_or(0);
self.buf.extend(buf.slice_to(len).iter().map(|b| *b));
self.buf.extend(buf[..len].iter().map(|b| *b));
}
_ => {
return Err(self.error(ErrorCode::InvalidEscape));
+2 -2
View File
@@ -206,7 +206,7 @@ pub fn escape_bytes<W: io::Writer>(wr: &mut W, bytes: &[u8]) -> Result<(), IoErr
};
if start < i {
try!(wr.write(bytes.slice(start, i)));
try!(wr.write(&bytes[start..i]));
}
try!(wr.write_str(escaped));
@@ -215,7 +215,7 @@ pub fn escape_bytes<W: io::Writer>(wr: &mut W, bytes: &[u8]) -> Result<(), IoErr
}
if start != bytes.len() {
try!(wr.write(bytes.slice_from(start)));
try!(wr.write(&bytes[start..]));
}
wr.write_str("\"")
+2 -2
View File
@@ -239,7 +239,7 @@ impl Serialize for String {
fn visit<
V: Visitor,
>(&self, visitor: &mut V) -> Result<V::Value, V::Error> {
self.as_slice().visit(visitor)
(&self[]).visit(visitor)
}
}
@@ -321,7 +321,7 @@ impl<
fn visit<
V: Visitor,
>(&self, visitor: &mut V) -> Result<V::Value, V::Error> {
self.as_slice().visit(visitor)
(&self[]).visit(visitor)
}
}