From 98fcca6aea5e9a3712c85bb6f75abefd964f88ea Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 28 Nov 2020 00:17:18 +0000
Subject: [PATCH] dedupe dependencies

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Cargo.lock.example | 42 ------------------------------------------
 daemon/Cargo.toml  | 42 ------------------------------------------
 src/imports.rs     |  2 +-
 3 files changed, 1 insertion(+), 85 deletions(-)

diff --git a/Cargo.lock.example b/Cargo.lock.example
index e435c8f1..896a5468 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1159,55 +1159,13 @@ dependencies = [
 name = "otter-daemon"
 version = "0.0.1"
 dependencies = [
- "anyhow",
- "argparse",
- "arrayvec",
- "boolinator",
- "chrono",
- "chrono-tz",
- "delegate",
- "derive_more",
- "either",
- "failure",
  "fehler",
- "flexi_logger",
- "fs2",
- "glob 0.3.0",
- "htmlescape",
- "if_chain",
- "index_vec",
- "inventory",
- "itertools",
- "lazy-init",
- "lazy_static",
- "libc",
- "log 0.4.11",
- "nix",
- "num-derive",
- "num-traits",
- "ordered-float",
  "otter",
  "otter-zcoord",
- "parking_lot",
- "percent-encoding 2.1.0",
- "pwd",
- "rand",
- "regex",
- "rmp",
- "rmp-serde",
  "rocket",
  "rocket_contrib",
  "rocket_cors",
  "serde",
- "serde_json",
- "serde_with",
- "slotmap",
- "strum",
- "thiserror",
- "toml 0.5.7",
- "typetag",
- "uds",
- "vecdeque-stableix",
 ]
 
 [[package]]
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index b6418cfd..e231ff25 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -18,50 +18,8 @@ path = "main.rs"
 otter = { path = ".." }
 otter-zcoord = { path = "../zcoord" }
 
-anyhow = "1"
-argparse = "0.2"
-arrayvec = "0"
-boolinator = "2"
-chrono = "0.4"
-chrono-tz = "0.5"
-delegate = "0.4"
-derive_more = "0.99"
-either = "1"
-failure = "0.1.8" # for pwd
 fehler = "1"
-flexi_logger = { version = "0.16", features = [ "specfile" ] }
-fs2 = "0.4"
-glob = "0.3"
-htmlescape = "0.3"
-if_chain = "1"
-index_vec = { version = "0.1.1", features = ['serde'] }
-inventory = "0.1"
-itertools = "0.9"
-lazy_static = "1"
-libc = "0.2"
-lazy-init = "0.4"
-log = "0.4"
-nix = "0.18"
-num-derive = "0.3"
-num-traits = "0.2"
-ordered-float = "2"
-parking_lot = "0.11"
-percent-encoding = "2"
-pwd = "1"
-rand = "0"
-regex = "1"
-rmp = "0.8"
-rmp-serde = "0.14"
 serde = { version = "1", features = ["derive","rc"] }
-serde_json = "1"
-serde_with = "1"
-slotmap = { version = "0.4", features = ['serde'] }
-strum = { version = "0.20", features = ['derive'] }
-thiserror = "1"
-toml = "0.5"
-typetag = "0.1.6"
-uds = "0"
-vecdeque-stableix = "1"
 
 rocket = { version = "^0.4.6", features=["sse"] }
 rocket_cors = "0.5"
diff --git a/src/imports.rs b/src/imports.rs
index c5696e0c..2332c73d 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -44,7 +44,7 @@ pub use boolinator::Boolinator as _;
 pub use delegate::delegate;
 pub use either::{Either, Left, Right};
 pub use fehler::{throws, throw};
-pub use flexi_logger::{LogSpecification};
+pub use flexi_logger::{self, LogSpecification};
 pub use fs2::FileExt;
 pub use if_chain::if_chain;
 pub use index_vec::{define_index_type, index_vec, IndexVec, IndexSlice};
-- 
2.30.2