upgrade to clap 3 beta 5 (#222)

Byron · Byron · commit 2ddc4eddda23 · 2021-10-18T17:56:41.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-smart-release/src/cli/main.rs b/cargo-smart-release/src/cli/main.rs
@@ -1,5 +1,5 @@
 mod options;
-use clap::Clap;
+use clap::Parser;
 use options::{Args, SubCommands};
 
 use cargo_smart_release::command;
diff --git a/cargo-smart-release/src/cli/options.rs b/cargo-smart-release/src/cli/options.rs
@@ -1,8 +1,7 @@
-use clap::{AppSettings, Clap};
+use clap::AppSettings;
 
-#[derive(Clap)]
+#[derive(clap::Parser)]
 #[clap(setting = AppSettings::SubcommandRequired)]
-#[clap(setting = AppSettings::ColoredHelp)]
 #[clap(setting = AppSettings::DisableHelpSubcommand)]
 #[clap(setting = AppSettings::DisableVersionFlag)]
 #[clap(bin_name = "cargo")]
@@ -14,9 +13,8 @@ pub struct Args {
     pub subcommands: SubCommands,
 }
 
-#[derive(Clap)]
+#[derive(clap::Parser)]
 pub enum SubCommands {
-    #[clap(setting = AppSettings::ColoredHelp)]
     #[clap(name = "smart-release", version = clap::crate_version!())]
     /// Release workspace crates fearlessly.
     ///
@@ -162,7 +160,6 @@ pub enum SubCommands {
         #[clap(long, help_heading = Some("EXPERT"))]
         ignore_instability: bool,
     },
-    #[clap(setting = AppSettings::ColoredHelp)]
     #[clap(name = "changelog", version = clap::crate_version!())]
     /// Generate changelogs from commit histories, non-destructively.
     ///
diff --git a/src/plumbing/pretty/main.rs b/src/plumbing/pretty/main.rs
@@ -8,7 +8,7 @@ use std::{
 };
 
 use anyhow::Result;
-use clap::Clap;
+use clap::Parser;
 use gitoxide_core as core;
 use gitoxide_core::pack::verify;
 
diff --git a/src/plumbing/pretty/options.rs b/src/plumbing/pretty/options.rs
@@ -1,12 +1,11 @@
 use std::{ffi::OsString, path::PathBuf};
 
-use clap::{AppSettings, Clap};
+use clap::AppSettings;
 use gitoxide_core as core;
 
-#[derive(Debug, Clap)]
+#[derive(Debug, clap::Parser)]
 #[clap(name = "gix-plumbing", about = "The git underworld", version = clap::crate_version!())]
 #[clap(setting = AppSettings::SubcommandRequired)]
-#[clap(setting = AppSettings::ColoredHelp)]
 pub struct Args {
     #[clap(long, short = 't')]
     /// The amount of threads to use for some operations.
@@ -41,9 +40,8 @@ pub struct Args {
     pub cmd: Subcommands,
 }
 
-#[derive(Debug, Clap)]
+#[derive(Debug, clap::Parser)]
 pub enum Subcommands {
-    #[clap(setting = AppSettings::ColoredHelp)]
     #[clap(setting = AppSettings::DisableVersionFlag)]
     PackCreate {
         #[clap(long, short = 'r')]
@@ -103,7 +101,6 @@ pub enum Subcommands {
         /// Otherwise the expansion mode is 'tree-traversal' by default.
         tips: Vec<OsString>,
     },
-    #[clap(setting = AppSettings::ColoredHelp)]
     #[clap(setting = AppSettings::DisableVersionFlag)]
     #[cfg(any(feature = "gitoxide-core-async-client", feature = "gitoxide-core-blocking-client"))]
     PackReceive {
@@ -137,7 +134,6 @@ pub enum Subcommands {
     ///
     /// This is the plumbing equivalent of `git ls-remote`.
     /// Supported URLs are documented here: <https://www.git-scm.com/docs/git-clone#_git_urls>
-    #[clap(setting = AppSettings::ColoredHelp)]
     #[clap(setting = AppSettings::DisableVersionFlag)]
     #[cfg(any(feature = "gitoxide-core-async-client", feature = "gitoxide-core-blocking-client"))]
     RemoteRefList {
@@ -150,7 +146,6 @@ pub enum Subcommands {
         /// See here for a list of supported URLs: <https://www.git-scm.com/docs/git-clone#_git_urls>
         url: String,
     },
-    #[clap(setting = AppSettings::ColoredHelp)]
     #[clap(setting = AppSettings::DisableVersionFlag)]
     PackIndexFromData {
         /// Specify how to iterate the pack, defaults to 'verify'
@@ -181,7 +176,6 @@ pub enum Subcommands {
         directory: Option<PathBuf>,
     },
     /// Verify the integrity of a pack or index file
-    #[clap(setting = AppSettings::ColoredHelp)]
     #[clap(setting = AppSettings::DisableVersionFlag)]
     PackExplode {
         #[clap(long)]
@@ -220,7 +214,6 @@ pub enum Subcommands {
         object_path: Option<PathBuf>,
     },
     /// Verify the integrity of a pack or index file
-    #[clap(setting = AppSettings::ColoredHelp)]
     #[clap(setting = AppSettings::DisableVersionFlag)]
     PackVerify {
         /// output statistical information about the pack
@@ -256,7 +249,6 @@ pub enum Subcommands {
         path: PathBuf,
     },
     /// Verify the integrity of a commit graph
-    #[clap(setting = AppSettings::ColoredHelp)]
     #[clap(setting = AppSettings::DisableVersionFlag)]
     CommitGraphVerify {
         /// The path to '.git/objects/info/', '.git/objects/info/commit-graphs/', or '.git/objects/info/commit-graph' to validate.
diff --git a/src/porcelain/main.rs b/src/porcelain/main.rs
@@ -4,7 +4,7 @@ use std::sync::{
 };
 
 use anyhow::Result;
-use clap::Clap;
+use clap::Parser;
 use git_features::progress::DoOrDiscard;
 use gitoxide_core as core;
 
diff --git a/src/porcelain/options.rs b/src/porcelain/options.rs
@@ -1,11 +1,10 @@
 use std::{ffi::OsString, path::PathBuf};
 
-use clap::{AppSettings, Clap};
+use clap::AppSettings;
 
-#[derive(Debug, Clap)]
+#[derive(Debug, clap::Parser)]
 #[clap(about = "The rusty git", version = clap::crate_version!())]
 #[clap(setting = AppSettings::SubcommandRequired)]
-#[clap(setting = AppSettings::ColoredHelp)]
 pub struct Args {
     /// Do not display verbose messages and progress information
     #[clap(long, short = 'q')]
@@ -25,11 +24,11 @@ pub struct Args {
     pub cmd: Subcommands,
 }
 
-#[derive(Debug, Clap)]
+#[derive(Debug, clap::Parser)]
 pub enum Subcommands {
     /// Initialize the repository in the current directory.
     #[clap(visible_alias = "initialize")]
-    #[clap(setting = AppSettings::ColoredHelp, setting = AppSettings::DisableVersionFlag)]
+    #[clap(setting = AppSettings::DisableVersionFlag)]
     Init {
         /// The directory in which to initialize a new git repository.
         ///
@@ -43,20 +42,20 @@ pub enum Subcommands {
     Panic,
 }
 
-#[derive(Debug, Clap)]
-#[clap(setting = AppSettings::ColoredHelp, setting = AppSettings::DisableVersionFlag, setting = AppSettings::SubcommandRequired)]
+#[derive(Debug, clap::Parser)]
+#[clap(setting = AppSettings::DisableVersionFlag, setting = AppSettings::SubcommandRequired)]
 #[clap(visible_alias = "t")]
 pub enum ToolCommands {
     /// Find all repositories in a given directory.
-    #[clap(setting = AppSettings::ColoredHelp, setting = AppSettings::DisableVersionFlag)]
+    #[clap(setting = AppSettings::DisableVersionFlag)]
     Find {
         /// The directory in which to find all git repositories.
         ///
         /// Defaults to the current working directory.
         root: Option<PathBuf>,
     },
     /// Move all repositories found in a directory into a structure matching their clone URLs.
-    #[clap(setting = AppSettings::ColoredHelp, setting = AppSettings::DisableVersionFlag)]
+    #[clap(setting = AppSettings::DisableVersionFlag)]
     Organize {
         #[clap(long)]
         /// The operation will be in dry-run mode unless this flag is set.
@@ -77,14 +76,13 @@ pub enum ToolCommands {
     EstimateHours(EstimateHours),
 }
 
-#[derive(Debug, Clap)]
+#[derive(Debug, clap::Parser)]
 #[clap(
     about = "Estimate hours worked based on a commit history", 
     long_about = "See https://github.com/kimmobrunfeldt/git-hours#how-it-works for details",
     version = clap::crate_version!(),
     visible_alias = "h")
 ]
-#[clap(setting = clap::AppSettings::ColoredHelp)]
 pub struct EstimateHours {
     /// The directory containing a '.git/' folder.
     #[clap(parse(from_os_str))]
