Skip to content

Commit b3136f8

Browse files
committed
---
yaml --- r: 134991 b: refs/heads/snap-stage3 c: 5d653c1 h: refs/heads/master i: 134989: 6fc4e98 134987: 5845565 134983: 1f3c8d8 134975: a356b89 v: v3
1 parent f75e132 commit b3136f8

File tree

5 files changed

+13
-2
lines changed

5 files changed

+13
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 7eb9337dace88c5ded431aa7507f06d50619131b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: c59ef666a53872d0b1629f00c201dc801810da72
4+
refs/heads/snap-stage3: 5d653c17a656e8fe1572c7a695e33b188eda0597
55
refs/heads/try: 14378ea357c06c23607ca61ade44f60a7a64a1c7
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libserialize/serialize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ macro_rules! tuple (
503503
$(let $name = $name; n += 1;)*
504504
s.emit_tuple(n, |s| {
505505
let mut i = 0;
506-
$(try!(s.emit_seq_elt({ i+=1; i-1 }, |s| $name.encode(s)));)*
506+
$(try!(s.emit_tuple_arg({ i+=1; i-1 }, |s| $name.encode(s)));)*
507507
Ok(())
508508
})
509509
}

branches/snap-stage3/src/libstd/io/net/pipe.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,7 @@ mod tests {
751751
assert!(a2.accept().is_ok());
752752
})
753753

754+
#[cfg(not(windows))] // FIXME #17553
754755
iotest!(fn clone_accept_concurrent() {
755756
let addr = next_test_unix();
756757
let l = UnixListener::bind(&addr);

branches/snap-stage3/src/libstd/io/net/udp.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@ mod test {
545545
serv_rx.recv();
546546
})
547547

548+
#[cfg(not(windows))] // FIXME #17553
548549
iotest!(fn recv_from_timeout() {
549550
let addr1 = next_test_ip4();
550551
let addr2 = next_test_ip4();

branches/snap-stage3/src/snapshots.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
S 2014-09-22 437179e
2+
freebsd-x86_64 f693c0441de3dbb2d471dde5a5045ac8a48807d8
3+
linux-i386 5c2132b65f45c21b43d28de6a9460978b1a7b08a
4+
linux-x86_64 152be582853c2cf1ddcc88b085153b52ebbeb065
5+
macos-i386 7adbb076aeae8e1d9bdf3fe968bc7ef8a8fe0096
6+
macos-x86_64 c4c697416bfc2ea0b336582336f2ec652e97ae1d
7+
winnt-i386 639b6511a6eea6c042f5cb2d9d5ca6730ff6d4b2
8+
winnt-x86_64 d6163e4427e16760782b07b4e0332c443f9fc542
9+
110
S 2014-09-16 828e075
211
winnt-x86_64 ce1e9d7f6967bfa368853e7c968e1626cc319951
312
winnt-i386 a8bd994666dfe683a5d7922c7998500255780724

0 commit comments

Comments
 (0)