auto merge of #13875 : hjr3/rust/serialize-strbuf, r=alexcrichton
- implement Encodable and Decodable for StrBuf - implement to_json for StrBuf
This commit is contained in:
commit
ee03529fa9
|
@ -2205,6 +2205,10 @@ impl ToJson for ~str {
|
||||||
fn to_json(&self) -> Json { String((*self).clone()) }
|
fn to_json(&self) -> Json { String((*self).clone()) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl ToJson for StrBuf {
|
||||||
|
fn to_json(&self) -> Json { String((*self).as_slice().into_owned()) }
|
||||||
|
}
|
||||||
|
|
||||||
impl<A:ToJson,B:ToJson> ToJson for (A, B) {
|
impl<A:ToJson,B:ToJson> ToJson for (A, B) {
|
||||||
fn to_json(&self) -> Json {
|
fn to_json(&self) -> Json {
|
||||||
match *self {
|
match *self {
|
||||||
|
@ -2643,41 +2647,25 @@ mod tests {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_decode_str() {
|
fn test_decode_str() {
|
||||||
let mut decoder = Decoder::new(from_str("\"\"").unwrap());
|
let s = [("\"\"", ""),
|
||||||
let v: ~str = Decodable::decode(&mut decoder).unwrap();
|
("\"foo\"", "foo"),
|
||||||
assert_eq!(v, "".to_owned());
|
("\"\\\"\"", "\""),
|
||||||
|
("\"\\b\"", "\x08"),
|
||||||
|
("\"\\n\"", "\n"),
|
||||||
|
("\"\\r\"", "\r"),
|
||||||
|
("\"\\t\"", "\t"),
|
||||||
|
("\"\\u12ab\"", "\u12ab"),
|
||||||
|
("\"\\uAB12\"", "\uAB12")];
|
||||||
|
|
||||||
let mut decoder = Decoder::new(from_str("\"foo\"").unwrap());
|
for &(i, o) in s.iter() {
|
||||||
let v: ~str = Decodable::decode(&mut decoder).unwrap();
|
let mut decoder = Decoder::new(from_str(i).unwrap());
|
||||||
assert_eq!(v, "foo".to_owned());
|
let v: StrBuf = Decodable::decode(&mut decoder).unwrap();
|
||||||
|
assert_eq!(v.as_slice(), o);
|
||||||
|
|
||||||
let mut decoder = Decoder::new(from_str("\"\\\"\"").unwrap());
|
let mut decoder = Decoder::new(from_str(i).unwrap());
|
||||||
let v: ~str = Decodable::decode(&mut decoder).unwrap();
|
let v: ~str = Decodable::decode(&mut decoder).unwrap();
|
||||||
assert_eq!(v, "\"".to_owned());
|
assert_eq!(v, o.to_owned());
|
||||||
|
}
|
||||||
let mut decoder = Decoder::new(from_str("\"\\b\"").unwrap());
|
|
||||||
let v: ~str = Decodable::decode(&mut decoder).unwrap();
|
|
||||||
assert_eq!(v, "\x08".to_owned());
|
|
||||||
|
|
||||||
let mut decoder = Decoder::new(from_str("\"\\n\"").unwrap());
|
|
||||||
let v: ~str = Decodable::decode(&mut decoder).unwrap();
|
|
||||||
assert_eq!(v, "\n".to_owned());
|
|
||||||
|
|
||||||
let mut decoder = Decoder::new(from_str("\"\\r\"").unwrap());
|
|
||||||
let v: ~str = Decodable::decode(&mut decoder).unwrap();
|
|
||||||
assert_eq!(v, "\r".to_owned());
|
|
||||||
|
|
||||||
let mut decoder = Decoder::new(from_str("\"\\t\"").unwrap());
|
|
||||||
let v: ~str = Decodable::decode(&mut decoder).unwrap();
|
|
||||||
assert_eq!(v, "\t".to_owned());
|
|
||||||
|
|
||||||
let mut decoder = Decoder::new(from_str("\"\\u12ab\"").unwrap());
|
|
||||||
let v: ~str = Decodable::decode(&mut decoder).unwrap();
|
|
||||||
assert_eq!(v, "\u12ab".to_owned());
|
|
||||||
|
|
||||||
let mut decoder = Decoder::new(from_str("\"\\uAB12\"").unwrap());
|
|
||||||
let v: ~str = Decodable::decode(&mut decoder).unwrap();
|
|
||||||
assert_eq!(v, "\uAB12".to_owned());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
|
@ -313,6 +313,18 @@ impl<E, D:Decoder<E>> Decodable<D, E> for ~str {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<E, S:Encoder<E>> Encodable<S, E> for StrBuf {
|
||||||
|
fn encode(&self, s: &mut S) -> Result<(), E> {
|
||||||
|
s.emit_str(self.as_slice())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<E, D:Decoder<E>> Decodable<D, E> for StrBuf {
|
||||||
|
fn decode(d: &mut D) -> Result<StrBuf, E> {
|
||||||
|
Ok(StrBuf::from_str(try!(d.read_str())))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl<E, S:Encoder<E>> Encodable<S, E> for f32 {
|
impl<E, S:Encoder<E>> Encodable<S, E> for f32 {
|
||||||
fn encode(&self, s: &mut S) -> Result<(), E> {
|
fn encode(&self, s: &mut S) -> Result<(), E> {
|
||||||
s.emit_f32(*self)
|
s.emit_f32(*self)
|
||||||
|
|
Loading…
Reference in New Issue