Merge #292

292: Migrate to 2018 edition r=ordian a=DCjanus

There was function `get_with_timeout`, re-create a client each time this function is called, and "timeout" always 'default', I merged these two functions and reuse reqwest::Client to reuse TCP connection.

Other mirror change:

+ move to 2018 edition
+ work with rustfmt

Recommended review way: commit by commit.

Co-authored-by: DCjanus <[email protected]>

Cargo.toml

@@ -26,6 +26,7 @@ name = "cargo-edit"
 readme = "README.md"
 repository = "https://github.com/killercup/cargo-edit"
 version = "0.3.1"
+edition = "2018"
 
 [[bin]]
 name = "cargo-add"

src/bin/add/args.rs

@@ -5,7 +5,7 @@ use cargo_edit::{get_latest_dependency, CrateName};
 use semver;
 use std::path::PathBuf;
 
-use errors::*;
+use crate::errors::*;
 
 #[derive(Debug, Deserialize)]
 /// Docopts input args.
@@ -71,7 +71,8 @@ impl Args {
     /// Build dependencies from arguments
     pub fn parse_dependencies(&self) -> Result<Vec<Dependency>> {
         if !self.arg_crates.is_empty() {
-            return self.arg_crates
+            return self
+                .arg_crates
                 .iter()
                 .map(|crate_name| {
                     Ok(

src/bin/add/main.rs

@@ -11,24 +11,18 @@
     unused_qualifications
 )]
 
-extern crate atty;
-extern crate docopt;
 #[macro_use]
 extern crate error_chain;
-extern crate semver;
 #[macro_use]
 extern crate serde_derive;
-extern crate termcolor;
 
+use crate::args::Args;
+use cargo_edit::{Dependency, Manifest};
 use std::io::Write;
 use std::process;
 use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
 
-extern crate cargo_edit;
-use cargo_edit::{Dependency, Manifest};
-
 mod args;
-use args::Args;
 
 mod errors {
     error_chain! {
@@ -52,7 +46,7 @@ mod errors {
         }
     }
 }
-use errors::*;
+use crate::errors::*;
 
 static USAGE: &'static str = r#"
 Usage:

src/bin/rm/args.rs

@@ -1,6 +1,6 @@
 //! Handle `cargo rm` arguments
 
-use errors::*;
+use crate::errors::*;
 
 #[derive(Debug, Deserialize)]
 /// Docopts input args.

src/bin/rm/main.rs

@@ -11,23 +11,18 @@
     unused_qualifications
 )]
 
-extern crate atty;
-extern crate docopt;
 #[macro_use]
 extern crate error_chain;
 #[macro_use]
 extern crate serde_derive;
-extern crate termcolor;
 
+use crate::args::Args;
+use cargo_edit::Manifest;
 use std::io::Write;
 use std::process;
 use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
 
-extern crate cargo_edit;
-use cargo_edit::Manifest;
-
 mod args;
-use args::Args;
 
 mod errors {
     error_chain! {
@@ -39,7 +34,7 @@ mod errors {
         }
     }
 }
-use errors::*;
+use crate::errors::*;
 
 static USAGE: &'static str = r"
 Usage:

src/bin/upgrade/main.rs

@@ -1,38 +1,37 @@
 //! `cargo upgrade`
 #![warn(
-    missing_docs, missing_debug_implementations, missing_copy_implementations, trivial_casts,
-    trivial_numeric_casts, unsafe_code, unstable_features, unused_import_braces,
+    missing_docs,
+    missing_debug_implementations,
+    missing_copy_implementations,
+    trivial_casts,
+    trivial_numeric_casts,
+    unsafe_code,
+    unstable_features,
+    unused_import_braces,
     unused_qualifications
 )]
 
-extern crate cargo_metadata;
-extern crate docopt;
 #[macro_use]
 extern crate error_chain;
 #[macro_use]
 extern crate serde_derive;
-extern crate toml_edit;
 
+use crate::errors::*;
+use cargo_edit::{find, get_latest_dependency, CrateName, Dependency, LocalManifest};
 use std::collections::HashMap;
 use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::process;
