Upgrade to Rust 2018

18 files changed, 20 insertions, 20 deletions

diff --git a/ipfs-cli/src/command/add.rs b/ipfs-cli/src/command/add.rs
index 52505ef..a285ace 100644
--- a/ipfs-cli/src/command/add.rs
+++ b/ipfs-cli/src/command/add.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::{CliCommand, EXPECTED_FILE};
+use crate::command::{CliCommand, EXPECTED_FILE};
 use futures::Future;
 use std::path::Path;
 
diff --git a/ipfs-cli/src/command/bitswap.rs b/ipfs-cli/src/command/bitswap.rs
index 95e6752..f9014d5 100644
--- a/ipfs-cli/src/command/bitswap.rs
+++ b/ipfs-cli/src/command/bitswap.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::Future;
 
 pub struct Command;
diff --git a/ipfs-cli/src/command/block.rs b/ipfs-cli/src/command/block.rs
index b4ca887..7303b3a 100644
--- a/ipfs-cli/src/command/block.rs
+++ b/ipfs-cli/src/command/block.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::{verify_file, CliCommand, EXPECTED_FILE};
+use crate::command::{verify_file, CliCommand, EXPECTED_FILE};
 use futures::{Future, Stream};
 use std::fs::File;
 use std::io::{self, Write};
