Skip to content

Commit 6f711a3

Browse files
Use count! macro in tuple length computation
1 parent 1928895 commit 6f711a3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

compiler/rustc_serialize/src/serialize.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,9 +591,8 @@ macro_rules! tuple {
591591
#[allow(non_snake_case)]
592592
fn encode(&self, s: &mut S) -> Result<(), S::Error> {
593593
let ($(ref $name,)+) = *self;
594-
let mut n = 0;
595-
$(let $name = $name; n += 1;)+
596-
s.emit_tuple(n, |s| {
594+
let len: usize = count!($($name)+);
595+
s.emit_tuple(len, |s| {
597596
let mut i = 0;
598597
$(s.emit_tuple_arg({ i+=1; i-1 }, |s| $name.encode(s))?;)+
599598
Ok(())

0 commit comments

Comments
 (0)