bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use question_mark feature in libserialize.

Browse source
This commit is contained in:
Ahmed Charles 2016-08-27 07:16:17 -07:00
parent 14d3937e65
commit d73e374ddb
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libserialize/serialize.rs
View file

@ -511,10 +511,10 @@ macro_rules! tuple {
let len: usize = count_idents!($($name,)*);
d.read_tuple(len, |d| {
let mut i = 0;
let ret = ($(try!(d.read_tuple_arg({ i+=1; i-1 },
|d| -> Result<$name,D::Error> {
let ret = ($(d.read_tuple_arg({ i+=1; i-1 },
|d| -> Result<$name,D::Error> {
Decodable::decode(d)
})),)*);
})?,)*);
Ok(ret)
})
}
@ -527,7 +527,7 @@ macro_rules! tuple {
$(let $name = $name; n += 1;)*
s.emit_tuple(n, |s| {
let mut i = 0;
$(try!(s.emit_tuple_arg({ i+=1; i-1 }, |s| $name.encode(s)));)*
$(s.emit_tuple_arg({ i+=1; i-1 }, |s| $name.encode(s))?;)*
Ok(())
})
}