single_instance: upgrade dependencies

Author: skerkour

Cargo.lock

@@ -76,6 +76,7 @@ indexmap = { version = "2" }
 libc = "0.2"
 memchr = "2"
 mime = "0.3"
+nix = { version = "0.31", features = ["socket"] }
 nom = "7"
 paste = { git = "https://github.com/dtolnay/paste", ref = "6a302522990cbfd9de4e0c61d91854622f7b2999" }
 rand = "0.9"

Cargo.toml

@@ -10,5 +10,5 @@ path = "./single_instance.rs"
 thiserror = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
-libc = "0.2"
-nix = { version = "0.23.0" }
+libc = { workspace = true }
+nix = { workspace = true }

single_instance/Cargo.toml

@@ -44,18 +44,15 @@ pub use self::inner::*;
 
 #[cfg(any(target_os = "linux", target_os = "android"))]
 mod inner {
-    use std::os::unix::prelude::RawFd;
+    use std::os::unix::io::{AsRawFd, OwnedFd};
 
-    use nix::{
-        sys::socket::{self, UnixAddr},
-        unistd,
-    };
+    use nix::sys::socket::{self, UnixAddr};
 
     use super::Error;
 
     /// A struct representing one running instance.
     pub struct SingleInstance {
-        maybe_sock: Option<RawFd>,
+        maybe_sock: Option<OwnedFd>,
     }
 
     impl SingleInstance {
@@ -71,7 +68,7 @@ mod inner {
                 None,
             )?;
 
-            let maybe_sock = match socket::bind(sock, &socket::SockAddr::Unix(addr)) {
+            let maybe_sock = match socket::bind(sock.as_raw_fd(), &addr) {
                 Ok(()) => Some(sock),
                 Err(nix::errno::Errno::EADDRINUSE) => None,
                 Err(e) => return Err(e.into()),
@@ -90,9 +87,9 @@ mod inner {
 
     impl Drop for SingleInstance {
         fn drop(&mut self) {
-            if let Some(sock) = self.maybe_sock {
-                // Intentionally discard any close errors.
-                let _ = unistd::close(sock);
+            // OwnedFd closes the file descriptor automatically on drop.
+            if let Some(sock) = self.maybe_sock.take() {
+                drop(sock);
             }
         }
     }