From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 23:50:26 +0000 (+0000)
Subject: Cannot centralise structopt strum
X-Git-Tag: otter-0.4.0~459
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ac9eaa49968e45b063037511e060f68118c809d8;p=otter.git

Cannot centralise structopt strum

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

diff --git a/Cargo.toml b/Cargo.toml
index 71c763c0..446aa5d3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,8 +52,6 @@ rmp = "0.8"
 rmp-serde = "0.15"
 serde_json = "1"
 
-structopt = "0.3"
-strum = { version = "0.20", features = ['derive'] }
 tempfile = "3"
 tera = "0.11"
 toml = "0.5"
@@ -67,6 +65,8 @@ fehler = "1"
 num-traits = "0.2"
 serde = { version = "1", features = ["derive","rc"] }
 serde_with = "1"
+structopt = "0.3"
+strum = { version = "0.20", features = ['derive'] }
 thiserror = "1"
 
 slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" }
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 23c2ff4a..0e1eaf89 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -18,8 +18,6 @@ path = "main.rs"
 otter = { path = ".." }
 otter-base = { path = "../base" }
 
-structopt = "0.3"
-strum = { version = "0.20", features = ['derive'] }
 toml = "0.5"
 typetag = "0.1.6"
 uds = "0.2"
@@ -33,6 +31,8 @@ fehler = "1"
 num-traits = "0.2"
 serde = { version = "1", features = ["derive","rc"] }
 serde_with = "1"
+structopt = "0.3"
+strum = { version = "0.20", features = ['derive'] }
 thiserror = "1"
 
 slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" }
diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index 8fec7244..3defd087 100644
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -16,8 +16,6 @@ otter = { path = ".." }
 humantime = "2"
 ndarray = "0.14"
 once_cell = "1"
-structopt = "0.3"
-strum = { version = "0.20", features = ['derive'] }
 thirtyfour_sync = "0.22"
 void = "1"
 x11rb = "0.8"
@@ -26,6 +24,8 @@ x11rb = "0.8"
 fehler = "1"
 num-traits = "0.2"
 serde = { version = "1", features = ["derive","rc"] }
+structopt = "0.3"
+strum = { version = "0.20", features = ['derive'] }
 
 [lib]
 name = "otter_webdriver_tests"