From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 23:16:13 +0000 (+0000)
Subject: Centralise downcast-rs either enum-map env_logger
X-Git-Tag: otter-0.4.0~471
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0d290088f0cddca13b6e4effc43b6ebd6bfeb689;p=otter.git

Centralise downcast-rs either enum-map env_logger

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index fc3d4777..c3524645 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1649,7 +1649,6 @@ dependencies = [
 name = "otter-daemon"
 version = "0.0.1"
 dependencies = [
- "either",
  "failure",
  "fehler",
  "flexi_logger",
@@ -1709,7 +1708,6 @@ dependencies = [
 name = "otter-webdriver-tests"
 version = "0.0.1"
 dependencies = [
- "env_logger",
  "fehler",
  "humantime",
  "itertools",
diff --git a/Cargo.toml b/Cargo.toml
index 17193763..6bbdff37 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,11 +24,11 @@ boolinator = "2"
 chrono = "0.4"
 chrono-tz = "0.5"
 delegate = "0.5"
-
 downcast-rs = "1"
 either = "1"
 enum-map = { version = "0.6", features = [ "serde" ] }
 env_logger = "0.8"
+
 failure = "0.1.8" # for pwd
 flexi_logger = { version = "0.17", features = [ "specfile" ] }
 fs2 = "0.4"
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 405ef2c1..d00879d9 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -18,7 +18,6 @@ path = "main.rs"
 otter = { path = ".." }
 otter-base = { path = "../base" }
 
-either = "1"
 failure = "0.1.8" # for pwd
 flexi_logger = { version = "0.17", features = [ "specfile" ] }
 fs2 = "0.4"
diff --git a/src/imports.rs b/src/imports.rs
index 7b327a6e..a16bb941 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -9,3 +9,5 @@ pub use boolinator;
 pub use chrono;
 pub use chrono_tz;
 pub use delegate;
+pub use either;
+pub use env_logger;
diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index d8b0731e..f87a0744 100644
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -13,7 +13,6 @@ edition = "2018"
 [dependencies]
 otter = { path = ".." }
 
-env_logger = "0.8"
 humantime = "2"
 itertools = "0.10"
 log = "0.4"