Merge pull request #36 from barabadzhi/upgrade-to-2018-edition

Migrate to Rust 2018 edition

69 files changed, 72 insertions, 76 deletions

diff --git a/ipfs-api/Cargo.toml b/ipfs-api/Cargo.toml
index 7482376..393322f 100644
--- a/ipfs-api/Cargo.toml
+++ b/ipfs-api/Cargo.toml
@@ -2,6 +2,7 @@
 name                      = "ipfs-api"
 description               = "Implementation of an IPFS HTTP API client"
 authors                   = ["Ferris Tseng <ferristseng@fastmail.fm>"]
+edition                   = "2018"
 documentation             = "https://docs.rs/ipfs-api"
 repository                = "https://github.com/ferristseng/rust-ipfs-api"
 keywords                  = ["ipfs"]
@@ -29,8 +30,7 @@ http                      = "0.1"
 hyper                     = { version = "0.12", optional = true }
 hyper-tls                 = { version = "0.3.2", optional = true }
 hyper-multipart-rfc7578   = { version = "0.3", optional = true }
-serde                     = "1.0"
-serde_derive              = "1.0"
+serde                     = { version = "1.0", features = ["derive"] }
 serde_json                = "1.0"
 serde_urlencoded          = "0.5"
 tokio                     = "0.1"
diff --git a/ipfs-api/examples/add_file.rs b/ipfs-api/examples/add_file.rs
index 5f8f0c9..2361986 100644
--- a/ipfs-api/examples/add_file.rs
+++ b/ipfs-api/examples/add_file.rs
@@ -6,10 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-
 use futures::Future;
 use ipfs_api::IpfsClient;
 use std::fs::File;
diff --git a/ipfs-api/examples/add_tar.rs b/ipfs-api/examples/add_tar.rs
index b737812..a5da698 100644
--- a/ipfs-api/examples/add_tar.rs
+++ b/ipfs-api/examples/add_tar.rs
@@ -6,11 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tar;
-extern crate tokio;
-
 use futures::{Future, Stream};
 use ipfs_api::IpfsClient;
 use std::io::Cursor;
diff --git a/ipfs-api/examples/bootstrap_default.rs b/ipfs-api/examples/bootstrap_default.rs
index 868c647..c2e6871 100644
--- a/ipfs-api/examples/bootstrap_default.rs
+++ b/ipfs-api/examples/bootstrap_default.rs
@@ -6,10 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-
 use futures::Future;
 use ipfs_api::IpfsClient;
 use tokio::runtime::current_thread::Runtime;
diff --git a/ipfs-api/examples/dns.rs b/ipfs-api/examples/dns.rs
index d019023..e91ccbc 100644
--- a/ipfs-api/examples/dns.rs
+++ b/ipfs-api/examples/dns.rs
@@ -6,10 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-
 use futures::Future;
 use ipfs_api::IpfsClient;
 use tokio::runtime::current_thread::Runtime;
diff --git a/ipfs-api/examples/get_commands.rs b/ipfs-api/examples/get_commands.rs
index 9ae8249..9b5bcec 100644
--- a/ipfs-api/examples/get_commands.rs
+++ b/ipfs-api/examples/get_commands.rs
@@ -6,10 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-
 use futures::Future;
 use ipfs_api::{response, IpfsClient};
 use tokio::runtime::current_thread::Runtime;
diff --git a/ipfs-api/examples/get_stats.rs b/ipfs-api/examples/get_stats.rs
index 09aa74e..0395f32 100644
--- a/ipfs-api/examples/get_stats.rs
+++ b/ipfs-api/examples/get_stats.rs
@@ -6,10 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-
 use futures::Future;
 use ipfs_api::IpfsClient;
 use tokio::runtime::current_thread::Runtime;
diff --git a/ipfs-api/examples/get_swarm.rs b/ipfs-api/examples/get_swarm.rs
index 376c9fe..cb9bff4 100644
--- a/ipfs-api/examples/get_swarm.rs
+++ b/ipfs-api/examples/get_swarm.rs
@@ -6,10 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-
 use futures::Future;
 use ipfs_api::IpfsClient;
 use tokio::runtime::current_thread::Runtime;
diff --git a/ipfs-api/examples/get_version.rs b/ipfs-api/examples/get_version.rs
index 09bbbde..992f249 100644
--- a/ipfs-api/examples/get_version.rs
+++ b/ipfs-api/examples/get_version.rs
@@ -6,10 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-
 use futures::Future;
 use ipfs_api::IpfsClient;
 use tokio::runtime::current_thread::Runtime;
diff --git a/ipfs-api/examples/mfs.rs b/ipfs-api/examples/mfs.rs
index 5f6a081..30a9af4 100644
--- a/ipfs-api/examples/mfs.rs
+++ b/ipfs-api/examples/mfs.rs
@@ -6,10 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-
 use futures::Future;
 use ipfs_api::{response, IpfsClient};
 use std::fs::File;