diff --git a/ipfs-cli/src/command/bootstrap.rs b/ipfs-cli/src/command/bootstrap.rs
index af1e406..3b6723b 100644
--- a/ipfs-cli/src/command/bootstrap.rs
+++ b/ipfs-cli/src/command/bootstrap.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::Future;
 
 fn print_peers(peers: &[String]) {
diff --git a/ipfs-cli/src/command/cat.rs b/ipfs-cli/src/command/cat.rs
index 6e8a9e7..c5f4fab 100644
--- a/ipfs-cli/src/command/cat.rs
+++ b/ipfs-cli/src/command/cat.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::{Future, Stream};
 use std::io::{self, Write};
 
diff --git a/ipfs-cli/src/command/commands.rs b/ipfs-cli/src/command/commands.rs
index 4ded502..f6eb7a3 100644
--- a/ipfs-cli/src/command/commands.rs
+++ b/ipfs-cli/src/command/commands.rs
@@ -6,7 +6,7 @@
 //
 
 use clap::App;
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::Future;
 use ipfs_api::response::CommandsResponse;
 
diff --git a/ipfs-cli/src/command/config.rs b/ipfs-cli/src/command/config.rs
index 1b0cf79..0b9cc5b 100644
--- a/ipfs-cli/src/command/config.rs
+++ b/ipfs-cli/src/command/config.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::{verify_file, CliCommand, EXPECTED_FILE};
+use crate::command::{verify_file, CliCommand, EXPECTED_FILE};
 use futures::Future;
 use std::fs::File;
 
diff --git a/ipfs-cli/src/command/dag.rs b/ipfs-cli/src/command/dag.rs
index cd070ac..4d3db15 100644
--- a/ipfs-cli/src/command/dag.rs
+++ b/ipfs-cli/src/command/dag.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::Future;
 
 pub struct Command;
diff --git a/ipfs-cli/src/command/dht.rs b/ipfs-cli/src/command/dht.rs
index 0e13f22..fb0ab70 100644
--- a/ipfs-cli/src/command/dht.rs
+++ b/ipfs-cli/src/command/dht.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::{Future, Stream};
 use ipfs_api::response::DhtMessage;
 
diff --git a/ipfs-cli/src/command/diag.rs b/ipfs-cli/src/command/diag.rs
index 1c5dee9..68fc7df 100644
--- a/ipfs-cli/src/command/diag.rs
+++ b/ipfs-cli/src/command/diag.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::{App, Arg, SubCommand};
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::Future;
 
 pub struct Command;
diff --git a/ipfs-cli/src/command/dns.rs b/ipfs-cli/src/command/dns.rs
index 5f60d09..c909e5b 100644
--- a/ipfs-cli/src/command/dns.rs
+++ b/ipfs-cli/src/command/dns.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::Future;
 
 pub struct Command;
diff --git a/ipfs-cli/src/command/file.rs b/ipfs-cli/src/command/file.rs
index 7f6aeb6..b22f06d 100644
--- a/ipfs-cli/src/command/file.rs
+++ b/ipfs-cli/src/command/file.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::Future;
 
 pub struct Command;
diff --git a/ipfs-cli/src/command/files.rs b/ipfs-cli/src/command/files.rs
index 3f1165e..820dc26 100644
--- a/ipfs-cli/src/command/files.rs
+++ b/ipfs-cli/src/command/files.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::{verify_file, CliCommand, EXPECTED_FILE};
+use crate::command::{verify_file, CliCommand, EXPECTED_FILE};
 use futures::{Future, Stream};
 use std::fs::File;
 use std::io::{self, Write};
diff --git a/ipfs-cli/src/command/filestore.rs b/ipfs-cli/src/command/filestore.rs
index f8a275f..869527a 100644
--- a/ipfs-cli/src/command/filestore.rs
+++ b/ipfs-cli/src/command/filestore.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::{Future, Stream};
 use ipfs_api::response::FilestoreObject;
 
diff --git a/ipfs-cli/src/command/mod.rs b/ipfs-cli/src/command/mod.rs
index 86f9aa5..7e2e99d 100644
--- a/ipfs-cli/src/command/mod.rs
+++ b/ipfs-cli/src/command/mod.rs
@@ -13,7 +13,7 @@ use std::error::Error;
 use std::fs;
 use std::path::Path;
 
-pub type CommandExecutable = Box<Future<Item = (), Error = ()> + 'static + Send>;
+pub type CommandExecutable = Box<dyn Future<Item = (), Error = ()> + 'static + Send>;
 
 pub const EXPECTED_FILE: &str = "expected to read input file";
 
@@ -115,7 +115,7 @@ macro_rules! handle {
         fn handle(
             client: &::ipfs_api::IpfsClient,
             args: &::clap::ArgMatches,
-        ) -> ::command::CommandExecutable {
+        ) -> crate::command::CommandExecutable {
             let $args = args;
             let $client = client;
 
@@ -131,7 +131,7 @@ macro_rules! handle {
         fn handle(
             client: &::ipfs_api::IpfsClient,
             args: &::clap::ArgMatches,
-        ) -> ::command::CommandExecutable {
+        ) -> crate::command::CommandExecutable {
             let $client = client;
             let subcommand = args.subcommand();
 
diff --git a/ipfs-cli/src/command/shutdown.rs b/ipfs-cli/src/command/shutdown.rs
index e32b7f1..901f1fd 100644
--- a/ipfs-cli/src/command/shutdown.rs
+++ b/ipfs-cli/src/command/shutdown.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::Future;
 
 pub struct Command;
diff --git a/ipfs-cli/src/command/version.rs b/ipfs-cli/src/command/version.rs
index bdafa33..41c5305 100644
--- a/ipfs-cli/src/command/version.rs
+++ b/ipfs-cli/src/command/version.rs
@@ -7,7 +7,7 @@
 //
 
 use clap::App;
-use command::CliCommand;
+use crate::command::CliCommand;
 use futures::Future;
 
 pub struct Command;
diff --git a/ipfs-cli/src/main.rs b/ipfs-cli/src/main.rs
index d0b4961..64e2cf9 100644
--- a/ipfs-cli/src/main.rs
+++ b/ipfs-cli/src/main.rs
@@ -12,7 +12,7 @@ extern crate futures;
 extern crate hyper;
 extern crate ipfs_api;
 
-use command::CliCommand;
+use crate::command::CliCommand;
 use ipfs_api::IpfsClient;
 
 mod command;