Upgrade to core-foundation 0.5

Author: faern

system-configuration-sys/Cargo.toml

@@ -10,7 +10,7 @@ license = "MIT/Apache-2.0"
 build = "build.rs"
 
 [dependencies]
-core-foundation-sys = "0.4.6"
+core-foundation-sys = "0.5"
 
 [build-dependencies]
 bindgen = "0.31"

system-configuration/Cargo.toml

@@ -9,7 +9,6 @@ repository = "https://github.com/mullvad/system-configuration-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
-core-foundation = "0.4.6"
-core-foundation-sys = "0.4.6"
+core-foundation = "0.5"
 
 system-configuration-sys = { path = "../system-configuration-sys", version = "0.1" }

system-configuration/src/bin/set_dns.rs

@@ -2,7 +2,6 @@ extern crate system_configuration;
 extern crate system_configuration_sys;
 
 extern crate core_foundation;
-extern crate core_foundation_sys;
 
 use core_foundation::array::CFArray;
 use core_foundation::base::TCFType;
@@ -19,7 +18,7 @@ fn main() {
         let ipv4_dict = store
             .get("State:/Network/Global/IPv4")
             .expect("Unable to find global settings")
-            .downcast::<_, CFDictionary>()
+            .downcast_into::<CFDictionary>()
             .expect("Global IPv4 settings not a dictionary");
         println!("Got IPv4 global property list");
 
@@ -40,7 +39,7 @@ fn main() {
         let dns_dictionary =
             CFDictionary::from_CFType_pairs(&[(server_addresses_key, server_addresses_value)]);
 
-        let success = store.set(pri_service_path, &dns_dictionary);
+        let success = store.set(pri_service_path, dns_dictionary);
         println!("success? {}", success);
     }
 }

system-configuration/src/bin/watch_dns.rs

@@ -2,14 +2,11 @@ extern crate system_configuration;
 extern crate system_configuration_sys;
 
 extern crate core_foundation;
-extern crate core_foundation_sys;
-
 
 use core_foundation::array::CFArray;
 use core_foundation::dictionary::CFDictionary;
-use core_foundation::runloop::CFRunLoop;
+use core_foundation::runloop::{CFRunLoop, kCFRunLoopCommonModes};
 use core_foundation::string::CFString;
-use core_foundation_sys::runloop::kCFRunLoopCommonModes;
 
 use system_configuration::dynamic_store::{SCDynamicStore, SCDynamicStoreBuilder,
                                           SCDynamicStoreCallBackContext};
@@ -80,6 +77,6 @@ fn my_callback(store: SCDynamicStore, _changed_keys: CFArray<CFString>, payload:
     let dns_dictionary =
         CFDictionary::from_CFType_pairs(&[(server_addresses_key, server_addresses_value)]);
 
-    let success = store.set(payload.service_path.clone(), &dns_dictionary);
+    let success = store.set(payload.service_path.clone(), dns_dictionary);
     println!("callback: {}", success);
 }

system-configuration/src/dynamic_store.rs

@@ -7,13 +7,12 @@
 // except according to those terms.
 
 use core_foundation::array::{CFArray, CFArrayRef};
-use core_foundation::base::TCFType;
+use core_foundation::base::{TCFType, kCFAllocatorDefault};
 use core_foundation::boolean::CFBoolean;
 use core_foundation::dictionary::CFDictionary;
 use core_foundation::propertylist::{CFPropertyList, CFPropertyListSubClass};
 use core_foundation::runloop::CFRunLoopSource;
 use core_foundation::string::CFString;
-use core_foundation_sys::base::{CFRelease, kCFAllocatorDefault};
 
 pub use system_configuration_sys::dynamic_store::*;
 
@@ -36,11 +35,8 @@ pub struct SCDynamicStoreCallBackContext<T> {
 ///
 /// This is the safe callback definition, abstracting over the lower level `SCDynamicStoreCallBack`
 /// from the `system-configuration-sys` crate.
-pub type SCDynamicStoreCallBackT<T> = fn(
-    store: SCDynamicStore,
-    changed_keys: CFArray<CFString>,
-    info: &mut T,
-);
+pub type SCDynamicStoreCallBackT<T> =
+    fn(store: SCDynamicStore, changed_keys: CFArray<CFString>, info: &mut T);
 
 /// Builder for [`SCDynamicStore`] sessions.
 ///
@@ -132,17 +128,13 @@ impl<T> SCDynamicStoreBuilder<T> {
     }
 }
 
-/// Access to the key-value pairs in the dynamic store of a running system.
-///
-/// Use the [`SCDynamicStoreBuilder`] to create instances of this.
-///
-/// [`SCDynamicStoreBuilder`]: struct.SCDynamicStoreBuilder.html
-pub struct SCDynamicStore(SCDynamicStoreRef);
-
-impl Drop for SCDynamicStore {
-    fn drop(&mut self) {
-        unsafe { CFRelease(self.as_CFTypeRef()) }
-    }
+declare_TCFType!{
+    /// Access to the key-value pairs in the dynamic store of a running system.
+    ///
+    /// Use the [`SCDynamicStoreBuilder`] to create instances of this.
+    ///
+    /// [`SCDynamicStoreBuilder`]: struct.SCDynamicStoreBuilder.html
+    SCDynamicStore, SCDynamicStoreRef
 }
 
 impl_TCFType!(SCDynamicStore, SCDynamicStoreRef, SCDynamicStoreGetTypeID);
@@ -189,7 +181,7 @@ impl SCDynamicStore {
 
     /// If the given key exists in the store, the associated value is returned.
     ///
-    /// Use `CFPropertyList::downcast` to cast the result into the correct type.
+    /// Use `CFPropertyList::downcast_into` to cast the result into the correct type.
     pub fn get<S: Into<CFString>>(&self, key: S) -> Option<CFPropertyList> {
         let cf_key = key.into();
         unsafe {
@@ -205,12 +197,8 @@ impl SCDynamicStore {
 
     /// Sets the value of the given key. Overwrites existing values.
     /// Returns `true` on success, false on failure.
-    pub fn set<S: Into<CFString>, R, V: CFPropertyListSubClass<R>>(
-        &self,
-        key: S,
-        value: &V,
-    ) -> bool {
-        self.set_raw(key, &value.to_CFPropertyList())
+    pub fn set<S: Into<CFString>, V: CFPropertyListSubClass>(&self, key: S, value: V) -> bool {
+        self.set_raw(key, &value.into_CFPropertyList())
     }
 
     /// Sets the value of the given key. Overwrites existing values.
@@ -264,7 +252,6 @@ impl SCDynamicStore {
     }
 }
 
-
 /// The raw callback used by the safe `SCDynamicStore` to convert from the `SCDynamicStoreCallBack`
 /// to the `SCDynamicStoreCallBackT`
 unsafe extern "C" fn convert_callback<T>(

system-configuration/src/lib.rs

@@ -1,6 +1,5 @@
 #[macro_use]
 extern crate core_foundation;
-extern crate core_foundation_sys;
 extern crate system_configuration_sys;
 
 pub mod dynamic_store;