Upgrade to Rust 2018

50 files changed, 59 insertions, 59 deletions

diff --git a/ipfs-api/src/client.rs b/ipfs-api/src/client.rs
index 6c1e3bf..afcd4c9 100644
--- a/ipfs-api/src/client.rs
+++ b/ipfs-api/src/client.rs
@@ -15,19 +15,19 @@ use futures::{
     stream::{self, Stream},
     Future, IntoFuture,
 };
-use header::TRAILER;
+use crate::header::TRAILER;
 use http::uri::{InvalidUri, Uri};
 use http::StatusCode;
 #[cfg(feature = "hyper")]
 use hyper::client::{Client, HttpConnector};
 #[cfg(feature = "hyper")]
-use hyper_multipart::client::multipart;
+use crate::hyper_multipart::client::multipart;
 #[cfg(feature = "hyper")]
 use hyper_tls::HttpsConnector;
 use multiaddr::{AddrComponent, ToMultiaddr};
-use read::{JsonLineDecoder, LineDecoder, StreamReader};
-use request::{self, ApiRequest};
-use response::{self, Error};
+use crate::read::{JsonLineDecoder, LineDecoder, StreamReader};
+use crate::request::{self, ApiRequest};
+use crate::response::{self, Error};
 use serde::{Deserialize, Serialize};
 use serde_json;
 use std::{
@@ -43,14 +43,14 @@ use tokio_codec::{Decoder, FramedRead};
 #[cfg(feature = "actix")]
 type AsyncResponse<T> = Box<Future<Item = T, Error = Error> + 'static>;
 #[cfg(feature = "hyper")]
-type AsyncResponse<T> = Box<Future<Item = T, Error = Error> + Send + 'static>;
+type AsyncResponse<T> = Box<dyn Future<Item = T, Error = Error> + Send + 'static>;
 
 /// A future that returns a stream of responses.
 ///
 #[cfg(feature = "actix")]
 type AsyncStreamResponse<T> = Box<Stream<Item = T, Error = Error> + 'static>;
 #[cfg(feature = "hyper")]
-type AsyncStreamResponse<T> = Box<Stream<Item = T, Error = Error> + Send + 'static>;
+type AsyncStreamResponse<T> = Box<dyn Stream<Item = T, Error = Error> + Send + 'static>;
 
 #[cfg(feature = "actix")]
 type Request = actix_web::client::ClientRequest;
@@ -293,7 +293,7 @@ impl IpfsClient {
                     .request(req)
                     .from_err()
                     .map(move |res| {
-                        let stream: Box<Stream<Item = Res, Error = _> + Send + 'static> =
+                        let stream: Box<dyn Stream<Item = Res, Error = _> + Send + 'static> =
                             match res.status() {
                                 StatusCode::OK => process(res),
                                 // If the server responded with an error status code, the body
diff --git a/ipfs-api/src/lib.rs b/ipfs-api/src/lib.rs
index a977c67..09914d6 100644
--- a/ipfs-api/src/lib.rs
+++ b/ipfs-api/src/lib.rs
@@ -202,8 +202,8 @@ extern crate tokio_codec;
 extern crate tokio_io;
 extern crate walkdir;
 
-pub use client::IpfsClient;
-pub use request::{KeyType, Logger, LoggingLevel, ObjectTemplate};
+pub use crate::client::IpfsClient;
+pub use crate::request::{KeyType, Logger, LoggingLevel, ObjectTemplate};
 
 mod client;
 mod header;
diff --git a/ipfs-api/src/read.rs b/ipfs-api/src/read.rs
index d9b2f98..ac82f37 100644
--- a/ipfs-api/src/read.rs
+++ b/ipfs-api/src/read.rs
@@ -8,8 +8,8 @@
 
 use bytes::{Bytes, BytesMut};
 use futures::{Async, Stream};
-use header::X_STREAM_ERROR;
-use response::Error;
+use crate::header::X_STREAM_ERROR;
+use crate::response::Error;
 use serde::Deserialize;
 use serde_json;
 use std::{
diff --git a/ipfs-api/src/request/add.rs b/ipfs-api/src/request/add.rs
index 123ba4a..758bfd6 100644
--- a/ipfs-api/src/request/add.rs
+++ b/ipfs-api/src/request/add.rs
@@ -7,7 +7,7 @@
 //
 
 use http::Method;
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct Add;
 
diff --git a/ipfs-api/src/request/bitswap.rs b/ipfs-api/src/request/bitswap.rs
index 01d4162..e231a33 100644
--- a/ipfs-api/src/request/bitswap.rs
+++ b/ipfs-api/src/request/bitswap.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct BitswapLedger<'a> {
diff --git a/ipfs-api/src/request/block.rs b/ipfs-api/src/request/block.rs
index a6dd99c..a31546d 100644
--- a/ipfs-api/src/request/block.rs
+++ b/ipfs-api/src/request/block.rs
@@ -7,7 +7,7 @@
 //
 
 use http::Method;
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct BlockGet<'a> {
diff --git a/ipfs-api/src/request/bootstrap.rs b/ipfs-api/src/request/bootstrap.rs
index bc632f4..9e321e5 100644
--- a/ipfs-api/src/request/bootstrap.rs
+++ b/ipfs-api/src/request/bootstrap.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct BootstrapAddDefault;
 
diff --git a/ipfs-api/src/request/cat.rs b/ipfs-api/src/request/cat.rs
index 4fd1195..8db84c0 100644
--- a/ipfs-api/src/request/cat.rs
+++ b/ipfs-api/src/request/cat.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct Cat<'a> {
diff --git a/ipfs-api/src/request/commands.rs b/ipfs-api/src/request/commands.rs
index 11879f2..108c45e 100644
--- a/ipfs-api/src/request/commands.rs
+++ b/ipfs-api/src/request/commands.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct Commands;
 
diff --git a/ipfs-api/src/request/config.rs b/ipfs-api/src/request/config.rs
index e3753ea..1f33edb 100644
--- a/ipfs-api/src/request/config.rs
+++ b/ipfs-api/src/request/config.rs
@@ -7,7 +7,7 @@
 //
 
 use http::Method;
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct ConfigEdit;
 
diff --git a/ipfs-api/src/request/dag.rs b/ipfs-api/src/request/dag.rs
index 2d49c3a..ec096ed 100644
--- a/ipfs-api/src/request/dag.rs
+++ b/ipfs-api/src/request/dag.rs
@@ -7,7 +7,7 @@
 //
 
 use http::Method;
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct DagGet<'a> {
diff --git a/ipfs-api/src/request/dht.rs b/ipfs-api/src/request/dht.rs
index 53c52f8..a484e6f 100644
--- a/ipfs-api/src/request/dht.rs
+++ b/ipfs-api/src/request/dht.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct DhtFindPeer<'a> {
diff --git a/ipfs-api/src/request/diag.rs b/ipfs-api/src/request/diag.rs
index 430ff38..0123396 100644
--- a/ipfs-api/src/request/diag.rs
+++ b/ipfs-api/src/request/diag.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct DiagCmdsClear;
 
diff --git a/ipfs-api/src/request/dns.rs b/ipfs-api/src/request/dns.rs
index 9011a6a..f680a5f 100644
--- a/ipfs-api/src/request/dns.rs
+++ b/ipfs-api/src/request/dns.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct Dns<'a> {
diff --git a/ipfs-api/src/request/file.rs b/ipfs-api/src/request/file.rs
index 57058d7..3e56da4 100644
--- a/ipfs-api/src/request/file.rs
+++ b/ipfs-api/src/request/file.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct FileLs<'a> {
diff --git a/ipfs-api/src/request/files.rs b/ipfs-api/src/request/files.rs
index 394d7b3..0f562b0 100644
--- a/ipfs-api/src/request/files.rs
+++ b/ipfs-api/src/request/files.rs
@@ -7,7 +7,7 @@
 //
 
 use http::Method;
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct FilesCp<'a> {
diff --git a/ipfs-api/src/request/filestore.rs b/ipfs-api/src/request/filestore.rs
index 9f982ec..4dafab4 100644
--- a/ipfs-api/src/request/filestore.rs
+++ b/ipfs-api/src/request/filestore.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct FilestoreDups;
 
diff --git a/ipfs-api/src/request/get.rs b/ipfs-api/src/request/get.rs
index 4c930ef..6b89fb5 100644
--- a/ipfs-api/src/request/get.rs
+++ b/ipfs-api/src/request/get.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct Get<'a> {
diff --git a/ipfs-api/src/request/id.rs b/ipfs-api/src/request/id.rs
index 0876549..f3ad24a 100644
--- a/ipfs-api/src/request/id.rs
+++ b/ipfs-api/src/request/id.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct Id<'a> {
diff --git a/ipfs-api/src/request/key.rs b/ipfs-api/src/request/key.rs
index 5f723eb..6b9a726 100644
--- a/ipfs-api/src/request/key.rs
+++ b/ipfs-api/src/request/key.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 use serde::ser::{Serialize, Serializer};
 
 #[derive(Copy, Clone)]
diff --git a/ipfs-api/src/request/log.rs b/ipfs-api/src/request/log.rs
index 5942b0f..d4e8812 100644
--- a/ipfs-api/src/request/log.rs
+++ b/ipfs-api/src/request/log.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 use serde::ser::{Serialize, Serializer};
 use std::borrow::Cow;
 
diff --git a/ipfs-api/src/request/ls.rs b/ipfs-api/src/request/ls.rs
index bd7330d..c1cc933 100644
--- a/ipfs-api/src/request/ls.rs
+++ b/ipfs-api/src/request/ls.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct Ls<'a> {
diff --git a/ipfs-api/src/request/name.rs b/ipfs-api/src/request/name.rs
index ac6a190..a2d724e 100644
--- a/ipfs-api/src/request/name.rs
+++ b/ipfs-api/src/request/name.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[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 f93f0a0..8b57f69 100644
--- a/ipfs-api/src/request/object.rs
+++ b/ipfs-api/src/request/object.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 use serde::ser::{Serialize, Serializer};
 
 #[derive(Serialize)]
diff --git a/ipfs-api/src/request/pin.rs b/ipfs-api/src/request/pin.rs
index 872b377..b23d40e 100644
--- a/ipfs-api/src/request/pin.rs
+++ b/ipfs-api/src/request/pin.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct PinAdd<'a> {
diff --git a/ipfs-api/src/request/ping.rs b/ipfs-api/src/request/ping.rs
index 20718e8..2bb0339 100644
--- a/ipfs-api/src/request/ping.rs
+++ b/ipfs-api/src/request/ping.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 #[derive(Serialize)]
 pub struct Ping<'a> {
diff --git a/ipfs-api/src/request/pubsub.rs b/ipfs-api/src/request/pubsub.rs
index 27f1c16..d3e4ce5 100644
--- a/ipfs-api/src/request/pubsub.rs
+++ b/ipfs-api/src/request/pubsub.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct PubsubLs;
 
diff --git a/ipfs-api/src/request/refs.rs b/ipfs-api/src/request/refs.rs
index c2b237f..2b29e7b 100644
--- a/ipfs-api/src/request/refs.rs
+++ b/ipfs-api/src/request/refs.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct RefsLocal;
 
diff --git a/ipfs-api/src/request/shutdown.rs b/ipfs-api/src/request/shutdown.rs
index a6535a2..a7b6aec 100644
--- a/ipfs-api/src/request/shutdown.rs
+++ b/ipfs-api/src/request/shutdown.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct Shutdown;
 
diff --git a/ipfs-api/src/request/stats.rs b/ipfs-api/src/request/stats.rs
index 7cbc735..2e3eca9 100644
--- a/ipfs-api/src/request/stats.rs
+++ b/ipfs-api/src/request/stats.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct StatsBitswap;
 
diff --git a/ipfs-api/src/request/swarm.rs b/ipfs-api/src/request/swarm.rs
index 37ef7a6..fad9f8f 100644
--- a/ipfs-api/src/request/swarm.rs
+++ b/ipfs-api/src/request/swarm.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct SwarmAddrsLocal;
 
diff --git a/ipfs-api/src/request/tar.rs b/ipfs-api/src/request/tar.rs
index 05c1770..b3f448b 100644
--- a/ipfs-api/src/request/tar.rs
+++ b/ipfs-api/src/request/tar.rs
@@ -7,7 +7,7 @@
 //
 
 use http::Method;
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct TarAdd;
 
diff --git a/ipfs-api/src/request/version.rs b/ipfs-api/src/request/version.rs
index 26d83da..9f1e3b8 100644
--- a/ipfs-api/src/request/version.rs
+++ b/ipfs-api/src/request/version.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use request::ApiRequest;
+use crate::request::ApiRequest;
 
 pub struct Version;
 
diff --git a/ipfs-api/src/response/bitswap.rs b/ipfs-api/src/response/bitswap.rs
index 77fa603..143680c 100644
--- a/ipfs-api/src/response/bitswap.rs
+++ b/ipfs-api/src/response/bitswap.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use response::serde;
+use crate::response::serde;
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
diff --git a/ipfs-api/src/response/bootstrap.rs b/ipfs-api/src/response/bootstrap.rs
index 9015cd9..6700073 100644
--- a/ipfs-api/src/response/bootstrap.rs
+++ b/ipfs-api/src/response/bootstrap.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use response::serde;
+use crate::response::serde;
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
diff --git a/ipfs-api/src/response/commands.rs b/ipfs-api/src/response/commands.rs
index 4b6c2f5..b3d5f86 100644
--- a/ipfs-api/src/response/commands.rs
+++ b/ipfs-api/src/response/commands.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use response::serde;
+use crate::response::serde;
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
diff --git a/ipfs-api/src/response/dag.rs b/ipfs-api/src/response/dag.rs
index 3899443..2efc0f6 100644
--- a/ipfs-api/src/response/dag.rs
+++ b/ipfs-api/src/response/dag.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use response::serde;
+use crate::response::serde;
 use std::collections::HashMap;
 
 #[derive(Debug, Deserialize)]
diff --git a/ipfs-api/src/response/dht.rs b/ipfs-api/src/response/dht.rs
index 483880d..31f64f5 100644
--- a/ipfs-api/src/response/dht.rs
+++ b/ipfs-api/src/response/dht.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use response::serde;
+use crate::response::serde;
 use serde::de::{Deserialize, Deserializer, Error};
 
 /// See
diff --git a/ipfs-api/src/response/file.rs b/ipfs-api/src/response/file.rs
index b169e87..5804b78 100644
--- a/ipfs-api/src/response/file.rs
+++ b/ipfs-api/src/response/file.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use response::{serde, IpfsHeader};
+use crate::response::{serde, IpfsHeader};
 use std::collections::HashMap;
 
 #[derive(Debug, Deserialize)]
diff --git a/ipfs-api/src/response/files.rs b/ipfs-api/src/response/files.rs
index b745f9e..eafc234 100644
--- a/ipfs-api/src/response/files.rs
+++ b/ipfs-api/src/response/files.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use response::serde;
+use crate::response::serde;
 
 pub type FilesCpResponse = ();
 
diff --git a/ipfs-api/src/response/id.rs b/ipfs-api/src/response/id.rs
index e993b50..40cfff7 100644
--- a/ipfs-api/src/response/id.rs
+++ b/ipfs-api/src/response/id.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use response::serde;
+use crate::response::serde;
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
diff --git a/ipfs-api/src/response/key.rs b/ipfs-api/src/response/key.rs
index 803642a..d9d604a 100644
--- a/ipfs-api/src/response/key.rs
+++ b/ipfs-api/src/response/key.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use response::serde;
+use crate::response::serde;
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
diff --git a/ipfs-api/src/response/log.rs b/ipfs-api/src/response/log.rs
index 90ad35f..1c096e0 100644
--- a/ipfs-api/src/response/log.rs
+++ b/ipfs-api/src/response/log.rs
@@ -6,7 +6,7 @@
 // copied, modified, or distributed except according to those terms.
 //
 
-use response::serde;
+use crate::response::serde;
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
diff --git a/ipfs-api/src/response/ls.rs b/ipfs-api/src/respons