-
-extern crate cargo_edit;
-use cargo_edit::{find, get_latest_dependency, CrateName, Dependency, LocalManifest};
-
-extern crate termcolor;
 use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
 
 mod errors {
-    error_chain!{
+    error_chain! {
         links {
             CargoEditLib(::cargo_edit::Error, ::cargo_edit::ErrorKind);
             CargoMetadata(::cargo_metadata::Error, ::cargo_metadata::ErrorKind);
         }
     }
 }
-use errors::*;
 
 static USAGE: &'static str = r"
 Upgrade dependencies as specified in the local manifest file (i.e. Cargo.toml).
@@ -119,8 +118,10 @@ impl Manifests {
             .find(|p| p.manifest_path == resolved_manifest_path)
             // If we have successfully got metadata, but our manifest path does not correspond to a
             // package, we must have been called against a virtual manifest.
-            .chain_err(|| "Found virtual manifest, but this command requires running against an \
-                           actual package in this workspace. Try adding `--all`.")?;
+            .chain_err(|| {
+                "Found virtual manifest, but this command requires running against an \
+                 actual package in this workspace. Try adding `--all`."
+            })?;
 
         Ok(Manifests(vec![(manifest, package.to_owned())]))
     }

src/crate_name.rs

@@ -1,9 +1,9 @@
 //! Crate name parsing.
 use semver;
 
-use errors::*;
-use Dependency;
-use {get_crate_name_from_github, get_crate_name_from_gitlab, get_crate_name_from_path};
+use crate::errors::*;
+use crate::Dependency;
+use crate::{get_crate_name_from_github, get_crate_name_from_gitlab, get_crate_name_from_path};
 
 /// A crate specifier. This can be a plain name (e.g. `docopt`), a name and a versionreq (e.g.
 /// `docopt@^0.8`), a URL, or a path.

src/errors.rs

@@ -1,4 +1,4 @@
-error_chain!{
+error_chain! {
     errors {
         /// Failed to fetch crate from crates.io
         FetchVersionFailure {

src/fetch.rs

@@ -1,3 +1,4 @@
+use crate::{Dependency, Manifest};
 use env_proxy;
 use regex::Regex;
 use reqwest;
@@ -7,9 +8,8 @@ use std::env;
 use std::io::Read;
 use std::path::Path;
 use std::time::Duration;
-use {Dependency, Manifest};
 
-use errors::*;
+use crate::errors::*;
 
 const REGISTRY_HOST: &str = "https://crates.io";
 
@@ -97,7 +97,8 @@ fn get_latest_stable_version_from_json() {
         }
       ]
     }"#,
-    ).expect("crate version is correctly parsed");
+    )
+    .expect("crate version is correctly parsed");
 
     assert_eq!(
         read_latest_version(&versions, false)
@@ -125,7 +126,8 @@ fn get_latest_unstable_or_stable_version_from_json() {
         }
       ]
     }"#,
-    ).expect("crate version is correctly parsed");
+    )
+    .expect("crate version is correctly parsed");
 
     assert_eq!(
         read_latest_version(&versions, true)
@@ -153,7 +155,8 @@ fn get_latest_version_from_json_test() {
         }
       ]
     }"#,
-    ).expect("crate version is correctly parsed");
+    )
+    .expect("crate version is correctly parsed");
 
     assert_eq!(
         read_latest_version(&versions, false)
@@ -181,7 +184,8 @@ fn get_no_latest_version_from_json_when_all_are_yanked() {
         }
       ]
     }"#,
-    ).expect("crate version is correctly parsed");
+    )
+    .expect("crate version is correctly parsed");
 
     assert!(read_latest_version(&versions, false).is_err());
 }

src/lib.rs

@@ -1,34 +1,33 @@
 //! Show and Edit Cargo's Manifest Files
 #![cfg_attr(test, allow(dead_code))]
 #![warn(
-    missing_docs, missing_debug_implementations, missing_copy_implementations, trivial_casts,
-    trivial_numeric_casts, unsafe_code, unstable_features, unused_import_braces,
+    missing_docs,
+    missing_debug_implementations,
+    missing_copy_implementations,
+    trivial_casts,
+    trivial_numeric_casts,
+    unsafe_code,
+    unstable_features,
+    unused_import_braces,
     unused_qualifications
 )]
 
-extern crate cargo_metadata;
-extern crate env_proxy;
 #[macro_use]
 extern crate error_chain;
-extern crate regex;
-extern crate reqwest;
-extern crate semver;
-extern crate serde;
 #[macro_use]
 extern crate serde_derive;
