Centralise pwd rand regex rmp rmp-serde

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 4065d190ba624d40769c7112ca45b74cefac4043..2a8b587fbbbffc8f160f3d54dacce30af8bfcd31 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1653,12 +1653,6 @@ dependencies = [
  "num-traits",
  "otter",
  "otter-base",
- "percent-encoding 2.1.0",
- "pwd",
- "rand 0.8.3",
- "regex",
- "rmp",
- "rmp-serde",
  "rocket",
  "rocket_contrib",
  "rocket_cors",
@@ -1698,7 +1692,6 @@ dependencies = [
  "num-traits",
  "once_cell",
  "otter",
- "regex",
  "serde",
  "serde_json",
  "structopt",

diff --git a/Cargo.toml b/Cargo.toml
index 6ad1ef04a2f383b2bb5ce88e56f856ee0b159891..116c6b12d1ee805c2972fbe6e52711810411977b 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,13 +44,13 @@ nix = "0.19"
 num-derive = "0.3"
 ordered-float = "2"
 parking_lot = "0.11"
-
 percent-encoding = "2"
 pwd = "1"
 rand = "0.8"
 regex = "1"
 rmp = "0.8"
 rmp-serde = "0.15"
+
 serde_json = "1"
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }

diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index c1acf3d58da42d864d98f60cd80c9b7c448a996f..8f313db90282bcbbd8e52f2ef35fb03db16138c2 100644 (file)
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -18,12 +18,6 @@ path = "main.rs"
 otter = { path = ".." }
 otter-base = { path = "../base" }
 
-percent-encoding = "2"
-pwd = "1"
-rand = "0.8"
-regex = "1"
-rmp = "0.8"
-rmp-serde = "0.15"
 serde_json = "1"
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }

diff --git a/src/imports.rs b/src/imports.rs
index 476e830f4f2538a4b699713f48b35b16d5cc9582..db880749f63fa4a3247e2a70e7ead3fd53a60914 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -26,4 +26,6 @@ pub use nix;
 pub use num_derive;
 pub use ordered_float;
 pub use parking_lot;
-
+pub use pwd;
+pub use regex;
+pub use rmp_serde;

diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index 4db2495bb2468f00121527fd51643251a4f56f24..bd6998f81c5c5f1dbaa88ba239743eaec5eb9f2d 100644 (file)
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -16,7 +16,6 @@ otter = { path = ".." }
 humantime = "2"
 ndarray = "0.14"
 once_cell = "1"
-regex = "1"
 serde_json = "1"
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }