asya/toml-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #27 from mikedilger/update_serialize

Browse source 
Update to rust master
This commit is contained in:
Alex Crichton 2014-11-02 13:50:32 -06:00
parent 71d1689d63 ada3e6474d
commit 902b3c6f8f
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/serialization.rs
View file

@ -578,10 +578,16 @@ impl serialize::Decoder<DecodeError> for Decoder {
} }
fn read_tuple<T>(&mut self, fn read_tuple<T>(&mut self,
f: |&mut Decoder, uint| -> Result<T, DecodeError>) tuple_len: uint,
f: |&mut Decoder| -> Result<T, DecodeError>)
-> Result<T, DecodeError> -> Result<T, DecodeError>
{ {
self.read_seq(f) self.read_seq(|d, len| {
assert!(len == tuple_len,
"expected tuple of length `{}`, found tuple \
of length `{}`", tuple_len, len);
f(d)
})
} }
fn read_tuple_arg<T>(&mut self, a_idx: uint, fn read_tuple_arg<T>(&mut self, a_idx: uint,
f: |&mut Decoder| -> Result<T, DecodeError>) f: |&mut Decoder| -> Result<T, DecodeError>)
@ -592,7 +598,8 @@ impl serialize::Decoder<DecodeError> for Decoder {
fn read_tuple_struct<T>(&mut self, fn read_tuple_struct<T>(&mut self,
_s_name: &str, _s_name: &str,
_f: |&mut Decoder, uint| -> Result<T, DecodeError>) _len: uint,
_f: |&mut Decoder| -> Result<T, DecodeError>)
-> Result<T, DecodeError> -> Result<T, DecodeError>
{ {
panic!() panic!()