Skip to content

Commit b93e089

Browse files
committed
---
yaml --- r: 33427 b: refs/heads/snap-stage3 c: 082d3d5 h: refs/heads/master i: 33425: 98be449 33423: 014d738 v: v3
1 parent ecd23ef commit b93e089

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
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: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 4edb88112409c111790dacacb06c22de2ef8da06
4+
refs/heads/snap-stage3: 082d3d51674203d97fd21e6cda6181b4dccfb2e1
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/net_tcp.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,8 @@ mod test {
13871387
let sock = result::unwrap(move connect_result);
13881388
13891389
// This is what we are actually testing!
1390-
assert net::ip::format_addr(&sock.get_peer_addr()) == ~"127.0.0.1";
1390+
assert net::ip::format_addr(&sock.get_peer_addr()) ==
1391+
~"127.0.0.1";
13911392
assert net::ip::get_port(&sock.get_peer_addr()) == 8887;
13921393

13931394
// Fulfill the protocol the test server expects

branches/snap-stage3/src/libstd/uv_ll.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1484,7 +1484,7 @@ pub mod test {
14841484
fn impl_uv_tcp_server_and_request() unsafe {
14851485
let bind_ip = ~"0.0.0.0";
14861486
let request_ip = ~"127.0.0.1";
1487-
let port = 8887;
1487+
let port = 8886;
14881488
let kill_server_msg = ~"does a dog have buddha nature?";
14891489
let server_resp_msg = ~"mu!";
14901490
let client_port = core::comm::Port::<~str>();

0 commit comments

Comments
 (0)