Simplify the Deserializable typarams

This commit is contained in:
Erick Tryzelaar
2014-06-22 16:51:50 -04:00
parent ec8dd2f5a0
commit 22ff47f93b
7 changed files with 271 additions and 327 deletions
+10 -4
View File
@@ -15,9 +15,12 @@ struct Inner {
c: HashMap<String, Option<char>>,
}
impl<E, D: Deserializer<E>> Deserializable<E, D> for Inner {
impl Deserializable for Inner {
#[inline]
fn deserialize_token(d: &mut D, token: Token) -> Result<Inner, E> {
fn deserialize_token<
D: Deserializer<E>,
E
>(d: &mut D, token: Token) -> Result<Inner, E> {
match token {
de::StructStart("Inner", _) |
de::MapStart(_) => {
@@ -79,9 +82,12 @@ struct Outer {
inner: Vec<Inner>,
}
impl<E, D: Deserializer<E>> Deserializable<E, D> for Outer {
impl Deserializable for Outer {
#[inline]
fn deserialize_token(d: &mut D, token: Token) -> Result<Outer, E> {
fn deserialize_token<
D: Deserializer<E>,
E
>(d: &mut D, token: Token) -> Result<Outer, E> {
match token {
de::StructStart("Outer", _) |
de::MapStart(_) => {