From: Ian Jackson Date: Sun, 14 Feb 2021 23:02:22 +0000 (+0000) Subject: Cannot centralise serde_with X-Git-Tag: otter-0.4.0~479 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=558225b93bbda3cde0a1d8e9c71e0598cf0a6d38;p=otter.git Cannot centralise serde_with Signed-off-by: Ian Jackson --- diff --git a/Cargo.toml b/Cargo.toml index 7b150946..c570f260 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,6 @@ regex = "1" rmp = "0.8" rmp-serde = "0.15" serde_json = "1" -serde_with = "1" structopt = "0.3" strum = { version = "0.20", features = ['derive'] } tempfile = "3" @@ -66,6 +65,7 @@ vecdeque-stableix = "1" # Repeated here because importing does not work properly fehler = "1" serde = { version = "1", features = ["derive","rc"] } +serde_with = "1" thiserror = "1" slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" } diff --git a/base/Cargo.toml b/base/Cargo.toml index 1d7ea407..6107bb78 100644 --- a/base/Cargo.toml +++ b/base/Cargo.toml @@ -17,9 +17,8 @@ arrayvec = "0.5" derive_more = "0.99" if_chain = "1" -serde_with = "1" - # Repeated in other Cargo.toml's because importing does not work properly fehler = "1" serde = { version = "1", features = ["derive","rc"] } +serde_with = "1" thiserror = "1" diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index a8744a91..788003be 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -51,7 +51,6 @@ regex = "1" rmp = "0.8" rmp-serde = "0.15" serde_json = "1" -serde_with = "1" structopt = "0.3" strum = { version = "0.20", features = ['derive'] } toml = "0.5" @@ -65,6 +64,7 @@ rocket_cors = "0.5" # Repeated here because importing does not work properly fehler = "1" serde = { version = "1", features = ["derive","rc"] } +serde_with = "1" thiserror = "1" slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" }