build: upgrade clap 3.0.13 → 4.3.21

This is the final piece of resolving the [RustSec advisory associated with
`atty`](https://rustsec.org/advisories/RUSTSEC-2021-0145.html).

Author: ErichDonGubler

Cargo.lock

@@ -12,11 +12,12 @@ categories = ["command-line-utilities", "development-tools"]
 build = "build.rs"
 
 [build-dependencies]
-clap = { version = "3.0", features = ["derive"] }
-clap_complete = "3.0"
+clap = { version = "4", features = ["derive"] }
+clap_complete = "4"
 
 [dependencies]
-clap = { version = "3.0", features = ["derive"] }
+clap = { version = "4", features = ["derive"] }
+clap_complete = "4"
 is-terminal = "0.4.9"
 num_cpus = "1"
 rayon = "~1.4.0"

Cargo.toml

@@ -1,4 +1,4 @@
-use clap::{ArgEnum, IntoApp};
+use clap::{CommandFactory, ValueEnum};
 use clap_complete::Shell;
 
 use std::{env, fs, path};
@@ -21,7 +21,7 @@ fn main() {
     }
 
     // use clap to build completion files
-    let mut cli = cli::Cli::into_app();
+    let mut cli = cli::Cli::command();
     for &variant in Shell::value_variants() {
         clap_complete::generate_to(variant, &mut cli, "gitall", outdir.clone()).unwrap();
     }

build.rs

@@ -1,9 +1,10 @@
-use clap::{ArgEnum, Parser};
+use clap::builder::NonEmptyStringValueParser;
+use clap::{Parser, ValueEnum};
 
 use std::fmt;
 use std::path::PathBuf;
 
-#[derive(Clone, Copy, ArgEnum)]
+#[derive(Clone, Copy, ValueEnum)]
 pub enum ColorMode {
     Always,
     Auto,
@@ -31,7 +32,7 @@ pub struct Cli {
     pub follow_links: bool,
 
     /// Controls when to use color
-    #[clap(long, arg_enum, ignore_case = true, value_name = "WHEN", default_value_t = ColorMode::Auto)]
+    #[clap(long, value_enum, ignore_case = true, value_name = "WHEN", default_value_t = ColorMode::Auto)]
     pub color: ColorMode,
 
     /// The directory to start searching under
@@ -62,6 +63,6 @@ pub struct Cli {
     pub executable: String,
 
     /// A single git command to run in each repo
-    #[clap(required = true, forbid_empty_values = true)]
+    #[clap(required = true, value_parser = NonEmptyStringValueParser::new())]
     pub command: Vec<String>,
 }