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

Tuple deserialization should not fail

Browse Source
This commit is contained in:
Dan Burkert 2014-10-25 09:29:41 -07:00
parent ca6b082c05
commit 05f6bdaefc
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librbml/lib.rs
View File

@ -562,10 +562,12 @@ pub mod reader {
f: |&mut Decoder<'doc>| -> DecodeResult<T>) -> DecodeResult<T> {
debug!("read_tuple()");
self.read_seq(|d, len| {
assert!(len == tuple_len,
"expected tuple of length `{}`, found tuple \
of length `{}`", tuple_len, len);
f(d)
if len == tuple_len {
f(d)
} else {
Err(Expected(format!("Expected tuple of length `{}`, \
found tuple of length `{}`", tuple_len, len)))
}
})
}

17
src/libserialize/json.rs
View File

@ -2153,13 +2153,17 @@ impl ::Decoder<DecoderError> for Decoder {
Ok(value)
}
fn read_tuple<T>(&mut self, tuple_len: uint, f: |&mut Decoder| -> DecodeResult<T>) -> DecodeResult<T> {
fn read_tuple<T>(&mut self,
tuple_len: uint,
f: |&mut Decoder| -> DecodeResult<T>)
-> DecodeResult<T> {
debug!("read_tuple()");
self.read_seq(|d, len| {
assert!(len == tuple_len,
"expected tuple of length `{}`, found tuple \
of length `{}`", tuple_len, len);
f(d)
if len == tuple_len {
f(d)
} else {
Err(ExpectedError(format!("Tuple{}", tuple_len), format!("Tuple{}", len)))
}
})
}
@ -2893,9 +2897,8 @@ mod tests {
}
#[test]
#[should_fail]
fn test_decode_tuple_malformed_length() {
let _ = super::decode::<(uint, uint)>("[1, 2, 3]");
assert!(super::decode::<(uint, uint)>("[1, 2, 3]").is_err());
}
#[test]