-extern crate serde_json;
-extern crate termcolor;
-extern crate toml_edit;
 
 mod crate_name;
 mod dependency;
 mod errors;
 mod fetch;
 mod manifest;
 
-pub use crate_name::CrateName;
-pub use dependency::Dependency;
-pub use errors::*;
-pub use fetch::{get_crate_name_from_github, get_crate_name_from_gitlab, get_crate_name_from_path,
-                get_latest_dependency};
-pub use manifest::{find, LocalManifest, Manifest};
+pub use crate::crate_name::CrateName;
+pub use crate::dependency::Dependency;
+pub use crate::errors::*;
+pub use crate::fetch::{
+    get_crate_name_from_github, get_crate_name_from_gitlab, get_crate_name_from_path,
+    get_latest_dependency,
+};
+pub use crate::manifest::{find, LocalManifest, Manifest};

src/manifest.rs

@@ -7,8 +7,8 @@ use std::{env, str};
 use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
 use toml_edit;
 
-use dependency::Dependency;
-use errors::*;
+use crate::dependency::Dependency;
+use crate::errors::*;
 
 const MANIFEST_FILENAME: &str = "Cargo.toml";
 
@@ -52,7 +52,8 @@ fn search(dir: &Path) -> Result<PathBuf> {
 }
 
 fn merge_inline_table(old_dep: &mut toml_edit::Item, new: &toml_edit::Item) {
-    for (k, v) in new.as_inline_table()
+    for (k, v) in new
+        .as_inline_table()
         .expect("expected an inline table")
         .iter()
     {
@@ -127,7 +128,8 @@ fn print_upgrade_if_necessary(
             &mut buffer,
             "{} v{} -> v{}",
             crate_name, old_version, new_version,
-        ).chain_err(|| "Failed to write upgrade versions")?;
+        )
+        .chain_err(|| "Failed to write upgrade versions")?;
         bufwtr
             .print(&buffer)
             .chain_err(|| "Failed to print upgrade message")?;
@@ -198,7 +200,8 @@ impl Manifest {
             }
 
             // ... and in `target.<target>.(build-/dev-)dependencies`.
-            let target_sections = self.data
+            let target_sections = self
+                .data
                 .as_table()
                 .get("target")
                 .and_then(toml_edit::Item::as_table_like)
@@ -294,8 +297,6 @@ impl Manifest {
     /// # Examples
     ///
     /// ```
-    /// # extern crate cargo_edit;
-    /// # extern crate toml_edit;
     /// # fn main() {
     ///     use cargo_edit::{Dependency, Manifest};
     ///     use toml_edit;
@@ -411,7 +412,7 @@ impl LocalManifest {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use dependency::Dependency;
+    use crate::dependency::Dependency;
     use toml_edit;
 
     #[test]
@@ -422,11 +423,9 @@ mod tests {
         let clone = manifest.clone();
         let dep = Dependency::new("cargo-edit").set_version("0.1.0");
         let _ = manifest.insert_into_table(&["dependencies".to_owned()], &dep);
-        assert!(
-            manifest
-                .remove_from_table("dependencies", &dep.name)
-                .is_ok()
-        );
+        assert!(manifest
+            .remove_from_table("dependencies", &dep.name)
+            .is_ok());
         assert_eq!(manifest.data.to_string(), clone.data.to_string());
     }
 
@@ -471,11 +470,9 @@ mod tests {
             data: toml_edit::Document::new(),
         };
         let dep = Dependency::new("cargo-edit").set_version("0.1.0");
-        assert!(
-            manifest
-                .remove_from_table("dependencies", &dep.name)
-                .is_err()
-        );
+        assert!(manifest
+            .remove_from_table("dependencies", &dep.name)
+            .is_err());
     }
 
     #[test]
@@ -486,10 +483,8 @@ mod tests {
         let dep = Dependency::new("cargo-edit").set_version("0.1.0");
         let other_dep = Dependency::new("other-dep").set_version("0.1.0");
         let _ = manifest.insert_into_table(&["dependencies".to_owned()], &other_dep);
-        assert!(
-            manifest
-                .remove_from_table("dependencies", &dep.name)
-                .is_err()
-        );
+        assert!(manifest
+            .remove_from_table("dependencies", &dep.name)
+            .is_err());
     }
 }