Centralise serde_json

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 2a8b587fbbbffc8f160f3d54dacce30af8bfcd31..8f5d43b2d613b3cd5ff6ca9b667a85accdba5787 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1657,7 +1657,6 @@ dependencies = [
  "rocket_contrib",
  "rocket_cors",
  "serde",
- "serde_json",
  "serde_with",
  "slotmap",
  "structopt",
@@ -1693,7 +1692,6 @@ dependencies = [
  "once_cell",
  "otter",
  "serde",
- "serde_json",
  "structopt",
  "strum",
  "thirtyfour_sync",

diff --git a/Cargo.toml b/Cargo.toml
index 116c6b12d1ee805c2972fbe6e52711810411977b..71c763c03fdaa4139ebacfa1e0b88149d9f72f7c 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,8 +50,8 @@ rand = "0.8"
 regex = "1"
 rmp = "0.8"
 rmp-serde = "0.15"
-
 serde_json = "1"
+
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }
 tempfile = "3"

diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 8f313db90282bcbbd8e52f2ef35fb03db16138c2..23c2ff4a1f47a136c3e1234deef0c827d1af8984 100644 (file)
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -18,7 +18,6 @@ path = "main.rs"
 otter = { path = ".." }
 otter-base = { path = "../base" }
 
-serde_json = "1"
 structopt = "0.3"
 strum = { version = "0.20", features = ['derive'] }
 toml = "0.5"

diff --git a/src/imports.rs b/src/imports.rs
index db880749f63fa4a3247e2a70e7ead3fd53a60914..fb95514e7f8501b82f7eda8f47e42a650f9de329 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -29,3 +29,4 @@ pub use parking_lot;
 pub use pwd;
 pub use regex;
 pub use rmp_serde;
+pub use serde_json;

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