summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-12-15 15:14:08 +0100
committerLinus Färnstrand <linus@mullvad.net>2018-01-15 15:54:16 +0100
commit6bf68387ae5d5a70bd2d0738b3291c66368059b8 (patch)
treed66223a9957db9b769f4f222ba83ac4ae6403fab
parentc3933d569efe1196b9814abffe3ea7f00491df02 (diff)
downloadmullvadvpn-6bf68387ae5d5a70bd2d0738b3291c66368059b8.tar.xz
mullvadvpn-6bf68387ae5d5a70bd2d0738b3291c66368059b8.zip
Use serde derive import trick
-rw-r--r--mullvad-daemon/Cargo.toml3
-rw-r--r--mullvad-daemon/src/main.rs3
2 files changed, 2 insertions, 4 deletions
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index f6ff2d648e..473454a94a 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -13,8 +13,7 @@ clap = "2.25"
error-chain = "0.11"
fern = "0.4"
futures = "0.1"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
log = "0.3"
jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" }
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 696e85d783..23351fad2e 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -18,9 +18,8 @@ extern crate futures;
#[macro_use]
extern crate log;
-extern crate serde;
#[macro_use]
-extern crate serde_derive;
+extern crate serde;
extern crate serde_json;
extern crate jsonrpc_core;