Fix 2018 edition idioms

src/bin/cargo/cli.rs

@@ -1,4 +1,4 @@
-extern crate clap;
+use clap;
 
 use clap::{AppSettings, Arg, ArgMatches};
 
@@ -132,7 +132,7 @@ fn expand_aliases(
     Ok(args)
 }
 
-fn execute_subcommand(config: &mut Config, args: &ArgMatches) -> CliResult {
+fn execute_subcommand(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let (cmd, subcommand_args) = match args.subcommand() {
         (cmd, Some(args)) => (cmd, args),
         _ => {

src/bin/cargo/commands/bench.rs

@@ -70,7 +70,7 @@ Compilation can be customized with the `bench` profile in the manifest.
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     let mut compile_opts = args.compile_options(config, CompileMode::Bench)?;
     compile_opts.build_config.release = true;

src/bin/cargo/commands/build.rs

@@ -46,7 +46,7 @@ the --release flag will use the `release` profile instead.
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     let mut compile_opts = args.compile_options(config, CompileMode::Build)?;
     compile_opts.export_dir = args.value_of_path("out-dir", config);

src/bin/cargo/commands/check.rs

@@ -53,7 +53,7 @@ The `--profile test` flag can be used to check unit tests with the
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     let test = match args.value_of("profile") {
         Some("test") => true,

src/bin/cargo/commands/clean.rs

@@ -21,7 +21,7 @@ and its format, see the `cargo help pkgid` command.
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     let opts = CleanOptions {
         config,

src/bin/cargo/commands/doc.rs

@@ -45,7 +45,7 @@ the `cargo help pkgid` command.
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     let mode = CompileMode::Doc {
         deps: !args.is_present("no-deps"),

src/bin/cargo/commands/fetch.rs

@@ -22,7 +22,7 @@ all updated.
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
 
     let opts = FetchOptions {

src/bin/cargo/commands/fix.rs

@@ -104,7 +104,7 @@ https://github.com/rust-lang/cargo
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     let test = match args.value_of("profile") {
         Some("test") => true,

src/bin/cargo/commands/generate_lockfile.rs

@@ -8,7 +8,7 @@ pub fn cli() -> App {
         .arg_manifest_path()
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     ops::generate_lockfile(&ws)?;
     Ok(())

src/bin/cargo/commands/git_checkout.rs

@@ -21,7 +21,7 @@ pub fn cli() -> App {
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let url = args.value_of("url").unwrap().to_url()?;
     let reference = args.value_of("reference").unwrap();
 

src/bin/cargo/commands/init.rs

@@ -10,7 +10,7 @@ pub fn cli() -> App {
         .arg_new_opts()
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let opts = args.new_options(config)?;
     ops::init(&opts, config)?;
     config

src/bin/cargo/commands/install.rs

@@ -74,7 +74,7 @@ continuous integration systems.",
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let registry = args.registry(config)?;
 
     config.reload_rooted_at_cargo_home()?;

src/bin/cargo/commands/locate_project.rs

@@ -13,7 +13,7 @@ pub struct ProjectLocation<'a> {
     root: &'a str,
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let root = args.root_manifest(config)?;
 
     let root = root.to_str()

src/bin/cargo/commands/login.rs

@@ -18,7 +18,7 @@ pub fn cli() -> App {
         .arg(opt("registry", "Registry to use").value_name("REGISTRY"))
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let registry = args.registry(config)?;
 
     let token = match args.value_of("token") {

src/bin/cargo/commands/metadata.rs

@@ -24,7 +24,7 @@ pub fn cli() -> App {
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
 
     let version = match args.value_of("format-version") {

src/bin/cargo/commands/mod.rs

@@ -35,7 +35,7 @@ pub fn builtin() -> Vec<App> {
     ]
 }
 
- pub fn builtin_exec(cmd: &str) -> Option<fn(&mut Config, &ArgMatches) -> CliResult> {
+ pub fn builtin_exec(cmd: &str) -> Option<fn(&mut Config, &ArgMatches<'_>) -> CliResult> {
      let f = match cmd {
         "bench" => bench::exec,
         "build" => build::exec,

src/bin/cargo/commands/new.rs

@@ -10,7 +10,7 @@ pub fn cli() -> App {
         .arg_new_opts()
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let opts = args.new_options(config)?;
 
     ops::new(&opts, config)?;

src/bin/cargo/commands/owner.rs

@@ -28,7 +28,7 @@ Explicitly named owners can also modify the set of owners, so take care!
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let registry = args.registry(config)?;
     let opts = OwnersOptions {
         krate: args.value_of("crate").map(|s| s.to_string()),

src/bin/cargo/commands/package.rs

@@ -29,7 +29,7 @@ pub fn cli() -> App {
         .arg_jobs()
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     ops::package(
         &ws,

src/bin/cargo/commands/pkgid.rs

@@ -32,7 +32,7 @@ Example Package IDs
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     let spec = args.value_of("spec").or_else(|| args.value_of("package"));
     let spec = ops::pkgid(&ws, spec)?;

src/bin/cargo/commands/publish.rs

@@ -23,7 +23,7 @@ pub fn cli() -> App {
         .arg(opt("registry", "Registry to publish to").value_name("REGISTRY"))
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let registry = args.registry(config)?;
     let ws = args.workspace(config)?;
     let index = args.index(config)?;

src/bin/cargo/commands/read_manifest.rs

@@ -14,7 +14,7 @@ Deprecated, use `cargo metadata --no-deps` instead.\
         .arg_manifest_path()
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     print_json(&ws.current()?);
     Ok(())

src/bin/cargo/commands/run.rs

@@ -36,7 +36,7 @@ run. If you're passing arguments to both Cargo and the binary, the ones after
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
 
     let mut compile_opts = args.compile_options(config, CompileMode::Build)?;

src/bin/cargo/commands/rustc.rs

@@ -46,7 +46,7 @@ processes spawned by Cargo, use the $RUSTFLAGS environment variable or the
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     let mode = match args.value_of("profile") {
         Some("dev") | None => CompileMode::Build,

src/bin/cargo/commands/rustdoc.rs

@@ -48,7 +48,7 @@ the `cargo help pkgid` command.
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
     let mut compile_opts =
         args.compile_options_for_single_package(config, CompileMode::Doc { deps: false })?;

src/bin/cargo/commands/search.rs

@@ -18,7 +18,7 @@ pub fn cli() -> App {
         .arg(opt("registry", "Registry to use").value_name("REGISTRY"))
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let registry = args.registry(config)?;
     let index = args.index(config)?;
     let limit = args.value_of_u32("limit")?;

src/bin/cargo/commands/test.rs

@@ -89,7 +89,7 @@ To get the list of all options available for the test binaries use this:
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
 
     let mut compile_opts = args.compile_options(config, CompileMode::Test)?;

src/bin/cargo/commands/uninstall.rs

@@ -19,7 +19,7 @@ only uninstall particular binaries.
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let root = args.value_of("root");
     let specs = args
         .values_of("spec")

src/bin/cargo/commands/update.rs

@@ -37,7 +37,7 @@ For more information about package id specifications, see `cargo help pkgid`.
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
 
     let update_opts = UpdateOptions {

src/bin/cargo/commands/verify_project.rs

@@ -11,7 +11,7 @@ pub fn cli() -> App {
         .arg_manifest_path()
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     fn fail(reason: &str, value: &str) -> ! {
         let mut h = HashMap::new();
         h.insert(reason.to_string(), value.to_string());

src/bin/cargo/commands/version.rs

@@ -6,7 +6,7 @@ pub fn cli() -> App {
     subcommand("version").about("Show version information")
 }
 
-pub fn exec(_config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(_config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let verbose = args.occurrences_of("verbose") > 0;
     let version = cli::get_version_string(verbose);
     print!("{}", version);

src/bin/cargo/commands/yank.rs

@@ -27,7 +27,7 @@ crates to be locked to any yanked version.
         )
 }
 
-pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let registry = args.registry(config)?;
 
     ops::yank(

src/bin/cargo/main.rs

@@ -1,20 +1,20 @@
 #![cfg_attr(feature = "cargo-clippy", allow(clippy::too_many_arguments))] // large project
 #![cfg_attr(feature = "cargo-clippy", allow(clippy::redundant_closure))]  // there's a false positive
 
-extern crate cargo;
+use cargo;
-extern crate clap;
+
 #[cfg(feature = "pretty-env-logger")]
 extern crate pretty_env_logger;
 #[cfg(not(feature = "pretty-env-logger"))]
 extern crate env_logger;
 #[macro_use]
 extern crate failure;
-extern crate git2_curl;
+use git2_curl;
-extern crate log;
+
 #[macro_use]
 extern crate serde_derive;
-extern crate serde_json;
+
-extern crate toml;
+
 
 use std::collections::BTreeSet;
 use std::env;

src/crates-io/lib.rs

@@ -1,13 +1,13 @@
 #![allow(unknown_lints)]
 #![cfg_attr(feature = "cargo-clippy", allow(identity_op))] // used for vertical alignment
 
-extern crate curl;
+
 #[macro_use]
 extern crate failure;
 #[macro_use]
 extern crate serde_derive;
-extern crate serde_json;
+use serde_json;
-extern crate url;
+
 
 use std::collections::BTreeMap;
 use std::fs::File;
@@ -302,7 +302,7 @@ impl Registry {
     }
 }
 
-fn handle(handle: &mut Easy, read: &mut FnMut(&mut [u8]) -> usize) -> Result<String> {
+fn handle(handle: &mut Easy, read: &mut dyn FnMut(&mut [u8]) -> usize) -> Result<String> {
     let mut headers = Vec::new();
     let mut body = Vec::new();
     {

tests/testsuite/build_auth.rs

@@ -15,7 +15,7 @@ fn http_auth_offered() {
     let server = TcpListener::bind("127.0.0.1:0").unwrap();
     let addr = server.local_addr().unwrap();
 
-    fn headers(rdr: &mut BufRead) -> HashSet<String> {
+    fn headers(rdr: &mut dyn BufRead) -> HashSet<String> {
         let valid = ["GET", "Authorization", "Accept"];
         rdr.lines()
             .map(|s| s.unwrap())

tests/testsuite/cargo_command.rs

@@ -18,7 +18,7 @@ enum FakeKind<'a> {
 
 /// Add an empty file with executable flags (and platform-dependent suffix).
 /// TODO: move this to `Project` if other cases using this emerge.
-fn fake_file(proj: Project, dir: &Path, name: &str, kind: &FakeKind) -> Project {
+fn fake_file(proj: Project, dir: &Path, name: &str, kind: &FakeKind<'_>) -> Project {
     let path = proj
         .root()
         .join(dir)

tests/testsuite/main.rs

@@ -2,25 +2,25 @@
 #![cfg_attr(feature = "cargo-clippy", allow(blacklisted_name))]
 #![cfg_attr(feature = "cargo-clippy", allow(explicit_iter_loop))]
 
-extern crate bufstream;
+
-extern crate cargo;
+use cargo;
-extern crate filetime;
+use filetime;
-extern crate flate2;
+
-extern crate git2;
+use git2;
-extern crate glob;
+
-extern crate hex;
+use hex;
 #[macro_use]
 extern crate lazy_static;
-extern crate libc;
+use libc;
 #[macro_use]
 extern crate proptest;
 #[macro_use]
 extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;
-extern crate tar;
+
-extern crate toml;
+use toml;
-extern crate url;
+
 #[cfg(windows)]
 extern crate winapi;
 

tests/testsuite/support/mod.rs

@@ -1301,7 +1301,7 @@ fn zip_all<T, I1: Iterator<Item = T>, I2: Iterator<Item = T>>(a: I1, b: I2) -> Z
 }
 
 impl fmt::Debug for Execs {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "execs")
     }
 }

tests/testsuite/support/resolver.rs

@@ -76,7 +76,7 @@ pub fn resolve_with_config_raw(
         fn query(
             &mut self,
             dep: &Dependency,
-            f: &mut FnMut(Summary),
+            f: &mut dyn FnMut(Summary),
             fuzzy: bool,
         ) -> CargoResult<()> {
             for summary in self.0.iter() {
@@ -273,7 +273,7 @@ pub fn loc_names(names: &[(&'static str, &'static str)]) -> Vec<PackageId> {
 pub struct PrettyPrintRegistry(pub Vec<Summary>);
 
 impl fmt::Debug for PrettyPrintRegistry {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "vec![")?;
         for s in &self.0 {
             if s.dependencies().is_empty() {
@@ -518,7 +518,7 @@ fn meta_test_multiple_versions_strategy() {
             .current();
         let reg = registry(input.clone());
         for this in input.iter().rev().take(10) {
-            let mut res = resolve(
+            let res = resolve(
                 &pkg_id("root"),
                 vec![dep_req(&this.name(), &format!("={}", this.version()))],
                 &reg,