Upgrade to Rust Edition 2024

.gitignore

@@ -1 +1,2 @@
 **/target
+tmp

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "3"
 members = [
     "zeroconf",
     "zeroconf-macros",

examples/browser/Cargo.toml

@@ -2,7 +2,7 @@
 name = "zeroconf-browser-example"
 version = "0.1.0"
 authors = ["Walker Crouse <walkercrouse@hotmail.com>"]
-edition = "2018"
+edition = "2024"
 
 [dependencies]
 zeroconf = { path = "../../zeroconf" }

examples/service/Cargo.toml

@@ -2,7 +2,7 @@
 name = "zeroconf-service-example"
 version = "0.1.0"
 authors = ["Walker Crouse <walkercrouse@hotmail.com>"]
-edition = "2018"
+edition = "2024"
 
 [dependencies]
 zeroconf = { path = "../../zeroconf" }

zeroconf-macros/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "zeroconf-macros"
-version = "0.1.4"
+version = "0.2.0"
 authors = ["Walker Crouse <walkercrouse@hotmail.com>"]
-edition = "2018"
+edition = "2024"
 description = "Macros for zeroconf crate"
 readme = "../README.md"
 homepage = "https://github.com/windy1/zeroconf-rs"

zeroconf-macros/src/lib.rs

@@ -13,11 +13,11 @@ fn impl_from_raw(ast: &DeriveInput) -> TokenStream {
     let name = &ast.ident;
     let generics = &ast.generics;
 
-    let gen = quote! {
+    let result = quote! {
         impl #generics crate::ffi::FromRaw<#name #generics> for #name #generics {}
     };
 
-    gen.into()
+    result.into()
 }
 
 #[proc_macro_derive(CloneRaw)]
@@ -29,11 +29,11 @@ fn impl_clone_raw(ast: &DeriveInput) -> TokenStream {
     let name = &ast.ident;
     let generics = &ast.generics;
 
-    let gen = quote! {
+    let result = quote! {
         impl #generics crate::ffi::CloneRaw<#name #generics> for #name #generics {}
     };
 
-    gen.into()
+    result.into()
 }
 
 #[proc_macro_derive(AsRaw)]
@@ -45,11 +45,11 @@ fn impl_as_raw(ast: &DeriveInput) -> TokenStream {
     let name = &ast.ident;
     let generics = &ast.generics;
 
-    let gen = quote! {
+    let result = quote! {
         impl #generics crate::ffi::AsRaw for #name #generics {}
     };
 
-    gen.into()
+    result.into()
 }
 
 #[proc_macro_derive(BuilderDelegate)]
@@ -65,9 +65,9 @@ fn impl_builder_delegate(ast: &DeriveInput) -> TokenStream {
 
     let generics = &ast.generics;
 
-    let gen = quote! {
+    let result = quote! {
         impl #generics crate::prelude::BuilderDelegate<#builder #generics> for #name #generics {}
     };
 
-    gen.into()
+    result.into()
 }

zeroconf/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "zeroconf"
-version = "0.16.0"
+version = "0.17.0"
 authors = ["Walker Crouse <walkercrouse@hotmail.com>"]
-edition = "2018"
+edition = "2024"
 description = "cross-platform library that wraps ZeroConf/mDNS implementations like Bonjour or Avahi"
 readme = "../README.md"
 homepage = "https://github.com/windy1/zeroconf-rs"
@@ -25,7 +25,7 @@ derive_builder = "0.9.0"
 derive-new = "0.5.9"
 log = "0.4.20"
 libc = "0.2.148"
-zeroconf-macros = { path = "../zeroconf-macros", version = "0.1.4" }
+zeroconf-macros = { path = "../zeroconf-macros", version = "0.2.0" }
 
 [dev-dependencies]
 env_logger = "0.10.0"

zeroconf/src/avahi/avahi_util.rs

@@ -2,8 +2,8 @@
 
 use crate::ffi::c_str;
 use avahi_sys::{
-    avahi_address_snprint, avahi_alternative_service_name, avahi_strerror, AvahiAddress,
-    AvahiClient,
+    AvahiAddress, AvahiClient, avahi_address_snprint, avahi_alternative_service_name,
+    avahi_strerror,
 };
 use libc::c_char;
 use std::ffi::CStr;
@@ -22,11 +22,13 @@ pub unsafe fn avahi_address_to_string(addr: *const AvahiAddress) -> String {
 
     let addr_str = c_string!(alloc(avahi_sys::AVAHI_ADDRESS_STR_MAX as usize));
 
-    avahi_address_snprint(
-        addr_str.as_ptr() as *mut c_char,
-        avahi_sys::AVAHI_ADDRESS_STR_MAX as usize,
-        addr,
-    );
+    unsafe {
+        avahi_address_snprint(
+            addr_str.as_ptr() as *mut c_char,
+            avahi_sys::AVAHI_ADDRESS_STR_MAX as usize,
+            addr,
+        );
+    }
 
     String::from(c_str::to_str(&addr_str))
         .trim_matches(char::from(0))
@@ -38,17 +40,19 @@ pub unsafe fn avahi_address_to_string(addr: *const AvahiAddress) -> String {
 /// # Safety
 /// This function is unsafe because of internal Avahi calls.
 pub unsafe fn get_error<'a>(code: i32) -> &'a str {
-    CStr::from_ptr(avahi_strerror(code))
-        .to_str()
-        .expect("could not fetch Avahi error string")
+    unsafe {
+        CStr::from_ptr(avahi_strerror(code))
+            .to_str()
+            .expect("could not fetch Avahi error string")
+    }
 }
 
 /// Returns the last error message associated with the specified `*mut AvahiClient`.
 ///
 /// # Safety
 /// This function is unsafe because of internal Avahi calls.
 pub unsafe fn get_last_error<'a>(client: *mut AvahiClient) -> &'a str {
-    get_error(avahi_sys::avahi_client_errno(client))
+    unsafe { get_error(avahi_sys::avahi_client_errno(client)) }
 }
 
 /// Converts the specified [`NetworkInterface`] to the Avahi expected value.
@@ -77,7 +81,7 @@ pub unsafe fn sys_exec<F: FnOnce() -> i32>(func: F, message: &str) -> Result<()>
     let err = func();
 
     if err < 0 {
-        Err(format!("{}: `{}`", message, get_error(err)).into())
+        Err(format!("{}: `{}`", message, unsafe { get_error(err) }).into())
     } else {
         Ok(())
     }
@@ -98,7 +102,9 @@ pub fn format_browser_type(service_type: &ServiceType) -> String {
     }
 
     if sub_types.len() > 1 {
-        warn!("browsing by multiple sub-types is not supported on Avahi devices, using first sub-type only");
+        warn!(
+            "browsing by multiple sub-types is not supported on Avahi devices, using first sub-type only"
+        );
     }
 
     format_sub_type(&sub_types[0], &kind)
@@ -119,15 +125,15 @@ pub fn format_sub_type(sub_type: &str, kind: &str) -> String {
 /// # Safety
 /// This function is unsafe because of the call to `avahi_alternative_service_name`.
 pub unsafe fn alternative_service_name(name: &CStr) -> &CStr {
-    CStr::from_ptr(avahi_alternative_service_name(name.as_ptr()))
+    unsafe { CStr::from_ptr(avahi_alternative_service_name(name.as_ptr())) }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
     use avahi_sys::{
-        AvahiAddress__bindgen_ty_1, AvahiIPv4Address, AvahiIPv6Address, AVAHI_PROTO_INET,
-        AVAHI_PROTO_INET6,
+        AVAHI_PROTO_INET, AVAHI_PROTO_INET6, AvahiAddress__bindgen_ty_1, AvahiIPv4Address,
+        AvahiIPv6Address,
     };
 
     #[test]