From 282d8b9749309b422528dde4043adc8239f78713 Mon Sep 17 00:00:00 2001 From: Yury Yarashevich Date: Wed, 21 Aug 2024 14:47:39 +0200 Subject: [PATCH] Fix clippy failing CI. --- generate_bindings.sh | 2 +- system-configuration-sys/src/dynamic_store.rs | 6 +++--- .../src/dynamic_store_copy_specific.rs | 6 +++--- system-configuration-sys/src/network_configuration.rs | 6 +++--- system-configuration-sys/src/network_reachability.rs | 8 ++++---- system-configuration-sys/src/preferences.rs | 6 +++--- system-configuration-sys/src/schema_definitions.rs | 6 +++--- system-configuration/src/network_configuration.rs | 3 +-- system-configuration/src/network_reachability.rs | 2 +- 9 files changed, 22 insertions(+), 23 deletions(-) diff --git a/generate_bindings.sh b/generate_bindings.sh index b21e98f..5b1048d 100755 --- 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 index 76e7739..a0fb675 100644 --- 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 index cb0f237..6012810 100644 --- 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 index 037ef28..f5fccdb 100644 --- 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 index 3881adb..bbf769f 100644 --- 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 index 4292e48..442e4a7 100644 --- 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 index 7bdca99..47a2882 100644 --- 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 index a172cf8..88f4483 100644 --- 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 index d52e868..ccc7240 100644 --- 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" ); }