Merge commit 'd9ddce8a223cb9916389c039777b6966ea448dc8' into clippyup

3 files changed, 75 insertions, 93 deletions

diff --git a/clippy_dev/Cargo.toml b/clippy_dev/Cargo.toml
index 2cfbcea5034..b0d470a2124 100644
--- a/clippy_dev/Cargo.toml
+++ b/clippy_dev/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 aho-corasick = "0.7"
-clap = "2.33"
+clap = "3.1"
 indoc = "1.0"
 itertools = "0.10.1"
 opener = "0.5"
diff --git a/clippy_dev/src/main.rs b/clippy_dev/src/main.rs
index d5cd7ca96c0..ee535b1d3be 100644
--- a/clippy_dev/src/main.rs
+++ b/clippy_dev/src/main.rs
@@ -2,20 +2,20 @@
 // warn on lints, that are included in `rust-lang/rust`s bootstrap
 #![warn(rust_2018_idioms, unused_lifetimes)]
 
-use clap::{App, AppSettings, Arg, ArgMatches, SubCommand};
+use clap::{Arg, ArgMatches, Command};
 use clippy_dev::{bless, fmt, lint, new_lint, serve, setup, update_lints};
 use indoc::indoc;
 fn main() {
     let matches = get_clap_config();
 
     match matches.subcommand() {
-        ("bless", Some(matches)) => {
+        Some(("bless", matches)) => {
             bless::bless(matches.is_present("ignore-timestamp"));
         },
-        ("fmt", Some(matches)) => {
+        Some(("fmt", matches)) => {
             fmt::run(matches.is_present("check"), matches.is_present("verbose"));
         },
-        ("update_lints", Some(matches)) => {
+        Some(("update_lints", matches)) => {
             if matches.is_present("print-only") {
                 update_lints::print_lints();
             } else if matches.is_present("check") {
@@ -24,7 +24,7 @@ fn main() {
                 update_lints::update(update_lints::UpdateMode::Change);
             }
         },
-        ("new_lint", Some(matches)) => {
+        Some(("new_lint", matches)) => {
             match new_lint::create(
                 matches.value_of("pass"),
                 matches.value_of("name"),
@@ -35,8 +35,8 @@ fn main() {
                 Err(e) => eprintln!("Unable to create lint: {}", e),
             }
         },
-        ("setup", Some(sub_command)) => match sub_command.subcommand() {
-            ("intellij", Some(matches)) => {
+        Some(("setup", sub_command)) => match sub_command.subcommand() {
+            Some(("intellij", matches)) => {
                 if matches.is_present("remove") {
                     setup::intellij::remove_rustc_src();
                 } else {
@@ -47,14 +47,14 @@ fn main() {
                     );
                 }
             },
-            ("git-hook", Some(matches)) => {
+            Some(("git-hook", matches)) => {
                 if matches.is_present("remove") {
                     setup::git_hook::remove_hook();
                 } else {
                     setup::git_hook::install_hook(matches.is_present("force-override"));
                 }
             },
-            ("vscode-tasks", Some(matches)) => {
+            Some(("vscode-tasks", matches)) => {
                 if matches.is_present("remove") {
                     setup::vscode::remove_tasks();
                 } else {
@@ -63,23 +63,23 @@ fn main() {
             },
             _ => {},
         },
-        ("remove", Some(sub_command)) => match sub_command.subcommand() {
-            ("git-hook", Some(_)) => setup::git_hook::remove_hook(),
-            ("intellij", Some(_)) => setup::intellij::remove_rustc_src(),
-            ("vscode-tasks", Some(_)) => setup::vscode::remove_tasks(),
+        Some(("remove", sub_command)) => match sub_command.subcommand() {
+            Some(("git-hook", _)) => setup::git_hook::remove_hook(),
+            Some(("intellij", _)) => setup::intellij::remove_rustc_src(),
+            Some(("vscode-tasks", _)) => setup::vscode::remove_tasks(),
             _ => {},
         },
-        ("serve", Some(matches)) => {
+        Some(("serve", matches)) => {
             let port = matches.value_of("port").unwrap().parse().unwrap();
             let lint = matches.value_of("lint");
             serve::run(port, lint);
         },
-        ("lint", Some(matches)) => {
+        Some(("lint", matches)) => {
             let path = matches.value_of("path").unwrap();
             let args = matches.values_of("args").into_iter().flatten();
             lint::run(path, args);
         },
-        ("rename_lint", Some(matches)) => {
+        Some(("rename_lint", matches)) => {
             let old_name = matches.value_of("old_name").unwrap();
             let new_name = matches.value_of("new_name").unwrap_or(old_name);
             let uplift = matches.is_present("uplift");
@@ -89,35 +89,24 @@ fn main() {
     }
 }
 
-fn get_clap_config<'a>() -> ArgMatches<'a> {
-    App::new("Clippy developer tooling")
-        .setting(AppSettings::ArgRequiredElseHelp)
+fn get_clap_config() -> ArgMatches {
+    Command::new("Clippy developer tooling")
+        .arg_required_else_help(true)
         .subcommand(
-            SubCommand::with_name("bless")
-                .about("bless the test output changes")
-                .arg(
-                    Arg::with_name("ignore-timestamp")
-                        .long("ignore-timestamp")
-                        .help("Include files updated before clippy was built"),
-                ),
+            Command::new("bless").about("bless the test output changes").arg(
+                Arg::new("ignore-timestamp")
+                    .long("ignore-timestamp")
+                    .help("Include files updated before clippy was built"),
+            ),
         )
         .subcommand(
-            SubCommand::with_name("fmt")
+            Command::new("fmt")
                 .about("Run rustfmt on all projects and tests")
-                .arg(
-                    Arg::with_name("check")
-                        .long("check")
-                        .help("Use the rustfmt --check option"),
-                )
-                .arg(
-                    Arg::with_name("verbose")
-                        .short("v")
-                        .long("verbose")
-                        .help("Echo commands run"),
-                ),
+                .arg(Arg::new("check").long("check").help("Use the rustfmt --check option"))
+                .arg(Arg::new("verbose").short('v').long("verbose").help("Echo commands run")),
         )
         .subcommand(
-            SubCommand::with_name("update_lints")
+            Command::new("update_lints")
                 .about("Updates lint registration and information from the source code")
                 .long_about(
                     "Makes sure that:\n \
@@ -127,23 +116,23 @@ fn get_clap_config<'a>() -> ArgMatches<'a> {
                  * lint modules in `clippy_lints/*` are visible in `src/lib.rs` via `pub mod`\n \
                  * all lints are registered in the lint store",
                 )
-                .arg(Arg::with_name("print-only").long("print-only").help(
+                .arg(Arg::new("print-only").long("print-only").help(
                     "Print a table of lints to STDOUT. \
                  This does not include deprecated and internal lints. \
                  (Does not modify any files)",
                 ))
                 .arg(
-                    Arg::with_name("check")
+                    Arg::new("check")
                         .long("check")
                         .help("Checks that `cargo dev update_lints` has been run. Used on CI."),
                 ),
         )
         .subcommand(
-            SubCommand::with_name("new_lint")
+            Command::new("new_lint")
                 .about("Create new lint and run `cargo dev update_lints`")
                 .arg(
-                    Arg::with_name("pass")
-                        .short("p")
+                    Arg::new("pass")
+                        .short('p')
                         .long("pass")
                         .help("Specify whether the lint runs during the early or late pass")
                         .takes_value(true)
@@ -151,16 +140,16 @@ fn get_clap_config<'a>() -> ArgMatches<'a> {
                         .required(true),
                 )
                 .arg(
-                    Arg::with_name("name")
-                        .short("n")
+                    Arg::new("name")
+                        .short('n')
                         .long("name")
                         .help("Name of the new lint in snake case, ex: fn_too_long")
                         .takes_value(true)
                         .required(true),
                 )
                 .arg(
-                    Arg::with_name("category")
-                        .short("c")
+                    Arg::new("category")
+                        .short('c')
                         .long("category")
                         .help("What category the lint belongs to")
                         .default_value("nursery")
@@ -179,29 +168,25 @@ fn get_clap_config<'a>() -> ArgMatches<'a> {
                         ])
                         .takes_value(true),
                 )
-                .arg(
-                    Arg::with_name("msrv")
-                        .long("msrv")
-                        .help("Add MSRV config code to the lint"),
-                ),
+                .arg(Arg::new("msrv").long("msrv").help("Add MSRV config code to the lint")),
         )
         .subcommand(
-            SubCommand::with_name("setup")
+            Command::new("setup")
                 .about("Support for setting up your personal development environment")
-                .setting(AppSettings::ArgRequiredElseHelp)
+                .arg_required_else_help(true)
                 .subcommand(
-                    SubCommand::with_name("intellij")
+                    Command::new("intellij")
                         .about("Alter dependencies so Intellij Rust can find rustc internals")
                         .arg(
-                            Arg::with_name("remove")
+                            Arg::new("remove")
                                 .long("remove")
                                 .help("Remove the dependencies added with 'cargo dev setup intellij'")
                                 .required(false),
                         )
                         .arg(
-                            Arg::with_name("rustc-repo-path")
+                            Arg::new("rustc-repo-path")
                                 .long("repo-path")
-                                .short("r")
+                                .short('r')
                                 .help("The path to a rustc repo that will be used for setting the dependencies")
                                 .takes_value(true)
                                 .value_name("path")
@@ -210,66 +195,65 @@ fn get_clap_config<'a>() -> ArgMatches<'a> {
                         ),
                 )
                 .subcommand(
-                    SubCommand::with_name("git-hook")
+                    Command::new("git-hook")
                         .about("Add a pre-commit git hook that formats your code to make it look pretty")
                         .arg(
-                            Arg::with_name("remove")
+                            Arg::new("remove")
                                 .long("remove")
                                 .help("Remove the pre-commit hook added with 'cargo dev setup git-hook'")
                                 .required(false),
                         )
                         .arg(
-                            Arg::with_name("force-override")
+                            Arg::new("force-override")
                                 .long("force-override")
-                                .short("f")
+                                .short('f')
                                 .help("Forces the override of an existing git pre-commit hook")
                                 .required(false),
                         ),
                 )
                 .subcommand(
-                    SubCommand::with_name("vscode-tasks")
+                    Command::new("vscode-tasks")
                         .about("Add several tasks to vscode for formatting, validation and testing")
                         .arg(
-                            Arg::with_name("remove")
+                            Arg::new("remove")
                                 .long("remove")
                                 .help("Remove the tasks added with 'cargo dev setup vscode-tasks'")
                                 .required(false),
                         )
                         .arg(
-                            Arg::with_name("force-override")
+                            Arg::new("force-override")
                                 .long("force-override")
-                                .short("f")
+                                .short('f')
                                 .help("Forces the override of existing vscode tasks")
                                 .required(false),
                         ),
                 ),
         )
         .subcommand(
-            SubCommand::with_name("remove")
+            Command::new("remove")
                 .about("Support for undoing changes done by the setup command")
-                .setting(AppSettings::ArgRequiredElseHelp)
-                .subcommand(SubCommand::with_name("git-hook").about("Remove any existing pre-commit git hook"))
-                .subcommand(SubCommand::with_name("vscode-tasks").about("Remove any existing vscode tasks"))
+                .arg_required_else_help(true)
+                .subcommand(Command::new("git-hook").about("Remove any existing pre-commit git hook"))
+                .subcommand(Command::new("vscode-tasks").about("Remove any existing vscode tasks"))
                 .subcommand(
-                    SubCommand::with_name("intellij")
-                        .about("Removes rustc source paths added via `cargo dev setup intellij`"),
+                    Command::new("intellij").about("Removes rustc source paths added via `cargo dev setup intellij`"),
                 ),
         )
         .subcommand(
-            SubCommand::with_name("serve")
+            Command::new("serve")
                 .about("Launch a local 'ALL the Clippy Lints' website in a browser")
                 .arg(
-                    Arg::with_name("port")
+                    Arg::new("port")
                         .long("port")
-                        .short("p")
+                        .short('p')
                         .help("Local port for the http server")
                         .default_value("8000")
                         .validator_os(serve::validate_port),
                 )
-                .arg(Arg::with_name("lint").help("Which lint's page to load initially (optional)")),
+                .arg(Arg::new("lint").help("Which lint's page to load initially (optional)")),
         )
         .subcommand(
-            SubCommand::with_name("lint")
+            Command::new("lint")
                 .about("Manually run clippy on a file or package")
                 .after_help(indoc! {"
                     EXAMPLES
@@ -288,33 +272,33 @@ fn get_clap_config<'a>() -> ArgMatches<'a> {
                             cargo dev lint ~/my-project -- -- -W clippy::pedantic
                 "})
                 .arg(
-                    Arg::with_name("path")
+                    Arg::new("path")
                         .required(true)
                         .help("The path to a file or package directory to lint"),
                 )
                 .arg(
-                    Arg::with_name("args")
-                        .multiple(true)
+                    Arg::new("args")
+                        .multiple_occurrences(true)
                         .help("Pass extra arguments to cargo/clippy-driver"),
                 ),
         )
         .subcommand(
-            SubCommand::with_name("rename_lint")
+            Command::new("rename_lint")
                 .about("Renames the given lint")
                 .arg(
-                    Arg::with_name("old_name")
+                    Arg::new("old_name")
                         .index(1)
                         .required(true)
                         .help("The name of the lint to rename"),
                 )
                 .arg(
-                    Arg::with_name("new_name")
+                    Arg::new("new_name")
                         .index(2)
-                        .required_unless("uplift")
+                        .required_unless_present("uplift")
                         .help("The new name of the lint"),
                 )
                 .arg(
-                    Arg::with_name("uplift")
+                    Arg::new("uplift")
                         .long("uplift")
                         .help("This lint will be uplifted into rustc"),
                 ),
diff --git a/clippy_dev/src/serve.rs b/clippy_dev/src/serve.rs
index b36e2a28ee4..d55b1a354d0 100644
--- a/clippy_dev/src/serve.rs
+++ b/clippy_dev/src/serve.rs
@@ -1,4 +1,5 @@
-use std::ffi::{OsStr, OsString};
+use std::ffi::OsStr;
+use std::num::ParseIntError;
 use std::path::Path;
 use std::process::Command;
 use std::thread;
@@ -59,9 +60,6 @@ fn mtime(path: impl AsRef<Path>) -> SystemTime {
 }
 
 #[allow(clippy::missing_errors_doc)]
-pub fn validate_port(arg: &OsStr) -> Result<(), OsString> {
-    match arg.to_string_lossy().parse::<u16>() {
-        Ok(_port) => Ok(()),
-        Err(err) => Err(OsString::from(err.to_string())),
-    }
+pub fn validate_port(arg: &OsStr) -> Result<(), ParseIntError> {
+    arg.to_string_lossy().parse::<u16>().map(|_| ())
 }