Move the openbsd-specific case after the general unix code.

deprecrated · May 19, 2020 · f98618d · f98618d
1 parent f061e5e
commit f98618d
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/src/ext.rs b/src/ext.rs
@@ -738,24 +738,6 @@ impl TcpStreamExt for TcpStream {
         Ok(Some((secs as u32) * 1000))
     }
 
-    #[cfg(target_os = "openbsd")]
-    fn set_keepalive_ms(&self, keepalive: Option<u32>) -> io::Result<()> {
-        set_opt(self.as_sock(), SOL_SOCKET, SO_KEEPALIVE,
-                    keepalive.is_some() as c_int)?;
-        Ok(())
-    }
-
-    #[cfg(target_os = "openbsd")]
-    fn keepalive_ms(&self) -> io::Result<Option<u32>> {
-        let keepalive = get_opt::<c_int>(self.as_sock(), SOL_SOCKET,
-                                             SO_KEEPALIVE)?;
-        if keepalive == 0 {
-            return Ok(None)
-        } else {
-            return Ok(Some(1u32))
-        }
-    }
-
     #[cfg(all(unix, not(target_os = "openbsd")))]
     fn set_keepalive_ms(&self, keepalive: Option<u32>) -> io::Result<()> {
         try!(set_opt(self.as_sock(), SOL_SOCKET, SO_KEEPALIVE,
@@ -779,6 +761,24 @@ impl TcpStreamExt for TcpStream {
         Ok(Some((secs as u32) * 1000))
     }
 
+    #[cfg(target_os = "openbsd")]
+    fn set_keepalive_ms(&self, keepalive: Option<u32>) -> io::Result<()> {
+        set_opt(self.as_sock(), SOL_SOCKET, SO_KEEPALIVE,
+                    keepalive.is_some() as c_int)?;
+        Ok(())
+    }
+
+    #[cfg(target_os = "openbsd")]
+    fn keepalive_ms(&self) -> io::Result<Option<u32>> {
+        let keepalive = get_opt::<c_int>(self.as_sock(), SOL_SOCKET,
+                                             SO_KEEPALIVE)?;
+        if keepalive == 0 {
+            return Ok(None)
+        } else {
+            return Ok(Some(1u32))
+        }
+    }
+
     #[cfg(target_os = "wasi")]
     fn set_keepalive_ms(&self, _keepalive: Option<u32>) -> io::Result<()> {
         unimplemented!()