diff --git a/src/smol.rs b/src/smol.rs index f905a18..4d3e55b 100644 --- a/src/smol.rs +++ b/src/smol.rs @@ -20,7 +20,7 @@ pub struct SmolSocket(Async); impl FromRawFd for SmolSocket { unsafe fn from_raw_fd(fd: RawFd) -> Self { let socket = Socket::from_raw_fd(fd); - socket.set_non_blocking(true).unwrap(); + socket.set_nonblocking(true).unwrap(); SmolSocket(Async::new(socket).unwrap()) } } diff --git a/src/socket.rs b/src/socket.rs index f73b90c..80da625 100644 --- a/src/socket.rs +++ b/src/socket.rs @@ -137,10 +137,10 @@ impl Socket { // when building with --features smol we don't need this #[allow(dead_code)] /// Make this socket non-blocking - pub fn set_non_blocking(&self, non_blocking: bool) -> Result<()> { - let mut non_blocking = non_blocking as libc::c_int; + pub fn set_nonblocking(&self, nonblocking: bool) -> Result<()> { + let mut nonblocking = nonblocking as libc::c_int; let res = unsafe { - libc::ioctl(self.as_raw_fd(), libc::FIONBIO, &mut non_blocking) + libc::ioctl(self.as_raw_fd(), libc::FIONBIO, &mut nonblocking) }; if res < 0 { return Err(Error::last_os_error()); @@ -689,10 +689,10 @@ mod test { } #[test] - fn set_non_blocking() { + fn set_nonblocking() { let sock = Socket::new(NETLINK_ROUTE).unwrap(); - sock.set_non_blocking(true).unwrap(); - sock.set_non_blocking(false).unwrap(); + sock.set_nonblocking(true).unwrap(); + sock.set_nonblocking(false).unwrap(); } #[test] diff --git a/src/tokio.rs b/src/tokio.rs index ff3c5f2..2fc5e80 100644 --- a/src/tokio.rs +++ b/src/tokio.rs @@ -18,7 +18,7 @@ pub struct TokioSocket(AsyncFd); impl FromRawFd for TokioSocket { unsafe fn from_raw_fd(fd: RawFd) -> Self { let socket = Socket::from_raw_fd(fd); - socket.set_non_blocking(true).unwrap(); + socket.set_nonblocking(true).unwrap(); TokioSocket(AsyncFd::new(socket).unwrap()) } } @@ -41,7 +41,7 @@ impl AsyncSocket for TokioSocket { fn new(protocol: isize) -> io::Result { let socket = Socket::new(protocol)?; - socket.set_non_blocking(true)?; + socket.set_nonblocking(true)?; Ok(Self(AsyncFd::new(socket)?)) }