From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 23:36:35 +0000 (+0000)
Subject: Centralise num_derive
X-Git-Tag: otter-0.4.0~464
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8f2e450e496078d4c06055e81ee4ab784e5674d2;p=otter.git

Centralise num_derive

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index fa58cd48..7fc4a0df 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1650,7 +1650,6 @@ name = "otter-daemon"
 version = "0.0.1"
 dependencies = [
  "fehler",
- "num-derive",
  "num-traits",
  "ordered-float",
  "otter",
@@ -1698,7 +1697,6 @@ dependencies = [
  "fehler",
  "humantime",
  "ndarray",
- "num-derive",
  "num-traits",
  "once_cell",
  "otter",
diff --git a/Cargo.toml b/Cargo.toml
index 171111a1..d81afc87 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,8 +41,8 @@ lazy_static = "1"
 libc = "0.2"
 log = "0.4"
 nix = "0.19"
-
 num-derive = "0.3"
+
 num-traits = "0.2"
 ordered-float = "2"
 parking_lot = "0.11"
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index f75eb1ba..60be2514 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -18,7 +18,6 @@ path = "main.rs"
 otter = { path = ".." }
 otter-base = { path = "../base" }
 
-num-derive = "0.3"
 num-traits = "0.2"
 ordered-float = "2"
 parking_lot = "0.11"
diff --git a/src/imports.rs b/src/imports.rs
index 9138b3f8..0ff1e328 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -23,3 +23,4 @@ pub use itertools;
 pub use libc;
 pub use log;
 pub use nix;
+pub use num_derive;
diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index 58dfb5af..20ab7a87 100644
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -15,7 +15,6 @@ otter = { path = ".." }
 
 humantime = "2"
 ndarray = "0.14"
-num-derive = "0.3"
 num-traits = "0.2"
 once_cell = "1"
 parking_lot = "0.11"