From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 23:48:51 +0000 (+0000)
Subject: Centralise serde_json
X-Git-Tag: otter-0.4.0~460
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fb98836b0d23336956c21355443afb8cd65ad852;p=otter.git

Centralise serde_json

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 2a8b587f..8f5d43b2 100644
--- 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 116c6b12..71c763c0 100644
--- 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 8f313db9..23c2ff4a 100644
--- 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 db880749..fb95514e 100644
--- 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 bd6998f8..8fec7244 100644
--- 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"