Update to edition 2024

Author: hulthe

.github/workflows/build-and-test.yml

@@ -17,7 +17,7 @@ jobs:
   build-and-test:
     strategy:
       matrix:
-        rust: [stable, beta, nightly, 1.38.0]
+        rust: [stable, beta, nightly, 1.85.0]
     runs-on: ubuntu-latest
     steps:
       - name: Install build dependencies

CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 - Rename `Socket::recv` to `Socket::recv_raw`.
 - Add new `Socket::recv` that returns an iterator of netlink messages (`NlMessages`).
+- Update to Rust 2024 and bump MSRV to 1.85.
 
 
 ## [0.2.3] - 2025-10-28

Cargo.toml

@@ -3,3 +3,5 @@ members = [
     "mnl-sys",
     "mnl",
 ]
+
+resolver = "3"

mnl-sys/Cargo.toml

@@ -8,8 +8,8 @@ repository = "https://github.com/mullvad/mnl-rs"
 readme = "README.md"
 keywords = ["netlink", "libmnl"]
 categories = ["network-programming", "os::unix-apis", "external-ffi-bindings", "no-std"]
-edition = "2018"
-rust-version = "1.38"
+edition = "2024"
+rust-version = "1.85"
 links = "mnl"
 
 [badges]

mnl-sys/src/bindings.rs

@@ -1,5 +1,5 @@
 use core::option::Option;
-use libc::{c_char, c_int, c_uint, c_void, nlattr, nlmsghdr, pid_t, socklen_t, FILE};
+use libc::{FILE, c_char, c_int, c_uint, c_void, nlattr, nlmsghdr, pid_t, socklen_t};
 
 pub const MNL_SOCKET_AUTOPID: c_int = 0;
 pub const MNL_ALIGNTO: c_int = 4;
@@ -35,7 +35,7 @@ pub struct mnl_socket(c_void);
 #[repr(C)]
 pub struct mnl_nlmsg_batch(c_void);
 
-extern "C" {
+unsafe extern "C" {
     pub fn mnl_socket_open(bus: c_int) -> *mut mnl_socket;
 
     #[cfg(feature = "mnl-1-0-4")]
@@ -158,13 +158,13 @@ extern "C" {
     pub fn mnl_attr_put_u8_check(nlh: *mut nlmsghdr, buflen: usize, type_: u16, data: u8) -> bool;
 
     pub fn mnl_attr_put_u16_check(nlh: *mut nlmsghdr, buflen: usize, type_: u16, data: u16)
-        -> bool;
+    -> bool;
 
     pub fn mnl_attr_put_u32_check(nlh: *mut nlmsghdr, buflen: usize, type_: u16, data: u32)
-        -> bool;
+    -> bool;
 
     pub fn mnl_attr_put_u64_check(nlh: *mut nlmsghdr, buflen: usize, type_: u16, data: u64)
-        -> bool;
+    -> bool;
 
     pub fn mnl_attr_put_str_check(
         nlh: *mut nlmsghdr,

mnl/Cargo.toml

@@ -8,8 +8,8 @@ repository = "https://github.com/mullvad/mnl-rs"
 readme = "../README.md"
 keywords = ["netlink", "libmnl"]
 categories = ["network-programming", "os::unix-apis", "api-bindings"]
-edition = "2018"
-rust-version = "1.38"
+edition = "2024"
+rust-version = "1.85"
 
 [badges]
 travis-ci = { repository = "mullvad/mnl-rs" }

mnl/src/messages.rs

@@ -159,10 +159,12 @@ mod tests {
 
         let result: Result<Vec<_>, _> = NlMessages::new(&buffer).collect();
         assert!(result.is_err());
-        assert!(result
-            .unwrap_err()
-            .to_string()
-            .contains("Invalid netlink message length"));
+        assert!(
+            result
+                .unwrap_err()
+                .to_string()
+                .contains("Invalid netlink message length")
+        );
     }
 
     #[test]
@@ -173,10 +175,12 @@ mod tests {
 
         let result: Result<Vec<_>, _> = NlMessages::new(&buffer).collect();
         assert!(result.is_err());
-        assert!(result
-            .unwrap_err()
-            .to_string()
-            .contains("exceeds remaining buffer size"));
+        assert!(
+            result
+                .unwrap_err()
+                .to_string()
+                .contains("exceeds remaining buffer size")
+        );
     }
 
     #[test]

mnl/src/socket.rs

@@ -8,7 +8,7 @@ use std::{
     os::unix::io::{AsRawFd, RawFd},
 };
 
-use crate::{cvt::cvt, NlMessages};
+use crate::{NlMessages, cvt::cvt};
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 #[allow(missing_docs)]
@@ -127,10 +127,7 @@ impl Socket {
     {
         for data in iter {
             if self.send(data)? < data.len() {
-                return Err(io::Error::new(
-                    io::ErrorKind::Other,
-                    "sendto did not send entire message",
-                ));
+                return Err(io::Error::other("sendto did not send entire message"));
             }
         }
         Ok(())