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 fc3d4777478ac7ef961475f2051ca3d39bdb3860..c3524645bf010c02455aea0037126d75c6353ec0 100644 (file)
--- 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 17193763d3d342d5af77cadffbffc1f149e53212..6bbdff37b36789c51c0aa05167543448e763f45b 100644 (file)
--- 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 405ef2c1647ae9f6c0164f9612e0b0cfff3fc39d..d00879d95f8a6049237fcd823be9ca9409c23172 100644 (file)
--- 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 7b327a6e2a371f3491b325c028f86e0815525dd2..a16bb941f2146646f91946f0ccbcba6e102ae74a 100644 (file)
--- 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 d8b0731ef062a24cf73b94b8baccccf55f15f688..f87a0744346c88f6cc89d58e8f1acb5df87d1579 100644 (file)
--- 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"