Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make clippy happy #284

Merged
merged 1 commit into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions monoio/src/net/tcp/listener.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ impl TcpListener {
match SharedFd::new::<false>(fd) {
Ok(shared) => {
#[cfg(unix)]
stdl.into_raw_fd();
let _ = stdl.into_raw_fd();
#[cfg(windows)]
stdl.into_raw_socket();
let _ = stdl.into_raw_socket();
Ok(Self::from_shared_fd(shared))
}
Err(e) => Err(e),
Expand Down Expand Up @@ -309,9 +309,9 @@ impl Drop for TcpListener {
fn drop(&mut self) {
let listener = self.sys_listener.take().unwrap();
#[cfg(unix)]
listener.into_raw_fd();
let _ = listener.into_raw_fd();
#[cfg(windows)]
listener.into_raw_socket();
let _ = listener.into_raw_socket();
}
}

Expand Down
8 changes: 4 additions & 4 deletions monoio/src/net/tcp/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ impl TcpStream {
match SharedFd::new::<false>(fd) {
Ok(shared) => {
#[cfg(unix)]
stream.into_raw_fd();
let _ = stream.into_raw_fd();
#[cfg(windows)]
stream.into_raw_socket();
let _ = stream.into_raw_socket();
Ok(Self::from_shared_fd(shared))
}
Err(e) => Err(e),
Expand Down Expand Up @@ -651,8 +651,8 @@ impl Drop for StreamMeta {
fn drop(&mut self) {
let socket = self.socket.take().unwrap();
#[cfg(unix)]
socket.into_raw_fd();
let _ = socket.into_raw_fd();
#[cfg(windows)]
socket.into_raw_socket();
let _ = socket.into_raw_socket();
}
}
20 changes: 10 additions & 10 deletions monoio/src/net/udp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ impl UdpSocket {
let socket = unsafe { socket2::Socket::from_raw_socket(self.fd.as_raw_socket()) };
let addr = socket.peer_addr();
#[cfg(unix)]
socket.into_raw_fd();
let _ = socket.into_raw_fd();
#[cfg(windows)]
socket.into_raw_socket();
let _ = socket.into_raw_socket();
addr?
.as_socket()
.ok_or_else(|| io::ErrorKind::InvalidInput.into())
Expand All @@ -116,9 +116,9 @@ impl UdpSocket {
let socket = unsafe { socket2::Socket::from_raw_socket(self.fd.as_raw_socket()) };
let addr = socket.local_addr();
#[cfg(unix)]
socket.into_raw_fd();
let _ = socket.into_raw_fd();
#[cfg(windows)]
socket.into_raw_socket();
let _ = socket.into_raw_socket();
addr?
.as_socket()
.ok_or_else(|| io::ErrorKind::InvalidInput.into())
Expand Down Expand Up @@ -156,9 +156,9 @@ impl UdpSocket {
match SharedFd::new::<false>(fd) {
Ok(shared) => {
#[cfg(unix)]
socket.into_raw_fd();
let _ = socket.into_raw_fd();
#[cfg(windows)]
socket.into_raw_socket();
let _ = socket.into_raw_socket();
Ok(Self::from_shared_fd(shared))
}
Err(e) => Err(e),
Expand All @@ -172,13 +172,13 @@ impl UdpSocket {
let r = {
let socket = unsafe { socket2::Socket::from_raw_fd(self.fd.as_raw_fd()) };
let r = socket.set_reuse_address(reuse);
socket.into_raw_fd();
let _ = socket.into_raw_fd();
r
};
#[cfg(windows)]
let r = {
let socket = unsafe { socket2::Socket::from_raw_socket(self.fd.as_raw_socket()) };
socket.into_raw_socket();
let _ = socket.into_raw_socket();
Ok(())
};
r
Expand All @@ -191,13 +191,13 @@ impl UdpSocket {
let r = {
let socket = unsafe { socket2::Socket::from_raw_fd(self.fd.as_raw_fd()) };
let r = socket.set_reuse_port(reuse);
socket.into_raw_fd();
let _ = socket.into_raw_fd();
r
};
#[cfg(windows)]
let r = {
let socket = unsafe { socket2::Socket::from_raw_socket(self.fd.as_raw_socket()) };
socket.into_raw_socket();
let _ = socket.into_raw_socket();
Ok(())
};
r
Expand Down
2 changes: 1 addition & 1 deletion monoio/src/net/unix/datagram/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl UnixDatagram {
pub fn from_std(datagram: StdUnixDatagram) -> io::Result<Self> {
match SharedFd::new::<false>(datagram.as_raw_fd()) {
Ok(shared) => {
datagram.into_raw_fd();
let _ = datagram.into_raw_fd();
Ok(Self::from_shared_fd(shared))
}
Err(e) => Err(e),
Expand Down
4 changes: 2 additions & 2 deletions monoio/src/net/unix/listener.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ impl IntoRawFd for UnixListener {
};
std::mem::swap(&mut this.fd, &mut fd);
std::mem::swap(&mut this.sys_listener, &mut sys_listener);
sys_listener.take().unwrap().into_raw_fd();
let _ = sys_listener.take().unwrap().into_raw_fd();

fd.try_unwrap()
.expect("unexpected multiple reference to rawfd")
Expand All @@ -193,6 +193,6 @@ impl AsRawFd for UnixListener {
impl Drop for UnixListener {
#[inline]
fn drop(&mut self) {
self.sys_listener.take().unwrap().into_raw_fd();
let _ = self.sys_listener.take().unwrap().into_raw_fd();
}
}
2 changes: 1 addition & 1 deletion monoio/src/net/unix/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ impl UnixStream {
pub fn from_std(stream: std::os::unix::net::UnixStream) -> io::Result<Self> {
match SharedFd::new::<false>(stream.as_raw_fd()) {
Ok(shared) => {
stream.into_raw_fd();
let _ = stream.into_raw_fd();
Ok(Self::from_shared_fd(shared))
}
Err(e) => Err(e),
Expand Down
Loading