Merge remote-tracking branch 'origin/main'

mullvad · Aug 22, 2024 · 6793345 · 6793345
2 parents d180e68 + 282d8b9
commit 6793345
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 23 deletions.
diff --git a/generate_bindings.sh b/generate_bindings.sh
@@ -215,7 +215,7 @@ bindgen \
     --blocklist-type "Boolean" \
     --blocklist-type "dispatch_.*" \
     --blocklist-type "(sockaddr|socklen_t|sa_family_t|__darwin_socklen_t|__uint.*_t)" \
-    --raw-line '#![cfg_attr(feature = "cargo-clippy", allow(clippy::unreadable_literal))]' \
+    --raw-line '#![allow(clippy::unreadable_literal)]' \
     --raw-line "use core_foundation_sys::base::{Boolean, CFAllocatorRef, CFTypeID, CFIndex};" \
     --raw-line "use core_foundation_sys::string::CFStringRef;" \
     --raw-line "use core_foundation_sys::runloop::CFRunLoopRef;" \

diff --git a/system-configuration-sys/src/dynamic_store.rs b/system-configuration-sys/src/dynamic_store.rs
@@ -1,8 +1,8 @@
-/* automatically generated by rust-bindgen 0.66.1 */
+/* automatically generated by rust-bindgen 0.70.1 */
 
 // Generated using:
-// bindgen 0.66.1
-// macOS SDK 13.3.
+// bindgen 0.70.1
+// macOS SDK 14.5.
 
 use core::ffi::c_void;
 use core_foundation_sys::array::CFArrayRef;

diff --git a/system-configuration-sys/src/dynamic_store_copy_specific.rs b/system-configuration-sys/src/dynamic_store_copy_specific.rs
@@ -1,8 +1,8 @@
-/* automatically generated by rust-bindgen 0.66.1 */
+/* automatically generated by rust-bindgen 0.70.1 */
 
 // Generated using:
-// bindgen 0.66.1
-// macOS SDK 13.3.
+// bindgen 0.70.1
+// macOS SDK 14.5.
 
 use crate::dynamic_store::SCDynamicStoreRef;
 use core_foundation_sys::dictionary::CFDictionaryRef;

diff --git a/system-configuration-sys/src/network_configuration.rs b/system-configuration-sys/src/network_configuration.rs
@@ -1,8 +1,8 @@
-/* automatically generated by rust-bindgen 0.66.1 */
+/* automatically generated by rust-bindgen 0.70.1 */
 
 // Generated using:
-// bindgen 0.66.1
-// macOS SDK 13.3.
+// bindgen 0.70.1
+// macOS SDK 14.5.
 
 use core::ffi::c_void;
 use core_foundation_sys::array::CFArrayRef;

diff --git a/system-configuration-sys/src/network_reachability.rs b/system-configuration-sys/src/network_reachability.rs
@@ -1,10 +1,10 @@
-/* automatically generated by rust-bindgen 0.66.1 */
+/* automatically generated by rust-bindgen 0.70.1 */
 
 // Generated using:
-// bindgen 0.66.1
-// macOS SDK 13.3.
+// bindgen 0.70.1
+// macOS SDK 14.5.
 
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::unreadable_literal))]
+#![allow(clippy::unreadable_literal)]
 use crate::dispatch_queue_t;
 use core_foundation_sys::base::{Boolean, CFAllocatorRef, CFIndex, CFTypeID};
 use core_foundation_sys::runloop::CFRunLoopRef;

diff --git a/system-configuration-sys/src/preferences.rs b/system-configuration-sys/src/preferences.rs
@@ -1,8 +1,8 @@
-/* automatically generated by rust-bindgen 0.66.1 */
+/* automatically generated by rust-bindgen 0.70.1 */
 
 // Generated using:
-// bindgen 0.66.1
-// macOS SDK 13.3.
+// bindgen 0.70.1
+// macOS SDK 14.5.
 
 use core::ffi::c_void;
 use core_foundation_sys::array::CFArrayRef;

diff --git a/system-configuration-sys/src/schema_definitions.rs b/system-configuration-sys/src/schema_definitions.rs
@@ -1,8 +1,8 @@
-/* automatically generated by rust-bindgen 0.66.1 */
+/* automatically generated by rust-bindgen 0.70.1 */
 
 // Generated using:
-// bindgen 0.66.1
-// macOS SDK 13.3.
+// bindgen 0.70.1
+// macOS SDK 14.5.
 
 use core_foundation_sys::string::CFStringRef;
 

diff --git a/system-configuration/src/network_configuration.rs b/system-configuration/src/network_configuration.rs
@@ -339,8 +339,7 @@ mod test {
         assert!(service_order.iter().all(|service_id| {
             services
                 .iter()
-                .find(|service| service.id().as_ref() == Some(&*service_id))
-                .is_some()
+                .any(|service| service.id().as_ref() == Some(&*service_id))
         }))
     }
 

diff --git a/system-configuration/src/network_reachability.rs b/system-configuration/src/network_reachability.rs
@@ -514,7 +514,7 @@ mod test {
 
         // Can only testify that an empty string is invalid, everything else seems to work
         assert!(
-            !SCNetworkReachability::from_host(&get_cstring("")).is_some(),
+            SCNetworkReachability::from_host(&get_cstring("")).is_none(),
             "Constructed valid SCNetworkReachability from empty string"
         );
     }