mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

std: fix json deserializing vectors and a test

Browse Source
This commit is contained in:
Erick Tryzelaar 2013-03-29 09:10:31 -07:00
parent 31563f53d9
commit bdef3f1930
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libstd/json.rs
View File

@ -855,9 +855,7 @@ impl serialize::Decoder for Decoder {
}
_ => fail!(~"not a list"),
};
let res = f(len);
self.stack.pop();
res
f(len)
}
fn read_seq_elt<T>(&self, idx: uint, f: &fn() -> T) -> T {
@ -1675,10 +1673,10 @@ mod tests {
fn test_read_map() {
let s = ~"{\"a\": \"Dog\", \"b\": [\"Frog\", \"Henry\", 349]}";
let decoder = Decoder(from_str(s).unwrap());
let map: LinearMap<~str, Animal> = Decodable::decode(&decoder);
let mut map: LinearMap<~str, Animal> = Decodable::decode(&decoder);
assert_eq!(map.find(&~"a"), Some(Dog));
assert_eq!(map.find(&~"b"), Some(Frog(~"Henry", 349)));
assert_eq!(map.pop(&~"a"), Some(Dog));
assert_eq!(map.pop(&~"b"), Some(Frog(~"Henry", 349)));
}
#[test]