From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 23:32:14 +0000 (+0000)
Subject: Centralise itertools lazy-init lazy_static libc
X-Git-Tag: otter-0.4.0~466
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ec08f4e964b1a289a19ee90f0e69c492dce55a74;p=otter.git

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 b9e22143..8dab00fc 100644
--- 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 f2d53a45..b4115252 100644
--- 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 907cb6b3..23e66fbf 100644
--- 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 31508835..0b3debf7 100644
--- 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 6ed57df4..62eb184a 100644
--- 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 f87a0744..9b3ea4a2 100644
--- 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"