diff --git a/ipfs-api/examples/ping_peer.rs b/ipfs-api/examples/ping_peer.rs
index 04050f2..72773ec 100644
--- a/ipfs-api/examples/ping_peer.rs
+++ b/ipfs-api/examples/ping_peer.rs
@@ -6,10 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-
 use futures::{Future, Stream};
 use ipfs_api::{response::PingResponse, IpfsClient};
 use tokio::runtime::current_thread::Runtime;
diff --git a/ipfs-api/examples/pubsub.rs b/ipfs-api/examples/pubsub.rs
index 57be4d8..924eab6 100644
--- a/ipfs-api/examples/pubsub.rs
+++ b/ipfs-api/examples/pubsub.rs
@@ -6,11 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-extern crate tokio_timer;
-
 use futures::{Future, Stream};
 use ipfs_api::IpfsClient;
 use std::time::{Duration, Instant};
diff --git a/ipfs-api/examples/replace_config.rs b/ipfs-api/examples/replace_config.rs
index cb07c01..65d418e 100644
--- a/ipfs-api/examples/replace_config.rs
+++ b/ipfs-api/examples/replace_config.rs
@@ -6,10 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-
 use futures::Future;
 use ipfs_api::IpfsClient;
 use std::io::Cursor;
diff --git a/ipfs-api/examples/resolve_name.rs b/ipfs-api/examples/resolve_name.rs
index b696973..d50011f 100644
--- a/ipfs-api/examples/resolve_name.rs
+++ b/ipfs-api/examples/resolve_name.rs
@@ -6,10 +6,6 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-extern crate futures;
-extern crate ipfs_api;
-extern crate tokio;
-
 use futures::Future;
 use ipfs_api::IpfsClient;
 use tokio::runtime::current_thread::Runtime;
diff --git a/ipfs-api/src/lib.rs b/ipfs-api/src/lib.rs
index 40a1f3f..4c93f79 100644
--- a/ipfs-api/src/lib.rs
+++ b/ipfs-api/src/lib.rs
@@ -188,19 +188,7 @@ extern crate derive_more;
 #[macro_use]
 #[cfg(feature = "hyper")]
 extern crate failure;
-extern crate futures;
-extern crate http;
 extern crate serde;
-#[macro_use]
-extern crate serde_derive;
-extern crate dirs;
-extern crate multiaddr;
-extern crate serde_json;
-extern crate serde_urlencoded;
-extern crate tokio;
-extern crate tokio_codec;
-extern crate tokio_io;
-extern crate walkdir;
 
 pub use crate::client::IpfsClient;
 pub use crate::request::{KeyType, Logger, LoggingLevel, ObjectTemplate};
diff --git a/ipfs-api/src/request/bitswap.rs b/ipfs-api/src/request/bitswap.rs
index e231a33..1767f2a 100644
--- a/ipfs-api/src/request/bitswap.rs
+++ b/ipfs-api/src/request/bitswap.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 #[derive(Serialize)]
 pub struct BitswapLedger<'a> {
diff --git a/ipfs-api/src/request/block.rs b/ipfs-api/src/request/block.rs
index a8c19f2..377dc51 100644
--- a/ipfs-api/src/request/block.rs
+++ b/ipfs-api/src/request/block.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 use http::Method;
 
 #[derive(Serialize)]
diff --git a/ipfs-api/src/request/cat.rs b/ipfs-api/src/request/cat.rs
index 8db84c0..f7e7e06 100644
--- a/ipfs-api/src/request/cat.rs
+++ b/ipfs-api/src/request/cat.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 #[derive(Serialize)]
 pub struct Cat<'a> {
diff --git a/ipfs-api/src/request/dag.rs b/ipfs-api/src/request/dag.rs
index a62a5c0..630a93a 100644
--- a/ipfs-api/src/request/dag.rs
+++ b/ipfs-api/src/request/dag.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 use http::Method;
 
 #[derive(Serialize)]
diff --git a/ipfs-api/src/request/dht.rs b/ipfs-api/src/request/dht.rs
index a484e6f..76d7820 100644
--- a/ipfs-api/src/request/dht.rs
+++ b/ipfs-api/src/request/dht.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 #[derive(Serialize)]
 pub struct DhtFindPeer<'a> {
diff --git a/ipfs-api/src/request/diag.rs b/ipfs-api/src/request/diag.rs
index 0123396..93e4c5c 100644
--- a/ipfs-api/src/request/diag.rs
+++ b/ipfs-api/src/request/diag.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 pub struct DiagCmdsClear;
 
diff --git a/ipfs-api/src/request/dns.rs b/ipfs-api/src/request/dns.rs
index f680a5f..61702cc 100644
--- a/ipfs-api/src/request/dns.rs
+++ b/ipfs-api/src/request/dns.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 #[derive(Serialize)]
 pub struct Dns<'a> {
