Switch to Rust edition 2018

Cargo.toml

@@ -11,6 +11,7 @@ exclude = [
 ".gitignore",
 ".travis.yml",
 ]
+edition = "2018"
 
 [package.metadata.release]
 sign-commit = true

examples/checkregistry.rs

@@ -1,4 +1,3 @@
-extern crate dkregistry;
 extern crate tokio;
 
 use std::{boxed, error};
@@ -20,10 +19,10 @@ fn main() {
 
 fn run(host: &str) -> Result<bool, boxed::Box<dyn error::Error>> {
     let mut runtime = Runtime::new()?;
-    let dclient = try!(dkregistry::v2::Client::configure()
+    let dclient = dkregistry::v2::Client::configure()
         .registry(host)
         .insecure_registry(false)
-        .build());
+        .build()?;
     let futcheck = dclient.is_v2_supported();
 
     let supported = runtime.block_on(futcheck)?;

examples/common/mod.rs

@@ -1,4 +1,3 @@
-extern crate dkregistry;
 extern crate futures;
 
 use futures::prelude::*;

examples/image-labels.rs

@@ -1,5 +1,4 @@
 extern crate dirs;
-extern crate dkregistry;
 extern crate futures;
 extern crate serde_json;
 extern crate tokio;

examples/image.rs

@@ -1,5 +1,4 @@
 extern crate dirs;
-extern crate dkregistry;
 extern crate futures;
 extern crate serde_json;
 extern crate tokio;
@@ -88,8 +87,6 @@ fn run(
                 .and_then(|manifest| Ok((dclient, manifest.layers_digests(None)?)))
         })
         .and_then(|(dclient, layers_digests)| {
-            let image = image.clone();
-
             println!("{} -> got {} layer(s)", &image, layers_digests.len(),);
 
             futures::stream::iter_ok::<_, dkregistry::errors::Error>(layers_digests)

examples/login.rs

@@ -1,4 +1,3 @@
-extern crate dkregistry;
 extern crate futures;
 extern crate tokio;
 

examples/tags.rs

@@ -1,4 +1,3 @@
-extern crate dkregistry;
 extern crate futures;
 extern crate tokio;
 

examples/trace.rs

@@ -1,5 +1,4 @@
 extern crate dirs;
-extern crate dkregistry;
 extern crate futures;
 extern crate serde_json;
 extern crate tokio;

src/lib.rs

@@ -35,26 +35,14 @@
 
 #![deny(missing_debug_implementations)]
 
-extern crate base64;
-extern crate futures;
-extern crate http;
-extern crate mime;
-extern crate serde;
-extern crate serde_json;
 #[macro_use]
 extern crate error_chain;
 #[macro_use]
 extern crate serde_derive;
 #[macro_use]
 extern crate log;
-extern crate libflate;
-extern crate regex;
-extern crate strum;
-extern crate tar;
 #[macro_use]
 extern crate strum_macros;
-extern crate reqwest;
-extern crate sha2;
 
 pub mod errors;
 pub mod mediatypes;
@@ -77,17 +65,17 @@ pub fn get_credentials<T: Read>(
     reader: T,
     index: &str,
 ) -> Result<(Option<String>, Option<String>)> {
-    let map: Auths = try!(serde_json::from_reader(reader));
+    let map: Auths = serde_json::from_reader(reader)?;
     let real_index = match index {
         // docker.io has some special casing in config.json
         "docker.io" | "registry-1.docker.io" => "https://index.docker.io/v1/",
         other => other,
     };
     let auth = match map.auths.get(real_index) {
-        Some(x) => try!(base64::decode(x.auth.as_str())),
+        Some(x) => base64::decode(x.auth.as_str())?,
         None => bail!("no auth for index {}", real_index),
     };
-    let s = try!(String::from_utf8(auth));
+    let s = String::from_utf8(auth)?;
     let creds: Vec<&str> = s.splitn(2, ':').collect();
     let up = match (creds.get(0), creds.get(1)) {
         (Some(&""), Some(p)) => (None, Some(p.to_string())),

src/mediatypes.rs

@@ -1,6 +1,6 @@
 //! Media-types for API objects.
 
-use errors::*;
+use crate::errors::*;
 use futures;
 use mime;
 use strum::EnumProperty;

src/reference.rs

@@ -29,7 +29,7 @@
 // The `docker://` schema is not officially documented, but has a reference implementation:
 // https://github.com/docker/distribution/blob/v2.6.1/reference/reference.go
 
-use errors::Error;
+use crate::errors::Error;
 use regex;
 use std::collections::VecDeque;
 use std::str::FromStr;
@@ -47,7 +47,7 @@ pub enum Version {
 }
 
 impl str::FromStr for Version {
-    type Err = ::errors::Error;
+    type Err = Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let v = match s.chars().nth(0) {
             Some(':') => Version::Tag(s.trim_start_matches(':').to_string()),
@@ -146,7 +146,7 @@ impl fmt::Display for Reference {
 }
 
 impl str::FromStr for Reference {
-    type Err = ::errors::Error;
+    type Err = Error;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         parse_url(s)
     }

src/render.rs

@@ -3,7 +3,7 @@
 // Docker image format is specified at
 // https://github.com/moby/moby/blob/v17.05.0-ce/image/spec/v1.md
 
-use errors::*;
+use crate::errors::*;
 use libflate::gzip;
 use std::{fs, path};
 use tar;

src/v2/auth.rs

@@ -1,6 +1,6 @@
-use futures::{future, prelude::*};
+use crate::v2::*;
+use futures::future;
 use reqwest::{StatusCode, Url};
-use v2::*;
 
 /// Convenience alias for future `TokenAuth` result.
 pub type FutureTokenAuth = Box<dyn Future<Item = TokenAuth, Error = Error> + Send>;
@@ -37,7 +37,7 @@ impl Client {
         };
 
         let fres = self
-            .build_reqwest(reqwest::async::Client::new().get(url.clone()))
+            .build_reqwest(reqwest::r#async::Client::new().get(url.clone()))
             .send()
             .map_err(|e| Error::from(format!("{}", e)))
             .and_then(move |r| {
@@ -95,7 +95,7 @@ impl Client {
             })
             .and_then(move |u| {
                 let auth_req = {
-                    let auth_req = subclient.build_reqwest(reqwest::async::Client::new().get(u));
+                    let auth_req = subclient.build_reqwest(reqwest::r#async::Client::new().get(u));
                     if let Some(creds) = creds {
                         auth_req.basic_auth(creds.0, Some(creds.1))
                     } else {
@@ -158,7 +158,7 @@ impl Client {
             }
         };
 
-        let req = self.build_reqwest(reqwest::async::Client::new().get(url.clone()));
+        let req = self.build_reqwest(reqwest::r#async::Client::new().get(url.clone()));
         let req = if let Some(t) = token {
             req.bearer_auth(t)
         } else {

src/v2/blobs.rs

@@ -1,7 +1,7 @@
+use crate::v2::*;
 use futures::Stream;
 use reqwest;
 use reqwest::StatusCode;
-use v2::*;
 
 /// Convenience alias for future binary blob.
 pub type FutureBlob = Box<dyn futures::Future<Item = Vec<u8>, Error = Error> + Send>;
@@ -23,7 +23,7 @@ impl Client {
         };
 
         let fres = self
-            .build_reqwest(reqwest::async::Client::new().head(url))
+            .build_reqwest(reqwest::r#async::Client::new().head(url))
             .send()
             .inspect(|res| trace!("Blob HEAD status: {:?}", res.status()))
             .and_then(|res| match res.status() {
@@ -41,16 +41,16 @@ impl Client {
         let fres_blob = {
             let ep = format!("{}/v2/{}/blobs/{}", self.base_url, name, digest);
             reqwest::Url::parse(&ep).map_err(|e|{
-                    ::errors::Error::from(format!(
+                    crate::errors::Error::from(format!(
                         "failed to parse url from string: {}",
                         e
                     ))
             })
             .map(|url|{
-                self.build_reqwest(reqwest::async::Client::new()
+                self.build_reqwest(reqwest::r#async::Client::new()
                     .get(url))
                     .send()
-                    .map_err(|e| ::errors::Error::from(format!("{}", e)))
+                    .map_err(|e| crate::errors::Error::from(format!("{}", e)))
             })
             .into_future()
             .flatten()
@@ -64,17 +64,17 @@ impl Client {
                 {
                     Ok(res)
                 } else {
-                    Err(::errors::Error::from(format!(
+                    Err(crate::errors::Error::from(format!(
                         "GET request failed with status '{}'",
                         status
                     )))
                 }
             }).and_then(|mut res| {
-                std::mem::replace(res.body_mut(), reqwest::async::Decoder::empty())
+                std::mem::replace(res.body_mut(), reqwest::r#async::Decoder::empty())
                     .concat2()
-                    .map_err(|e| ::errors::Error::from(format!("{}", e)))
+                    .map_err(|e| crate::errors::Error::from(format!("{}", e)))
                     .join(futures::future::ok(res))
-            }).map_err(|e| ::errors::Error::from(format!("{}", e)))
+            }).map_err(|e| crate::errors::Error::from(format!("{}", e)))
             .and_then(|(body, res)| {
                 let body_vec = body.to_vec();
                 let len = body_vec.len();

src/v2/catalog.rs

@@ -1,8 +1,8 @@
-use errors::{Error, Result};
+use crate::errors::{Error, Result};
+use crate::v2;
 use futures::{self, stream, Future, Stream};
 use reqwest::StatusCode;
 use serde_json;
-use v2;
 
 /// Convenience alias for a stream of `String` repos.
 pub type StreamCatalog = Box<dyn futures::Stream<Item = String, Error = Error>>;
@@ -32,7 +32,7 @@ impl v2::Client {
             }
         };
 
-        let req = self.build_reqwest(reqwest::async::Client::new().get(url));
+        let req = self.build_reqwest(reqwest::r#async::Client::new().get(url));
 
         let fres = req
             .send()

src/v2/config.rs

@@ -1,4 +1,4 @@
-use v2::*;
+use crate::v2::*;
 
 /// Configuration for a `Client`.
 #[derive(Debug)]
@@ -16,7 +16,7 @@ impl Config {
         Self {
             index: "registry-1.docker.io".into(),
             insecure_registry: false,
-            user_agent: Some(::USER_AGENT.to_owned()),
+            user_agent: Some(crate::USER_AGENT.to_owned()),
             username: None,
             password: None,
         }
@@ -54,7 +54,7 @@ impl Config {
 
     /// Read credentials from a JSON config file
     pub fn read_credentials<T: ::std::io::Read>(mut self, reader: T) -> Self {
-        if let Ok(creds) = ::get_credentials(reader, &self.index) {
+        if let Ok(creds) = crate::get_credentials(reader, &self.index) {
             self.username = creds.0;
             self.password = creds.1;
         };

src/v2/content_digest.rs

@@ -1,6 +1,6 @@
+use crate::v2::*;
 /// Implements types and methods for content verification
 use sha2::{self, Digest};
-use v2::*;
 
 /// ContentDigest stores a digest and its DigestAlgorithm
 #[derive(Clone, Debug, PartialEq)]

src/v2/manifest/manifest_schema1.rs

@@ -1,5 +1,5 @@
+use crate::v2::*;
 use std::collections::HashMap;
-use v2::*;
 
 /// Manifest version 2 schema 1, signed.
 ///

src/v2/manifest/manifest_schema2.rs

@@ -1,7 +1,7 @@
+use crate::v2::{Error, FutureResult};
 use futures::future::{self, Future};
 use futures::stream::Stream;
 use serde_json;
-use v2::{Error, FutureResult};
 
 /// Manifest version 2 schema 2.
 ///
@@ -114,7 +114,7 @@ impl ManifestSchema2Spec {
         };
 
         let manifest_future = client
-            .build_reqwest(reqwest::async::Client::new().get(url.clone()))
+            .build_reqwest(reqwest::r#async::Client::new().get(url.clone()))
             .send()
             .map_err(|e| crate::v2::Error::from(format!("{}", e)))
             .and_then(move |r| {

src/v2/manifest/mod.rs

@@ -1,6 +1,6 @@
 //! Manifest types.
-use mediatypes;
-use v2::*;
+use crate::mediatypes;
+use crate::v2::*;
 
 use futures::future::Either;
 use futures::{future, Stream};
@@ -78,7 +78,7 @@ impl Client {
 
         let fres = self
             .build_reqwest(
-                reqwest::async::Client::new()
+                reqwest::r#async::Client::new()
                     .get(url)
                     .headers(accept_headers),
             )
@@ -222,7 +222,7 @@ impl Client {
         }
 
         let fres = self
-            .build_reqwest(reqwest::async::Client::new().get(url.clone()))
+            .build_reqwest(reqwest::r#async::Client::new().get(url.clone()))
             .headers(accept_headers)
             .send()
             .map_err(Error::from)

src/v2/mod.rs

@@ -30,10 +30,10 @@
 //! ```
 
 use super::errors::*;
+use crate::v2::manifest::Manifest;
 use futures::prelude::*;
 use reqwest::StatusCode;
 use serde_json;
-use v2::manifest::Manifest;
 
 mod config;
 pub use self::config::Config;
@@ -107,7 +107,7 @@ impl Client {
             .chain_err(|| format!("failed to parse url string '{}'", &v2_endpoint))
             .map(|url| {
                 trace!("GET {:?}", url);
-                self.build_reqwest(reqwest::async::Client::new().get(url))
+                self.build_reqwest(reqwest::r#async::Client::new().get(url))
             })
             .into_future()
             .and_then(|req| req.send().from_err());
@@ -131,8 +131,8 @@ impl Client {
     /// Takes reqwest's async RequestBuilder and injects an authentication header if a token is present
     fn build_reqwest(
         &self,
-        req_builder: reqwest::async::RequestBuilder,
-    ) -> reqwest::async::RequestBuilder {
+        req_builder: reqwest::r#async::RequestBuilder,
+    ) -> reqwest::r#async::RequestBuilder {
         let mut builder = req_builder;
 
         if let Some(token) = &self.token {