Centralise log nix

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 8dab00fccff61637c9c8d820bcac0c6ae14b6365..fa58cd48a4c74c65f7bb3a7551c001af9df0c81f 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1650,8 +1650,6 @@ name = "otter-daemon"
 version = "0.0.1"
 dependencies = [
  "fehler",
- "log 0.4.14",
- "nix",
  "num-derive",
  "num-traits",
  "ordered-float",
@@ -1699,9 +1697,7 @@ version = "0.0.1"
 dependencies = [
  "fehler",
  "humantime",
- "log 0.4.14",
  "ndarray",
- "nix",
  "num-derive",
  "num-traits",
  "once_cell",

diff --git a/Cargo.toml b/Cargo.toml
index b411525208dba0ee99aaad063caf65332766ae20..171111a13b1d2464e63577bdfa4e916b11dd535b 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,9 +39,9 @@ itertools = "0.10"
 lazy-init = "0.5"
 lazy_static = "1"
 libc = "0.2"
-
 log = "0.4"
 nix = "0.19"
+
 num-derive = "0.3"
 num-traits = "0.2"
 ordered-float = "2"

diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 23e66fbf92e14cd370feed919c35c3539ec1a058..f75eb1baac7fc65f7dd58f19f6f603c561c36458 100644 (file)
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -18,8 +18,6 @@ path = "main.rs"
 otter = { path = ".." }
 otter-base = { path = "../base" }
 
-log = "0.4"
-nix = "0.19"
 num-derive = "0.3"
 num-traits = "0.2"
 ordered-float = "2"

diff --git a/src/imports.rs b/src/imports.rs
index 62eb184a3a556b8bca65635f345c5facbb0451ac..9138b3f89c27ddd9756f405968b3e5a4198327dd 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -21,3 +21,5 @@ pub use lazy_init;
 pub use lazy_static;
 pub use itertools;
 pub use libc;
+pub use log;
+pub use nix;

diff --git a/wdriver.rs b/wdriver.rs
index da893542722e007862a463a26cb63c4431578033..f5292e665755ca91a5da4884840d9c05295a8b52 100644 (file)
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-use otter::imports::*;
+pub use otter::imports::*;
 
 pub use anyhow::{anyhow, ensure, Context};
 pub use boolinator::Boolinator;

diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index 9b3ea4a26a50abe6e7c8c048851cfc206f9b235a..58dfb5af873e5b89c53fe4f946aba4164df32e65 100644 (file)
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -14,8 +14,6 @@ edition = "2018"
 otter = { path = ".." }
 
 humantime = "2"
-log = "0.4"
-nix = "0.19"
 ndarray = "0.14"
 num-derive = "0.3"
 num-traits = "0.2"