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

Append semicolon to item macro invocations in serde

Browse Source 
Following changes in rustc.
This commit is contained in:
Thomas Bahn 2014-12-19 08:59:11 +01:00
parent 29ff8492d2
commit d6807c0e90
3 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/de.rs
View File

@ -673,22 +673,22 @@ macro_rules! impl_deserialize {
}
}
impl_deserialize!(bool, expect_bool)
impl_deserialize!(int, expect_num)
impl_deserialize!(i8, expect_num)
impl_deserialize!(i16, expect_num)
impl_deserialize!(i32, expect_num)
impl_deserialize!(i64, expect_num)
impl_deserialize!(uint, expect_num)
impl_deserialize!(u8, expect_num)
impl_deserialize!(u16, expect_num)
impl_deserialize!(u32, expect_num)
impl_deserialize!(u64, expect_num)
impl_deserialize!(f32, expect_num)
impl_deserialize!(f64, expect_num)
impl_deserialize!(char, expect_char)
impl_deserialize!(&'static str, expect_str)
impl_deserialize!(string::String, expect_string)
impl_deserialize!(bool, expect_bool);
impl_deserialize!(int, expect_num);
impl_deserialize!(i8, expect_num);
impl_deserialize!(i16, expect_num);
impl_deserialize!(i32, expect_num);
impl_deserialize!(i64, expect_num);
impl_deserialize!(uint, expect_num);
impl_deserialize!(u8, expect_num);
impl_deserialize!(u16, expect_num);
impl_deserialize!(u32, expect_num);
impl_deserialize!(u64, expect_num);
impl_deserialize!(f32, expect_num);
impl_deserialize!(f64, expect_num);
impl_deserialize!(char, expect_char);
impl_deserialize!(&'static str, expect_str);
impl_deserialize!(string::String, expect_string);
//////////////////////////////////////////////////////////////////////////////
@ -804,7 +804,7 @@ impl<
//////////////////////////////////////////////////////////////////////////////
macro_rules! peel {
($name:ident, $($other:ident,)*) => (impl_deserialize_tuple!($($other,)*))
($name:ident, $($other:ident,)*) => ( impl_deserialize_tuple!($($other,)*); )
}
macro_rules! impl_deserialize_tuple {
@ -840,7 +840,7 @@ macro_rules! impl_deserialize_tuple {
Ok(result)
}
}
peel!($($name,)*)
peel!($($name,)*);
}
}
@ -1276,7 +1276,7 @@ mod tests {
vec!(Token::Char('c')) => 'c': char,
vec!(Token::Str("abc")) => "abc": &str,
vec!(Token::String("abc".to_string())) => "abc".to_string(): string::String
])
]);
test_value!(test_tuples, [
vec!(
@ -1306,7 +1306,7 @@ mod tests {
Token::End,
Token::End,
) => ((), (), (5, "a")): ((), (), (int, &'static str))
])
]);
test_value!(test_options, [
vec!(Token::Option(false)) => None: option::Option<int>,
@ -1315,7 +1315,7 @@ mod tests {
Token::Option(true),
Token::Int(5),
) => Some(5): option::Option<int>
])
]);
test_value!(test_structs, [
vec!(
@ -1356,7 +1356,7 @@ mod tests {
},
),
}: Outer
])
]);
test_value!(test_enums, [
vec!(
@ -1370,7 +1370,7 @@ mod tests {
Token::Int(349),
Token::End,
) => Animal::Frog("Henry".to_string(), 349): Animal
])
]);
test_value!(test_vecs, [
vec!(
@ -1410,7 +1410,7 @@ mod tests {
Token::End,
Token::End,
) => vec!(vec!(1), vec!(2, 3), vec!(4, 5, 6)): Vec<Vec<int>>
])
]);
test_value!(test_treemaps, [
vec!(
@ -1428,5 +1428,5 @@ mod tests {
Token::End,
) => treemap!(5i => "a".to_string(), 6i => "b".to_string()): TreeMap<int, string::
String>
])
]);
}

4
src/json/value.rs
View File

@ -584,7 +584,7 @@ impl ToJson for String {
}
macro_rules! peel_to_json_tuple {
($name:ident, $($other:ident,)*) => (impl_to_json_tuple!($($other,)*))
($name:ident, $($other:ident,)*) => ( impl_to_json_tuple!($($other,)*); )
}
macro_rules! impl_to_json_tuple {
@ -615,7 +615,7 @@ macro_rules! impl_to_json_tuple {
Value::Array(array)
}
}
peel_to_json_tuple!($($name,)*)
peel_to_json_tuple!($($name,)*);
}
}

38
src/ser.rs
View File

@ -130,20 +130,20 @@ macro_rules! impl_serialize {
}
}
impl_serialize!(bool, serialize_bool)
impl_serialize!(int, serialize_int)
impl_serialize!(i8, serialize_i8)
impl_serialize!(i16, serialize_i16)
impl_serialize!(i32, serialize_i32)
impl_serialize!(i64, serialize_i64)
impl_serialize!(uint, serialize_uint)
impl_serialize!(u8, serialize_u8)
impl_serialize!(u16, serialize_u16)
impl_serialize!(u32, serialize_u32)
impl_serialize!(u64, serialize_u64)
impl_serialize!(f32, serialize_f32)
impl_serialize!(f64, serialize_f64)
impl_serialize!(char, serialize_char)
impl_serialize!(bool, serialize_bool);
impl_serialize!(int, serialize_int);
impl_serialize!(i8, serialize_i8);
impl_serialize!(i16, serialize_i16);
impl_serialize!(i32, serialize_i32);
impl_serialize!(i64, serialize_i64);
impl_serialize!(uint, serialize_uint);
impl_serialize!(u8, serialize_u8);
impl_serialize!(u16, serialize_u16);
impl_serialize!(u32, serialize_u32);
impl_serialize!(u64, serialize_u64);
impl_serialize!(f32, serialize_f32);
impl_serialize!(f64, serialize_f64);
impl_serialize!(char, serialize_char);
//////////////////////////////////////////////////////////////////////////////
@ -179,9 +179,9 @@ macro_rules! impl_serialize_box {
}
}
impl_serialize_box!(&'a T)
impl_serialize_box!(Box<T>)
impl_serialize_box!(Rc<T>)
impl_serialize_box!(&'a T);
impl_serialize_box!(Box<T>);
impl_serialize_box!(Rc<T>);
impl<
S: Serializer<E>,
@ -273,7 +273,7 @@ impl<
//////////////////////////////////////////////////////////////////////////////
macro_rules! peel {
($name:ident, $($other:ident,)*) => (impl_serialize_tuple!($($other,)*))
($name:ident, $($other:ident,)*) => ( impl_serialize_tuple!($($other,)*); )
}
macro_rules! impl_serialize_tuple {
@ -307,7 +307,7 @@ macro_rules! impl_serialize_tuple {
s.serialize_tuple_end()
}
}
peel!($($name,)*)
peel!($($name,)*);
}
}