---

yaml
---
r: 187761
b: refs/heads/tmp
c: 0fc1a7d
h: refs/heads/master
i:
  187759: 62ca581
v: v3

Author: tbu-

[refs]

@@ -34,5 +34,5 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: d0c589d5ced5006f72d766af2ccecf699ff76176
+refs/heads/tmp: 0fc1a7da93e5d431f5cd54a3f1263e2a5f9e5748
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/tmp/src/libstd/sys/windows/mod.rs

@@ -194,11 +194,11 @@ pub fn wouldblock() -> bool {
 
 pub fn set_nonblocking(fd: sock_t, nb: bool) {
     let mut set = nb as libc::c_ulong;
-    (if unsafe { c::ioctlsocket(fd, c::FIONBIO, &mut set) } != 0 {
-        Err(last_error())
-    } else {
-        Ok(())
-    }).unwrap();
+    if unsafe { c::ioctlsocket(fd, c::FIONBIO, &mut set) } != 0 {
+        // The above function should not return an error unless we passed it
+        // invalid parameters. Panic on errors.
+        Err(last_error()).unwrap();
+    }
 }
 
 pub fn init_net() {