humantime: Promote dependency to otter main crate

We are going to want this for dice cooldown spec.

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

diff --git a/Cargo.lock b/Cargo.lock
index cfe5d84d2dea812aea42c1cb4c4006d7114792e8..a69a17360876f11a66112fbd02bbba87ddc601c9 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2652,6 +2652,7 @@ dependencies = [
  "flexi_logger",
  "fs2",
  "glob",
+ "humantime",
  "image",
  "index_vec",
  "inventory",
@@ -2702,7 +2703,6 @@ version = "1.0.0"
 dependencies = [
  "ego-tree",
  "fehler",
- "humantime",
  "num-traits",
  "otter",
  "reqwest",

diff --git a/Cargo.toml b/Cargo.toml
index ecda9366be57c6ebf8bdddcfdd02761b29b05e75..6aa505a104e27c6a651dc57286414066e5201e4a 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,6 +52,7 @@ env_logger="0.9"
 fehler="1"
 fs2="0.4"
 glob="0.3"
+humantime="2"
 inventory="0.2"
 lazy-init="0.5"
 lazy_static="1"

diff --git a/apitest/Cargo.toml b/apitest/Cargo.toml
index 50cf5c942d21ddafc11283fc5f67704db3e011d7..d00c4c7df60f363d40d274d0f78f7400fecc434f 100644 (file)
--- a/apitest/Cargo.toml
+++ b/apitest/Cargo.toml
@@ -31,7 +31,6 @@ otter.version="=1.0.0"
 
 ego-tree="0.6"
 fehler="1"
-humantime="2"
 num-traits="0.2"
 scraper="0.12"
 structopt="0.3"

diff --git a/src/imports.rs b/src/imports.rs
index 9fe658b6539bcf451a6519fafe44d937ba86c3e5..d5594005ed336d8ef251eb934740cbfa557f56a1 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -20,6 +20,7 @@ pub use env_logger;
 pub use flexi_logger;
 pub use fs2;
 pub use glob;
+pub use humantime;
 pub use index_vec;
 pub use lazy_init;
 pub use lazy_static;