---

yaml
---
r: 41634
b: refs/heads/master
c: aebbd6b
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9b8c04e236145e15a22da2e3a71fbf0ebe4b8b1f
+refs/heads/master: aebbd6bb4690e5854e4f7f54f2d9672a67c845c8
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libstd/net_tcp.rs

@@ -1273,7 +1273,7 @@ type TcpBufferedSocketData = {
 mod test {
     use net::ip;
     use net::tcp::{GenericListenErr, TcpConnectErrData, TcpListenErrData};
-    use net::tcp::{TcpSocket, accept, connect, listen, read, socket_buf};
+    use net::tcp::{connect, accept, read, listen, TcpSocket, socket_buf};
     use net;
     use uv::iotask::IoTask;
     use uv;
@@ -1293,6 +1293,8 @@ mod test {
     mod tcp_ipv4_server_and_client_test {
         #[cfg(target_arch="x86_64")]
         mod impl64 {
+            use net::tcp::test::tcp_ipv4_server_and_client_test::*;
+
             #[test]
             fn test_gl_tcp_server_and_client_ipv4() unsafe {
                 impl_gl_tcp_ipv4_server_and_client();
@@ -1324,6 +1326,8 @@ mod test {
         }
         #[cfg(target_arch="x86")]
         mod impl32 {
+            use net::tcp::test::tcp_ipv4_server_and_client_test::*;
+
             #[test]
             #[ignore(cfg(target_os = "linux"))]
             fn test_gl_tcp_server_and_client_ipv4() unsafe {