From: Ian Jackson Date: Sun, 14 Feb 2021 22:51:42 +0000 (+0000) Subject: Cannot centralise serde X-Git-Tag: otter-0.4.0~480 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=23714069d550817f9a3cb658a7c8fe50d0dd1c5f;p=otter.git Cannot centralise serde Signed-off-by: Ian Jackson --- diff --git a/Cargo.toml b/Cargo.toml index 5f21ccfe..7b150946 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,6 @@ rand = "0.8" regex = "1" rmp = "0.8" rmp-serde = "0.15" -serde = { version = "1", features = ["derive","rc"] } serde_json = "1" serde_with = "1" structopt = "0.3" @@ -66,6 +65,7 @@ vecdeque-stableix = "1" # Repeated here because importing does not work properly fehler = "1" +serde = { version = "1", features = ["derive","rc"] } 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 26609983..1d7ea407 100644 --- a/base/Cargo.toml +++ b/base/Cargo.toml @@ -17,9 +17,9 @@ arrayvec = "0.5" derive_more = "0.99" if_chain = "1" -serde = { version = "1", features = ["derive","rc"] } serde_with = "1" # Repeated in other Cargo.toml's because importing does not work properly fehler = "1" +serde = { version = "1", features = ["derive","rc"] } thiserror = "1" diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index 1fa87f8a..a8744a91 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -50,7 +50,6 @@ rand = "0.8" regex = "1" rmp = "0.8" rmp-serde = "0.15" -serde = { version = "1", features = ["derive","rc"] } serde_json = "1" serde_with = "1" structopt = "0.3" @@ -65,6 +64,7 @@ rocket_cors = "0.5" # Repeated here because importing does not work properly fehler = "1" +serde = { version = "1", features = ["derive","rc"] } thiserror = "1" slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" } diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml index 39f1fa4b..e6c86bbf 100644 --- a/wdriver/Cargo.toml +++ b/wdriver/Cargo.toml @@ -27,7 +27,6 @@ num-traits = "0.2" once_cell = "1" parking_lot = "0.11" regex = "1" -serde = { version = "1", features = ["derive","rc"] } serde_json = "1" structopt = "0.3" strum = { version = "0.20", features = ['derive'] } @@ -37,6 +36,7 @@ x11rb = "0.8" # Repeated here because importing does not work properly fehler = "1" +serde = { version = "1", features = ["derive","rc"] } [lib] name = "otter_webdriver_tests"