---

yaml
---
r: 52182
b: refs/heads/dist-snap
c: aebbd6b
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 9b8c04e236145e15a22da2e3a71fbf0ebe4b8b1f
+refs/heads/dist-snap: aebbd6bb4690e5854e4f7f54f2d9672a67c845c8
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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 {