---

yaml
---
r: 185873
b: refs/heads/auto
c: 0fc1a7d
h: refs/heads/master
i:
  185871: ca8f7c8
v: v3

Author: tbu-

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: d0c589d5ced5006f72d766af2ccecf699ff76176
+refs/heads/auto: 0fc1a7da93e5d431f5cd54a3f1263e2a5f9e5748
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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() {