From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 13 Apr 2022 21:32:56 +0000 (+0100)
Subject: humantime: Switch to humantime_serde
X-Git-Tag: otter-1.1.0~608
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ae5137ed72c2417694741bfda001fdd1f9a88d59;p=otter.git

humantime: Switch to humantime_serde

We are going to want this for dice cooldown spec.
Using the humantime re-export avoids version problems.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Cargo.lock b/Cargo.lock
index a69a1736..1389d223 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1807,6 +1807,16 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "humantime-serde"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
+dependencies = [
+ "humantime",
+ "serde",
+]
+
 [[package]]
 name = "hyper"
 version = "0.14.18"
@@ -2652,7 +2662,7 @@ dependencies = [
  "flexi_logger",
  "fs2",
  "glob",
- "humantime",
+ "humantime-serde",
  "image",
  "index_vec",
  "inventory",
diff --git a/Cargo.toml b/Cargo.toml
index 6aa505a1..548889a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,7 +52,7 @@ env_logger="0.9"
 fehler="1"
 fs2="0.4"
 glob="0.3"
-humantime="2"
+humantime-serde="1"
 inventory="0.2"
 lazy-init="0.5"
 lazy_static="1"
diff --git a/src/imports.rs b/src/imports.rs
index d5594005..7c402af6 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -20,7 +20,7 @@ pub use env_logger;
 pub use flexi_logger;
 pub use fs2;
 pub use glob;
-pub use humantime;
+pub use humantime_serde::{self, re::humantime};
 pub use index_vec;
 pub use lazy_init;
 pub use lazy_static;