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 cb97129232860b5a699bb7a2ac009ec376818e37..73ac7205cab813dbb14bb7f592f71ed5f55d4256 100644 (file)
--- 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 5dec844ee20852956cd6d29357671945cab41d1a..23e944f52a21d9b4a320a0cca518b1f3d70aab9d 100644 (file)
--- 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 88dfa9b26512ab5f9b38778e9001d50777c435a1..2c7d095cbd9bf466657898f1b3591ac451529bcc 100644 (file)
--- 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 b2943caccd2a916693b48c2dfa6484f31e019977..6cc107e4b180fb9a196f801557ef0a3f3a842b51 100644 (file)
--- 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 dfd6d4edb7d566d302f080df30752d34486e6659..e13b31377ee9ff7b271dfbea472413c76675f657 100644 (file)
--- 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 877d1ba64113f9af36943dfff10ece64bd0a17a3..f1075d3d0c6c471932d3747a43d77ac7784de76e 100644 (file)
--- 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;