about summary refs log tree commit diff
path: root/src/libstd/net
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2016-03-02 22:05:14 -0800
committerSteven Fackler <sfackler@gmail.com>2016-03-02 22:05:14 -0800
commit631fa2b8c059ecf22b69941d700d9c9fce0ed47f (patch)
treeaa02452a17f9fb8df9dd19e4f957d55a5ba0d76c /src/libstd/net
parent728d9115e894bd3c8fc3ae03230ea46f85467c04 (diff)
downloadrust-631fa2b8c059ecf22b69941d700d9c9fce0ed47f.tar.gz
rust-631fa2b8c059ecf22b69941d700d9c9fce0ed47f.zip
Fix comments and OSX build
Diffstat (limited to 'src/libstd/net')
-rw-r--r--src/libstd/net/tcp.rs11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
index 0073b8f119a..f8e3b58bb3e 100644
--- a/src/libstd/net/tcp.rs
+++ b/src/libstd/net/tcp.rs
@@ -1152,9 +1152,16 @@ mod tests {
         t!(listener.set_nonblocking(true));
         t!(listener.set_nonblocking(false));
 
-        let stream = t!(TcpStream::connect(&("localhost", addr.port())));
+        let mut stream = t!(TcpStream::connect(&("localhost", addr.port())));
 
-        t!(stream.set_nonblocking(true));
         t!(stream.set_nonblocking(false));
+        t!(stream.set_nonblocking(true));
+
+        let mut buf = [0];
+        match stream.read(&mut buf) {
+            Ok(_) => panic!("expected error"),
+            Err(ref e) if e.kind() == ErrorKind::WouldBlock => {}
+            Err(e) => panic!("unexpected error {}", e),
+        }
     }
 }