upgrade nix to 0.28.0

this fixes builds on s390x+musl
SamuelYvon · Feb 25, 2024 · b26a5a5 · b26a5a5
1 parent 02095dc
commit b26a5a5
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,5 +28,6 @@ windows = { version = "0.42.0", features = [
 version = "0.17.1"
 features = ["extension-module", "abi3-py37"]
 
-[target.'cfg(unix)'.dependencies]
-nix = { version = "0.25.0" }
+[target.'cfg(unix)'.dependencies.nix]
+version = "0.28.0"
+features = ["net"]
diff --git a/src/linux.rs b/src/linux.rs
@@ -1,4 +1,3 @@
-use crate::ip_to_string;
 use crate::types::{
     AddrPairs, IfAddrs, ADDR_ADDR, AF_ALG, AF_INET, AF_INET6, AF_NETLINK, AF_PACKET, AF_VSOCK,
     BROADCAST_ADDR, MASK_ADDR, PEER_ADDR,
@@ -71,13 +70,7 @@ pub fn linux_ifaddresses(if_name: &str) -> Result<IfAddrs, Box<dyn std::error::E
                 }
 
                 if let Some(inet_addr) = address.as_sockaddr_in() {
-                    add_to_types_mat(
-                        AF_INET,
-                        &ip_to_string(inet_addr.ip()),
-                        name,
-                        &mut types_mat,
-                        &mut any,
-                    );
+                    add_to_types_mat(AF_INET, &inet_addr.ip(), name, &mut types_mat, &mut any);
                 }
 
                 #[cfg(not(any(target_os = "ios", target_os = "macos")))]