From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 25 Mar 2021 01:16:00 +0000 (+0000)
Subject: serde_json: Move dependency to base, so it's common
X-Git-Tag: otter-0.5.0~431
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=22c74ce966d8eff3d5234d62e716954ff0b6c4f8;p=otter.git

serde_json: Move dependency to base, so it's common

wasm is about to want it

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

diff --git a/Cargo.lock b/Cargo.lock
index cb971292..73ac7205 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2132,7 +2132,6 @@ dependencies = [
  "rmp",
  "rmp-serde",
  "serde",
- "serde_json",
  "serde_with",
  "slotmap",
  "structopt",
@@ -2174,6 +2173,7 @@ dependencies = [
  "num-derive",
  "num-traits",
  "serde",
+ "serde_json",
  "serde_with",
  "thiserror",
  "void",
diff --git a/Cargo.toml b/Cargo.toml
index 5dec844e..23e944f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,7 +36,6 @@ rand="0.8"
 regex="1"
 rmp="0.8"
 rmp-serde="0.15"
-serde_json="1"
 serde_with="1"
 structopt="0.3"
 tempfile="3"
diff --git a/base/Cargo.toml b/base/Cargo.toml
index 88dfa9b2..2c7d095c 100644
--- a/base/Cargo.toml
+++ b/base/Cargo.toml
@@ -19,6 +19,7 @@ if_chain = "1"
 itertools="0.10"
 num-derive="0.3"
 num-traits="0.2"
+serde_json="1"
 void="1"
 
 # Repeated in other Cargo.toml's because importing does not work properly
diff --git a/base/imports.rs b/base/imports.rs
index b2943cac..6cc107e4 100644
--- a/base/imports.rs
+++ b/base/imports.rs
@@ -7,5 +7,7 @@ pub use derive_more;
 pub use if_chain;
 pub use itertools;
 pub use num_derive;
+pub use serde;
+pub use serde_json;
 pub use thiserror;
 pub use void;
diff --git a/src/imports.rs b/src/imports.rs
index dfd6d4ed..e13b3137 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -32,7 +32,6 @@ pub use parking_lot;
 pub use pwd;
 pub use regex;
 pub use rmp_serde;
-pub use serde_json;
 pub use slotmap;
 pub use toml;
 pub use uds;
diff --git a/src/prelude.rs b/src/prelude.rs
index 877d1ba6..f1075d3d 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -6,6 +6,8 @@ use crate::imports::*;
 
 pub use crate::imports::{flexi_logger, thiserror};
 
+pub use crate::imports::serde_json;
+
 pub use std::any::Any;
 pub use std::borrow::Borrow;
 pub use std::borrow::Cow;