From ebb293813fb1c92149a5cc802043ba41f4ddf1a5 Mon Sep 17 00:00:00 2001
From: Vegard Sandengen <vegardsandengen@gmail.com>
Date: Fri, 22 Feb 2019 14:55:51 +0100
Subject: Migrate serde dependency to use derive feature (#152)

This is in line with best practices recommended
by serde[1]. This will also resolve downstream
crates depending on shiplift who enable the
serde derive feature, due to Cargos unification
of features for each crate[2].

[1]: https://github.com/serde-rs/serde/issues/1441
[2]: https://github.com/rust-lang/cargo/issues/4361#issuecomment-348538243
---
 Cargo.toml       | 3 +--
 src/builder.rs   | 1 -
 src/rep.rs       | 2 +-
 src/transport.rs | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0def440..1ee57a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,8 +34,7 @@ tokio = "0.1.15"
 tokio-codec = "0.1.1"
 tokio-io = "0.1.11"
 url = "1.7.2"
-serde = "1.0.87"
-serde_derive = "1.0.87"
+serde = { version = "1.0.87", features = ["derive"] }
 serde_json = "1.0.38"
 
 [dev-dependencies]
diff --git a/src/builder.rs b/src/builder.rs
index d815af2..4923a24 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -2,7 +2,6 @@
 
 use crate::{errors::Error, Result};
 use serde::Serialize;
-use serde_derive::Serialize;
 use serde_json::{self, json, map::Map, Value};
 use std::{
     cmp::Eq,
diff --git a/src/rep.rs b/src/rep.rs
index 4f27688..d5771d9 100644
--- a/src/rep.rs
+++ b/src/rep.rs
@@ -1,6 +1,6 @@
 //! Rust representations of docker json structures
 
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
diff --git a/src/transport.rs b/src/transport.rs
index c465b7c..da506b3 100644
--- a/src/transport.rs
+++ b/src/transport.rs
@@ -17,7 +17,7 @@ use hyperlocal::UnixConnector;
 use hyperlocal::Uri as DomainUri;
 use log::debug;
 use mime::Mime;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use serde_json;
 use std::fmt;
 use tokio_io::{AsyncRead, AsyncWrite};
-- 
cgit v1.2.3