---

yaml
---
r: 134760
b: refs/heads/master
c: 5d653c1
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c59ef666a53872d0b1629f00c201dc801810da72
+refs/heads/master: 5d653c17a656e8fe1572c7a695e33b188eda0597
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 437179ed8bf7f7672f84b19265df1ce569e70490
 refs/heads/try: 19f62d05d3e52735153e9f4e9862e100bb7b2566

trunk/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(())
                 })
             }

trunk/src/libstd/io/net/pipe.rs

@@ -751,6 +751,7 @@ mod tests {
         assert!(a2.accept().is_ok());
     })
 
+    #[cfg(not(windows))] // FIXME #17553
     iotest!(fn clone_accept_concurrent() {
         let addr = next_test_unix();
         let l = UnixListener::bind(&addr);

trunk/src/libstd/io/net/udp.rs

@@ -545,6 +545,7 @@ mod test {
         serv_rx.recv();
     })
 
+    #[cfg(not(windows))] // FIXME #17553
     iotest!(fn recv_from_timeout() {
         let addr1 = next_test_ip4();
         let addr2 = next_test_ip4();

trunk/src/snapshots.txt

@@ -1,3 +1,12 @@
+S 2014-09-22 437179e
+  freebsd-x86_64 f693c0441de3dbb2d471dde5a5045ac8a48807d8
+  linux-i386 5c2132b65f45c21b43d28de6a9460978b1a7b08a
+  linux-x86_64 152be582853c2cf1ddcc88b085153b52ebbeb065
+  macos-i386 7adbb076aeae8e1d9bdf3fe968bc7ef8a8fe0096
+  macos-x86_64 c4c697416bfc2ea0b336582336f2ec652e97ae1d
+  winnt-i386 639b6511a6eea6c042f5cb2d9d5ca6730ff6d4b2
+  winnt-x86_64 d6163e4427e16760782b07b4e0332c443f9fc542
+
 S 2014-09-16 828e075
   winnt-x86_64 ce1e9d7f6967bfa368853e7c968e1626cc319951
   winnt-i386 a8bd994666dfe683a5d7922c7998500255780724