summary history branches tags files
commit:c2b47c3986a786097b194dd4fca3a71789c10b16
author:Trevor Bentley
committer:Trevor Bentley
date:Sat Mar 18 16:21:00 2023 +0100
parents:0e926158cb49fe8380f883ed63ef6f10793c16e0
bump rust-ini dependency
diff --git a/Cargo.lock b/Cargo.lock
line changes: +60/-3
index bbc6ae5..883d4f3
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3,6 +3,17 @@
 version = 3
 
 [[package]]
+name = "ahash"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
 name = "aho-corasick"
 version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -86,6 +97,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "dlv-list"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
+
+[[package]]
 name = "errno"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -107,12 +124,32 @@ dependencies = [
 ]
 
 [[package]]
+name = "getrandom"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
 name = "glob"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
 name = "heck"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -204,6 +241,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
 [[package]]
+name = "ordered-multimap"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
+dependencies = [
+ "dlv-list",
+ "hashbrown",
+]
+
+[[package]]
 name = "os_str_bytes"
 version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -276,9 +323,13 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
 [[package]]
 name = "rust-ini"
-version = "0.13.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
+checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap",
+]
 
 [[package]]
 name = "rustix"
@@ -333,7 +384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
 dependencies = [
  "libc",
- "wasi",
+ "wasi 0.10.0+wasi-snapshot-preview1",
  "winapi",
 ]
 
@@ -366,6 +417,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
 name = "winapi"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"

diff --git a/Cargo.toml b/Cargo.toml
line changes: +1/-1
index d111654..cbead05
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,7 @@ lto = true
 [dependencies]
 regex = "1.7.1"
 glob = "0.3.1"
-rust-ini = "0.13.0"
+rust-ini = "0.18.0"
 clap = { version = "4.1.10", features = ["derive"] }
 time = "0.1.45"
 nix = "0.26.2"

diff --git a/src/main.rs b/src/main.rs
line changes: +3/-3
index be05919..f37f98c
--- a/src/main.rs
+++ b/src/main.rs
@@ -126,8 +126,8 @@ impl From<glob::PatternError> for CircadianError {
         CircadianError(error.to_string().to_owned())
     }
 }
-impl From<ini::ini::Error> for CircadianError {
-    fn from(error: ini::ini::Error) -> Self {
+impl From<ini::Error> for CircadianError {
+    fn from(error: ini::Error) -> Self {
         CircadianError(error.to_string().to_owned())
     }
 }
@@ -866,7 +866,7 @@ fn read_config(file_path: &str) -> Result<CircadianConfig, CircadianError> {
         config.on_wake = section.get("on_wake")
             .and_then(|x| if x.len() > 0 {Some(x.to_owned())} else {None});
     }
-    fn read_bool(s: &std::collections::HashMap<String,String>,
+    fn read_bool(s: &ini::Properties,
                  key: &str) -> bool {
         match s.get(key).unwrap_or(&"no".to_string()).to_lowercase().as_str() {
             "yes" | "true" | "1" => true,