Replacing looks-to-be-abandoned dependencies for MacOS targets (closes …

…#2)

README.md

@@ -3,7 +3,7 @@
 [![Latest Version](https://img.shields.io/crates/v/battery.svg)](https://crates.io/crates/battery)
 [![Latest Version](https://docs.rs/battery/badge.svg)](https://docs.rs/battery)
 [![Build Status](https://travis-ci.org/svartalf/rust-battery.svg?branch=master)](https://travis-ci.org/svartalf/rust-battery)
-[![dependency status](https://deps.rs/crate/battery/0.6.1/status.svg)](https://deps.rs/crate/battery/0.6.1)
+[![dependency status](https://deps.rs/crate/battery/0.6.2/status.svg)](https://deps.rs/crate/battery/0.6.2)
 ![Apache 2.0 OR MIT licensed](https://img.shields.io/badge/license-Apache2.0%2FMIT-blue.svg)
 
 Rust crate providing cross-platform information about batteries.
@@ -14,7 +14,7 @@ recalculated as necessary to be returned in `mW`, `mWh` or `mV` units.
 ## Supported platforms
 
 * Linux 2.6.39+
-* MacOS (10.10+ probably, needs to be confirmed)
+* MacOS 10.10+
 * Windows 7+
 * FreeBSD
 * DragonFlyBSD
@@ -23,11 +23,13 @@ recalculated as necessary to be returned in `mW`, `mWh` or `mV` units.
 
 Until `1.0.0` version API might change in any moment, be careful.
 
-## Example
+## Examples
 
-See `battery-cli` crate at [GitHub](https://github.com/svartalf/rust-battery/tree/master/battery-cli/)
+See full-featured `battery-cli` crate at [GitHub](https://github.com/svartalf/rust-battery/tree/master/battery-cli/)
 or at [crates.io](https://crates.rs/crate/battery-cli).
 
+For a simple example check `battery/examples/simple.rs` in the [repository](https://github.com/svartalf/rust-battery/blob/master/battery/examples/simple.rs)
+
 ## FFI
 
 Experimental [battery-ffi](https://crates.io/crates/battery-ffi) crate

battery-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "battery-cli"
-version = "0.1.2"
+version = "0.1.3"
 authors = ["svartalf <self@svartalf.info>"]
 edition = "2018"
 description = "CLI tool for batteries reports"
@@ -25,7 +25,7 @@ test = false
 cfg-if = "0.1"
 
 [target.'cfg(not(windows))'.dependencies]
-battery = "0.6.1"
+battery = "0.6.2"
 humantime = "1.2.0"
 tui = "0.4.0"
 termion = "1.5.1"

battery-cli/README.md

@@ -3,7 +3,7 @@
 [![Latest Version](https://img.shields.io/crates/v/battery-cli.svg)](https://crates.io/crates/battery-cli)
 [![Latest Version](https://docs.rs/battery-cli/badge.svg)](https://docs.rs/battery-cli)
 [![Build Status](https://travis-ci.org/svartalf/rust-battery.svg?branch=master)](https://travis-ci.org/svartalf/rust-battery)
-[![dependency status](https://deps.rs/crate/battery-cli/0.1.2/status.svg)](https://deps.rs/crate/battery-cli/0.1.2)
+[![dependency status](https://deps.rs/crate/battery-cli/0.1.3/status.svg)](https://deps.rs/crate/battery-cli/0.1.3)
 ![Apache 2.0 OR MIT licensed](https://img.shields.io/badge/license-Apache2.0%2FMIT-blue.svg)
 
 `battery-cli` is a Proof-Of-Concept binary crate, that provides terminal user interface

battery-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "battery-ffi"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["svartalf <self@svartalf.info>"]
 edition = "2018"
 description = "FFI bindings for battery crate"
@@ -22,7 +22,7 @@ crate-type = ["cdylib"]
 default = ["cbindgen"]
 
 [dependencies]
-battery = "0.6.1"
+battery = "0.6.2"
 libc = "0.2.48"
 
 [build-dependencies]

battery-ffi/README.md

@@ -3,7 +3,7 @@
 [![Latest Version](https://img.shields.io/crates/v/battery-ffi.svg)](https://crates.io/crates/battery-ffi)
 [![Latest Version](https://docs.rs/battery-ffi/badge.svg)](https://docs.rs/battery-ffi)
 [![Build Status](https://travis-ci.org/svartalf/rust-battery.svg?branch=master)](https://travis-ci.org/svartalf/rust-battery)
-[![dependency status](https://deps.rs/crate/battery-ffi/0.1.4/status.svg)](https://deps.rs/crate/battery-ffi/0.1.4)
+[![dependency status](https://deps.rs/crate/battery-ffi/0.1.5/status.svg)](https://deps.rs/crate/battery-ffi/0.1.5)
 ![Apache 2.0 OR MIT licensed](https://img.shields.io/badge/license-Apache2.0%2FMIT-blue.svg)
 
 This is a FFI bindings for [battery](https://github.com/svartalf/rust-battery/tree/master/battery)

battery/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.2] - 2019-02-28
+### Changed
+- Replace looks-to-be-abandoned `CoreFoundation-sys` and `IOKit-sys` dependencies [#2](https://github.com/svartalf/rust-battery/issues/2)
+### Fixed
+- Free hanging mach port used for communication with Mac OS IOKit
+
 ## [0.6.1] - 2019-02-27
 ### Fixed
 - Fix energy and remaining time calculations for MacOS [#8](https://github.com/svartalf/rust-battery/issues/8), [#11](https://github.com/svartalf/rust-battery/pull/11)

battery/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "battery"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["svartalf <self@svartalf.info>"]
 edition = "2018"
 description = "Cross-platform information about batteries"
@@ -21,10 +21,9 @@ cfg-if = "0.1"
 lazy-init = "0.3"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-CoreFoundation-sys = "0.1.4"
-IOKit-sys = "0.1.5"
-mach = "0.1.2"
 libc = "0.2.48"
+mach = "0.1.2"
+core-foundation = "0.6.3"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version ="0.3.6", features = ["impl-default", "devguid", "winbase", "ioapiset", "ntdef", "setupapi", "handleapi", "errhandlingapi", "winerror"] }

battery/src/platform/macos/device.rs

@@ -5,7 +5,6 @@
 //    - ChargingCurrent
 //    - NotChargingReason (?)
 
-use std::io;
 use std::str;
 use std::boxed::Box;
 use std::convert::AsRef;
@@ -17,18 +16,16 @@ use super::traits::DataSource;
 
 #[derive(Debug)]
 pub struct IoKitDevice {
-    source: Box<DataSource>,
+    source: Box<dyn DataSource>,
 
     manufacturer: Option<String>,
     model: Option<String>,
     serial_number: Option<String>,
 }
 
 impl IoKitDevice {
-    pub fn new<T: DataSource>() -> io::Result<IoKitDevice> {
-        let ds = T::new()?;
-
-        Ok(ds.into())
+    pub fn get_mut_ref(&mut self) -> &mut dyn DataSource {
+        &mut self.source
     }
 }