about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-09-26 03:32:46 +0000
committerbors <bors@rust-lang.org>2014-09-26 03:32:46 +0000
commite31680ac2d2f246fedfd6ac2f02a1d38fbd6f613 (patch)
tree07b3e99149540f3ef51b4d2b21d17def81054d70 /src
parentbb66281b26827ee0ffd09db0262dfbd8013b8718 (diff)
parentfc58dcbd434d8a8469d6c66a6f9c56f23338d5c5 (diff)
downloadrust-e31680ac2d2f246fedfd6ac2f02a1d38fbd6f613.tar.gz
rust-e31680ac2d2f246fedfd6ac2f02a1d38fbd6f613.zip
auto merge of #17504 : danburkert/rust/tuple-serialization, r=alexcrichton
The tuple serialization logic should be using the tuple-specific emit function.  This fixes part of #17158.  The JSON encoder already proxies to `emit_seq_elt` when `emit_tuple_arg` is called, so this should have an effect.
Diffstat (limited to 'src')
-rw-r--r--src/libserialize/serialize.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs
index 2cda00ad6c4..d005a8ef004 100644
--- a/src/libserialize/serialize.rs
+++ b/src/libserialize/serialize.rs
@@ -503,7 +503,7 @@ macro_rules! tuple (
                 $(let $name = $name; n += 1;)*
                 s.emit_tuple(n, |s| {
                     let mut i = 0;
-                    $(try!(s.emit_seq_elt({ i+=1; i-1 }, |s| $name.encode(s)));)*
+                    $(try!(s.emit_tuple_arg({ i+=1; i-1 }, |s| $name.encode(s)));)*
                     Ok(())
                 })
             }