From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 23:34:59 +0000 (+0000)
Subject: Centralise log nix
X-Git-Tag: otter-0.4.0~465
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bfae26e0c365b68fd3be142c698da798350ddb47;p=otter.git

Centralise log nix

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 8dab00fc..fa58cd48 100644
--- 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 b4115252..171111a1 100644
--- 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 23e66fbf..f75eb1ba 100644
--- 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 62eb184a..9138b3f8 100644
--- 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 da893542..f5292e66 100644
--- 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 9b3ea4a2..58dfb5af 100644
--- 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"