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

Rewrite de::ignore into a struct that impls Deserializable

Browse Source
This commit is contained in:
Erick Tryzelaar 2014-05-30 19:13:50 -07:00
parent cdf8e0820c
commit 0db501e693
1 changed files with 67 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
de.rs
View File

@ -479,88 +479,80 @@ deserialize_tuple! { T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
pub fn ignore<E, D: Deserializer<E>>(d: &mut D) -> Result<(), E> { /// Helper struct that will ignore tokens while taking in consideration
let token = match d.next() { /// recursive structures.
Some(Ok(token)) => token, pub struct IgnoreTokens;
Some(Err(err)) => { return Err(err); }
None => { return Err(d.end_of_stream_error()); }
};
ignore_token(d, token) impl<E, D: Deserializer<E>> Deserializable<E, D> for IgnoreTokens {
} #[inline]
fn deserialize_token(d: &mut D, token: Token) -> Result<IgnoreTokens, E> {
pub fn ignore_token<E, D: Deserializer<E>>(d: &mut D, token: Token) -> Result<(), E> { match token {
match token { Option(true) => {
Null => Ok(()), Deserializable::deserialize(d)
Bool(_) => Ok(()),
Uint(_) => Ok(()),
U8(_) => Ok(()),
U16(_) => Ok(()),
U32(_) => Ok(()),
U64(_) => Ok(()),
Int(_) => Ok(()),
I8(_) => Ok(()),
I16(_) => Ok(()),
I32(_) => Ok(()),
I64(_) => Ok(()),
F32(_) => Ok(()),
F64(_) => Ok(()),
Char(_) => Ok(()),
Str(_) => Ok(()),
String(_) => Ok(()),
Option(true) => { ignore(d) }
Option(false) => { Ok(()) }
EnumStart(_, _, _) => {
loop {
match try!(d.expect_token()) {
End => { return Ok(()); }
token => { try!(ignore_token(d, token)); }
}
} }
}
StructStart(_, _) => { EnumStart(_, _, _) => {
loop { loop {
match try!(d.expect_token()) { match try!(d.expect_token()) {
End => { return Ok(()); } End => { return Ok(IgnoreTokens); }
Str(_) | String(_) => { try!(ignore(d)); } token => {
token => { return Err(d.syntax_error()); } let _: IgnoreTokens = try!(Deserializable::deserialize_token(d, token));
} }
}
}
TupleStart(_) => {
loop {
match try!(d.expect_token()) {
End => { return Ok(()); }
token => { try!(ignore_token(d, token)); }
}
}
}
SeqStart(_) => {
loop {
match try!(d.expect_token()) {
End => { return Ok(()); }
token => { try!(ignore_token(d, token)); }
}
}
}
MapStart(_) => {
loop {
match try!(d.expect_token()) {
End => { return Ok(()); }
token => {
try!(ignore_token(d, token));
try!(ignore(d));
} }
} }
} }
}
End => Err(d.syntax_error()), StructStart(_, _) => {
loop {
match try!(d.expect_token()) {
End => { return Ok(IgnoreTokens); }
Str(_) | String(_) => {
let _: IgnoreTokens = try!(Deserializable::deserialize(d));
}
token => { return Err(d.syntax_error()); }
}
}
}
TupleStart(_) => {
loop {
match try!(d.expect_token()) {
End => { return Ok(IgnoreTokens); }
token => {
let _: IgnoreTokens = try!(Deserializable::deserialize_token(d, token));
}
}
}
}
SeqStart(_) => {
loop {
match try!(d.expect_token()) {
End => { return Ok(IgnoreTokens); }
token => {
let _: IgnoreTokens = try!(Deserializable::deserialize_token(d, token));
}
}
}
}
MapStart(_) => {
loop {
match try!(d.expect_token()) {
End => { return Ok(IgnoreTokens); }
token => {
let _: IgnoreTokens = try!(Deserializable::deserialize_token(d, token));
let _: IgnoreTokens = try!(Deserializable::deserialize(d));
}
}
}
}
End => Err(d.syntax_error()),
_ => Ok(IgnoreTokens),
}
} }
} }