From e663ca4128ee04bb6b4e9f2b62120a55a8c3ccea Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 2 Aug 2020 00:40:31 +0100 Subject: refactor(paroxysm): Use derive macros from serde crate serde_derive is deprecated, the macros have moved behind a feature-gate in serde itself. Change-Id: Ib42e7463a81006e23a4fe8a0e48f494610dc8e4c Reviewed-on: https://cl.tvl.fyi/c/depot/+/1550 Tested-by: BuildkiteCI Reviewed-by: kanepyork --- fun/paroxysm/Cargo.lock | 4 +++- fun/paroxysm/Cargo.toml | 3 +-- fun/paroxysm/src/cfg.rs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'fun/paroxysm') diff --git a/fun/paroxysm/Cargo.lock b/fun/paroxysm/Cargo.lock index f63f802bc3..c3269538e9 100644 --- a/fun/paroxysm/Cargo.lock +++ b/fun/paroxysm/Cargo.lock @@ -699,7 +699,6 @@ dependencies = [ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -910,6 +909,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "serde" version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "serde-hjson" diff --git a/fun/paroxysm/Cargo.toml b/fun/paroxysm/Cargo.toml index 91a68d4f06..a60883533a 100644 --- a/fun/paroxysm/Cargo.toml +++ b/fun/paroxysm/Cargo.toml @@ -14,8 +14,7 @@ lazy_static = "1.2.0" log = "0.4.6" rand = "0.7.3" regex = "1.1.0" -serde = "1.0.81" -serde_derive = "1.0.81" +serde = { version = "1.0", features = [ "derive" ] } [dependencies.diesel] features = ["postgres", "chrono", "r2d2"] diff --git a/fun/paroxysm/src/cfg.rs b/fun/paroxysm/src/cfg.rs index 76afb9c651..1f19c8aadc 100644 --- a/fun/paroxysm/src/cfg.rs +++ b/fun/paroxysm/src/cfg.rs @@ -1,5 +1,5 @@ use std::collections::HashSet; -use serde_derive::Deserialize; // TODO(tazjin): move away from serde_derive +use serde::Deserialize; #[derive(Deserialize)] pub struct Config { -- cgit 1.4.1