diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 15:57:50 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 16:10:37 -0800 |
| commit | 56a9e2fcd5f0b737df81a39b22f72a55c95b44a2 (patch) | |
| tree | c49c538f8e87842bb6371f97ece94ceaa0bcca8e /src/libserialize/serialize.rs | |
| parent | 26cd8eae48ea99bda183c5224bc423991ccfaf1f (diff) | |
| download | rust-56a9e2fcd5f0b737df81a39b22f72a55c95b44a2.tar.gz rust-56a9e2fcd5f0b737df81a39b22f72a55c95b44a2.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libserialize/serialize.rs')
| -rw-r--r-- | src/libserialize/serialize.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs index 6a04565312d..7b6ca10669d 100644 --- a/src/libserialize/serialize.rs +++ b/src/libserialize/serialize.rs @@ -499,7 +499,7 @@ macro_rules! peel { /// Evaluates to the number of identifiers passed to it, for example: `count_idents!(a, b, c) == 3 macro_rules! count_idents { () => { 0u }; - ($_i:ident, $($rest:ident),*) => { 1 + count_idents!($($rest),*) } + ($_i:ident, $($rest:ident,)*) => { 1 + count_idents!($($rest,)*) } } macro_rules! tuple { @@ -508,7 +508,7 @@ macro_rules! tuple { impl<$($name:Decodable),*> Decodable for ($($name,)*) { #[allow(non_snake_case)] fn decode<D: Decoder>(d: &mut D) -> Result<($($name,)*), D::Error> { - let len: uint = count_idents!($($name),*); + let len: uint = count_idents!($($name,)*); d.read_tuple(len, |d| { let mut i = 0; let ret = ($(try!(d.read_tuple_arg({ i+=1; i-1 }, |