---

yaml
---
r: 34501
b: refs/heads/snap-stage3
c: 0ce0f83
h: refs/heads/master
i:
  34499: d8c258a
v: v3

Author: catamorphism

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e1c52a4a9f9bcc99f7978f65dd53302050f04de4
+refs/heads/snap-stage3: 0ce0f83a388ff9ec7b5de186095ea1932f8bb908
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 //! High-level interface to libuv's TCP functionality
-// XXX Need FFI fixes
+// FIXME #4425: Need FFI fixes
 #[allow(deprecated_mode)];
 
 use future;
@@ -1546,23 +1546,21 @@ pub mod test {
         }
     }
     pub fn impl_gl_tcp_ipv4_server_client_reader_writer() {
-        /*
-         XXX: Causes an ICE.
 
         let iotask = uv::global_loop::get();
         let server_ip = ~"127.0.0.1";
         let server_port = 8891u;
         let expected_req = ~"ping";
         let expected_resp = ~"pong";
 
-        let server_result_po = core::comm::port::<~str>();
-        let server_result_ch = core::comm::chan(server_result_po);
+        let server_result_po = oldcomm::Port::<~str>();
+        let server_result_ch = oldcomm::Chan(&server_result_po);
 
-        let cont_po = core::comm::port::<()>();
-        let cont_ch = core::comm::chan(cont_po);
+        let cont_po = oldcomm::Port::<()>();
+        let cont_ch = oldcomm::Chan(&cont_po);
         // server
         do task::spawn_sched(task::ManualThreads(1u)) {
-            let actual_req = do comm::listen |server_ch| {
+            let actual_req = do oldcomm::listen |server_ch| {
                 run_tcp_test_server(
                     server_ip,
                     server_port,
@@ -1573,29 +1571,28 @@ pub mod test {
             };
             server_result_ch.send(actual_req);
         };
-        core::comm::recv(cont_po);
+        oldcomm::recv(cont_po);
         // client
         let server_addr = ip::v4::parse_addr(server_ip);
         let conn_result = connect(server_addr, server_port, iotask);
-        if result::is_err(conn_result) {
+        if result::is_err(&conn_result) {
             assert false;
         }
         let sock_buf = @socket_buf(result::unwrap(conn_result));
         buf_write(sock_buf, expected_req);
 
         // so contrived!
-        let actual_resp = do str::as_bytes(expected_resp) |resp_buf| {
-            buf_read(sock_buf, vec::len(resp_buf))
+        let actual_resp = do str::as_bytes(&expected_resp) |resp_buf| {
+            buf_read(sock_buf, resp_buf.len())
         };
 
-        let actual_req = core::comm::recv(server_result_po);
+        let actual_req = oldcomm::recv(server_result_po);
         log(debug, fmt!("REQ: expected: '%s' actual: '%s'",
                        expected_req, actual_req));
         log(debug, fmt!("RESP: expected: '%s' actual: '%s'",
                        expected_resp, actual_resp));
         assert str::contains(actual_req, expected_req);
         assert str::contains(actual_resp, expected_resp);
-        */
     }
 
     pub fn impl_tcp_socket_impl_reader_handles_eof() {