Centralise num_derive

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index fa58cd48a4c74c65f7bb3a7551c001af9df0c81f..7fc4a0df755821fab9b363238f4bbf36a185841f 100644 (file)
--- 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 171111a13b1d2464e63577bdfa4e916b11dd535b..d81afc87674dab8cb2c0e8496169d1393719c83f 100644 (file)
--- 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 f75eb1baac7fc65f7dd58f19f6f603c561c36458..60be2514281c834e54e0382bb3adebc6cfed5607 100644 (file)
--- 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 9138b3f89c27ddd9756f405968b3e5a4198327dd..0ff1e32826c6396651339171a1c8899456d70b6d 100644 (file)
--- 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 58dfb5af873e5b89c53fe4f946aba4164df32e65..20ab7a87b761606b4fc5a0bee0c7ae6e35081432 100644 (file)
--- 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"