Centralise itertools lazy-init lazy_static libc

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index b9e22143c0cee66abf0d6371d375693de5e71254..8dab00fccff61637c9c8d820bcac0c6ae14b6365 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1650,10 +1650,6 @@ name = "otter-daemon"
 version = "0.0.1"
 dependencies = [
  "fehler",
- "itertools",
- "lazy-init",
- "lazy_static",
- "libc",
  "log 0.4.14",
  "nix",
  "num-derive",
@@ -1703,8 +1699,6 @@ version = "0.0.1"
 dependencies = [
  "fehler",
  "humantime",
- "itertools",
- "libc",
  "log 0.4.14",
  "ndarray",
  "nix",

diff --git a/Cargo.toml b/Cargo.toml
index f2d53a451012aeeec7358e013ad41b9d4720ccd4..b411525208dba0ee99aaad063caf65332766ae20 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,11 +35,11 @@ glob = "0.3"
 htmlescape = "0.3"
 index_vec = { version = "0.1.1", features = ['serde'] }
 inventory = "0.1"
-
 itertools = "0.10"
+lazy-init = "0.5"
 lazy_static = "1"
 libc = "0.2"
-lazy-init = "0.5"
+
 log = "0.4"
 nix = "0.19"
 num-derive = "0.3"

diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 907cb6b3d11d64db82fefb63b4da3a8ba78eb594..23e66fbf92e14cd370feed919c35c3539ec1a058 100644 (file)
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -18,10 +18,6 @@ path = "main.rs"
 otter = { path = ".." }
 otter-base = { path = "../base" }
 
-itertools = "0.10"
-lazy_static = "1"
-libc = "0.2"
-lazy-init = "0.5"
 log = "0.4"
 nix = "0.19"
 num-derive = "0.3"

diff --git a/daemon/session.rs b/daemon/session.rs
index 31508835ae70fa107db9169d383a2af9f7873e23..0b3debf7c8015f1707787c425fe477a2fe5fcc97 100644 (file)
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
+use crate::imports::*;
+
 use super::*;
 
 #[derive(Serialize,Debug)]

diff --git a/src/imports.rs b/src/imports.rs
index 6ed57df428e1934bd94fc4531e7cd3aea3fc5b1f..62eb184a3a556b8bca65635f345c5facbb0451ac 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -17,3 +17,7 @@ pub use fs2;
 pub use glob;
 pub use htmlescape;
 pub use index_vec;
+pub use lazy_init;
+pub use lazy_static;
+pub use itertools;
+pub use libc;

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