update to 2018 edition (#141)

* update to 2018 edition

* remove more externs

* bump version

Cargo.toml

@@ -1,14 +1,15 @@
 [package]
 
 name = "shiplift"
-version = "0.3.2"
+version = "0.4.0"
 authors = ["softprops <[email protected]>"]
 description = "A Rust interface for maneuvering Docker containers"
 documentation = "https://docs.rs/shiplift"
 homepage = "https://github.com/softprops/shiplift"
 repository = "https://github.com/softprops/shiplift"
 keywords = ["docker", "unix", "containers", "hyper", "ship"]
 license = "MIT"
+edition = "2018"
 
 [dependencies]
 byteorder = "1"

README.md

@@ -20,20 +20,15 @@ Some small example programs can be found in this repository's [examples director
 ### communicating with hosts
 
 To use shiplift, you must first have a docker daemon readily accessible. Typically this daemon processs
-is resolvable via a url specified by an env var named `DOCKER_HOST`. If you are using osx, [docker-machine](https://docs.docker.com/machine/) typically
-will have already set up every thing you need to get started when you run `docker-machine env {envid}`.
+is resolvable via a url specified by an env var named `DOCKER_HOST`.
 
 ```rust
-extern crate shiplift;
 let docker = shiplift::Docker::new();
 ```
 
 If you wish to be more explicit you can provide a host in the form of a `url.Url`.
 
 ```rust
-extern crate shiplift;
-extern crate url;
-
 use shiplift::Docker;
 use url::Url;
 
@@ -45,8 +40,6 @@ let docker = Docker::host(Url::parse("http://yourhost").unwrap());
 If you are interacting with docker containers, chances are you will also need to interact with docker image information. You can interact docker images with `docker.images()`.
 
 ```rust
-extern crate shiplift;
-
 use shiplift::Docker;
 
 let docker = Docker.new();
@@ -127,8 +120,6 @@ println!("- {:?}", img.delete().unwrap());
 Containers are instances of images. To gain access to this interface use `docker.containers()`
 
 ```rust
-extern crate shiplift;
-
 use shiplift::Docker;
 
 let docker = Docker.new();

examples/containercreate.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::{ContainerOptions, Docker};
 use std::env;
 use tokio::prelude::Future;

examples/containerdelete.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use std::env;
 use tokio::prelude::Future;

examples/containerexec.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::{tty::StreamType, Docker, ExecContainerOptions};
 use std::env;
 use tokio::prelude::{Future, Stream};

examples/containerinspect.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use std::env;
 use tokio::prelude::Future;

examples/containers.rs

@@ -1,7 +1,3 @@
-extern crate env_logger;
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use tokio::prelude::Future;
 

examples/events.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use tokio::prelude::{Future, Stream};
 

examples/export.rs

@@ -1,10 +1,5 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::{errors::Error, Docker};
-use std::env;
-use std::fs::OpenOptions;
-use std::io::Write;
+use std::{env, fs::OpenOptions, io::Write};
 use tokio::prelude::{Future, Stream};
 
 fn main() {

examples/imagebuild.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::{BuildOptions, Docker};
 use std::env;
 use tokio::prelude::{Future, Stream};

examples/imagedelete.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use std::env;
 use tokio::prelude::Future;

examples/imageinspect.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use std::env;
 use tokio::prelude::Future;

examples/imagepull.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::{Docker, PullOptions};
 use std::env;
 use tokio::prelude::{Future, Stream};

examples/images.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use tokio::prelude::Future;
 

examples/info.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use tokio::prelude::Future;
 

examples/logs.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::{tty::StreamType, Docker, LogsOptions};
 use std::env;
 use tokio::prelude::{Future, Stream};

examples/networkconnect.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::{ContainerConnectionOptions, Docker};
 use std::env;
 use tokio::prelude::Future;

examples/networkcreate.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::{Docker, NetworkCreateOptions};
 use std::env;
 use tokio::prelude::Future;

examples/networkdelete.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use std::env;
 use tokio::prelude::Future;

examples/networkdisconnect.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::{ContainerConnectionOptions, Docker};
 use std::env;
 use tokio::prelude::Future;

examples/networkinspect.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use std::env;
 use tokio::prelude::Future;

examples/networks.rs

@@ -1,7 +1,3 @@
-extern crate env_logger;
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use tokio::prelude::Future;
 

examples/stats.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use std::env;
 use tokio::prelude::{Future, Stream};

examples/top.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use std::env;
 use tokio::prelude::Future;

examples/volumecreate.rs

@@ -1,10 +1,5 @@
-extern crate shiplift;
-extern crate tokio;
-
-use shiplift::builder::VolumeCreateOptions;
-use shiplift::Docker;
-use std::collections::HashMap;
-use std::env;
+use shiplift::{builder::VolumeCreateOptions, Docker};
+use std::{collections::HashMap, env};
 use tokio::prelude::Future;
 
 fn main() {

examples/volumedelete.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use std::env;
 use tokio::prelude::Future;

examples/volumes.rs

@@ -1,6 +1,3 @@
-extern crate shiplift;
-extern crate tokio;
-
 use shiplift::Docker;
 use tokio::prelude::Future;
 

rustfmt.toml

@@ -1,2 +1,4 @@
-# style function arg lists consistently
-fn_args_density = "Vertical"
+# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#fn_args_density
+fn_args_density = "Vertical"
+# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#merge_imports
+merge_imports = true

src/builder.rs

@@ -1,21 +1,17 @@
 //! Interfaces for building various structures
 
-// Std lib
-use std::cmp::Eq;
-use std::collections::{BTreeMap, HashMap};
-use std::hash::Hash;
-use std::iter::IntoIterator;
-use std::iter::Peekable;
-
-// Third party
+use crate::{errors::Error, Result};
 use serde::Serialize;
-use serde_json::{self, map::Map, Value};
+use serde_derive::Serialize;
+use serde_json::{self, json, map::Map, Value};
+use std::{
+    cmp::Eq,
+    collections::{BTreeMap, HashMap},
+    hash::Hash,
+    iter::{IntoIterator, Peekable},
+};
 use url::form_urlencoded;
 
-// Ours
-use errors::Error;
-use Result;
-
 #[derive(Default)]
 pub struct PullOptions {
     params: HashMap<&'static str, String>,

src/errors.rs

@@ -3,10 +3,7 @@
 use http;
 use hyper::{self, StatusCode};
 use serde_json::Error as SerdeError;
-use std::error::Error as StdError;
-use std::fmt;
-use std::io::Error as IoError;
-use std::string::FromUtf8Error;
+use std::{error::Error as StdError, fmt, io::Error as IoError, string::FromUtf8Error};
 
 #[derive(Debug)]
 pub enum Error {