diff --git a/ipfs-api/src/request/file.rs b/ipfs-api/src/request/file.rs
index 3e56da4..4381f80 100644
--- a/ipfs-api/src/request/file.rs
+++ b/ipfs-api/src/request/file.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 #[derive(Serialize)]
 pub struct FileLs<'a> {
diff --git a/ipfs-api/src/request/files.rs b/ipfs-api/src/request/files.rs
index 5fb4da6..0233021 100644
--- a/ipfs-api/src/request/files.rs
+++ b/ipfs-api/src/request/files.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 use http::Method;
 
 #[derive(Serialize)]
diff --git a/ipfs-api/src/request/filestore.rs b/ipfs-api/src/request/filestore.rs
index 4dafab4..06f3c88 100644
--- a/ipfs-api/src/request/filestore.rs
+++ b/ipfs-api/src/request/filestore.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 pub struct FilestoreDups;
 
diff --git a/ipfs-api/src/request/get.rs b/ipfs-api/src/request/get.rs
index 6b89fb5..4e97dcf 100644
--- a/ipfs-api/src/request/get.rs
+++ b/ipfs-api/src/request/get.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 #[derive(Serialize)]
 pub struct Get<'a> {
diff --git a/ipfs-api/src/request/id.rs b/ipfs-api/src/request/id.rs
index f3ad24a..999ad3b 100644
--- a/ipfs-api/src/request/id.rs
+++ b/ipfs-api/src/request/id.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 #[derive(Serialize)]
 pub struct Id<'a> {
diff --git a/ipfs-api/src/request/key.rs b/ipfs-api/src/request/key.rs
index 6b9a726..8e447db 100644
--- a/ipfs-api/src/request/key.rs
+++ b/ipfs-api/src/request/key.rs
@@ -7,7 +7,7 @@
 //
 
 use crate::request::ApiRequest;
-use serde::ser::{Serialize, Serializer};
+use crate::serde::{Serialize, Serializer};
 
 #[derive(Copy, Clone)]
 pub enum KeyType {
diff --git a/ipfs-api/src/request/log.rs b/ipfs-api/src/request/log.rs
index d4e8812..16470e0 100644
--- a/ipfs-api/src/request/log.rs
+++ b/ipfs-api/src/request/log.rs
@@ -7,7 +7,7 @@
 //
 
 use crate::request::ApiRequest;
-use serde::ser::{Serialize, Serializer};
+use crate::serde::{Serialize, Serializer};
 use std::borrow::Cow;
 
 #[derive(Copy, Clone)]
diff --git a/ipfs-api/src/request/ls.rs b/ipfs-api/src/request/ls.rs
index c1cc933..69e456a 100644
--- a/ipfs-api/src/request/ls.rs
+++ b/ipfs-api/src/request/ls.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 #[derive(Serialize)]
 pub struct Ls<'a> {
diff --git a/ipfs-api/src/request/name.rs b/ipfs-api/src/request/name.rs
index a2d724e..f09fe51 100644
--- a/ipfs-api/src/request/name.rs
+++ b/ipfs-api/src/request/name.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 #[derive(Serialize)]
 pub struct NamePublish<'a, 'b, 'c, 'd> {
diff --git a/ipfs-api/src/request/object.rs b/ipfs-api/src/request/object.rs
index 8b57f69..ce0faff 100644
--- a/ipfs-api/src/request/object.rs
+++ b/ipfs-api/src/request/object.rs
@@ -7,7 +7,7 @@
 //
 
 use crate::request::ApiRequest;
-use serde::ser::{Serialize, Serializer};
+use crate::serde::{Serialize, Serializer};
 
 #[derive(Serialize)]
 pub struct ObjectData<'a> {
diff --git a/ipfs-api/src/request/pin.rs b/ipfs-api/src/request/pin.rs
index b23d40e..332abf6 100644
--- a/ipfs-api/src/request/pin.rs
+++ b/ipfs-api/src/request/pin.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 #[derive(Serialize)]
 pub struct PinAdd<'a> {
diff --git a/ipfs-api/src/request/ping.rs b/ipfs-api/src/request/ping.rs
index 2bb0339..50046f6 100644
--- a/ipfs-api/src/request/ping.rs
+++ b/ipfs-api/src/request/ping.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 #[derive(Serialize)]
 pub struct Ping<'a> {
diff --git a/ipfs-api/src/request/pubsub.rs b/ipfs-api/src/request/pubsub.rs
index d3e4ce5..b2a46bc 100644
--- a/ipfs-api/src/request/pubsub.rs
+++ b/ipfs-api/src/request/pubsub.rs
@@ -7,6 +7,7 @@
 //
 
 use crate::request::ApiRequest;
+use crate::serde::Serialize;
 
 pub struct PubsubLs;
 
diff --git a/ipfs-api/src/request/tar.rs b/ipfs-api/src/request/tar.rs
index 6aab27c..6129521 100644
--- a/ipfs-api/src/request/tar.rs