From 2ddc4eddda23c77b5891a11a3e7215702c63882b Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 18 Oct 2021 17:56:41 +0800 Subject: [PATCH] upgrade to clap 3 beta 5 (#222) --- Cargo.lock | 47 ++++++++++++++------------ cargo-smart-release/src/cli/main.rs | 2 +- cargo-smart-release/src/cli/options.rs | 9 ++--- src/plumbing/pretty/main.rs | 2 +- src/plumbing/pretty/options.rs | 14 ++------ src/porcelain/main.rs | 2 +- src/porcelain/options.rs | 20 +++++------ 7 files changed, 43 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index acd4164348d..1396dcc4a06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -348,7 +348,7 @@ dependencies = [ "bitflags", "cargo_metadata", "cargo_toml", - "clap 3.0.0-beta.4", + "clap 3.0.0-beta.5", "crates-index", "env_logger", "git-conventional", @@ -443,27 +443,27 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.0-beta.4" +version = "3.0.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406" +checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63" dependencies = [ "atty", "bitflags", "clap_derive", "indexmap", "lazy_static", - "os_str_bytes", + "os_str_bytes 4.2.0", "strsim", "termcolor", "textwrap 0.14.2", - "vec_map", + "unicase", ] [[package]] name = "clap_derive" -version = "3.0.0-beta.4" +version = "3.0.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac" +checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3" dependencies = [ "heck", "proc-macro-error", @@ -1233,7 +1233,7 @@ dependencies = [ "git-testtools", "git-validate", "nom", - "os_str_bytes", + "os_str_bytes 3.1.0", "quick-error", "serde", "tempfile", @@ -1373,7 +1373,7 @@ dependencies = [ "anyhow", "argh", "atty", - "clap 3.0.0-beta.4", + "clap 3.0.0-beta.5", "crosstermion", "env_logger", "futures-lite", @@ -1404,7 +1404,7 @@ dependencies = [ "git-url", "itertools", "jwalk", - "os_str_bytes", + "os_str_bytes 3.1.0", "quick-error", "rayon", "serde", @@ -1532,9 +1532,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "716d3d89f35ac6a34fd0eed635395f4c3b76fa889338a4632e5231a8684216bd" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", ] @@ -1599,9 +1599,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.103" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" +checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce" [[package]] name = "libgit2-sys" @@ -1737,9 +1737,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", @@ -1875,6 +1875,15 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d" +[[package]] +name = "os_str_bytes" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799" +dependencies = [ + "memchr", +] + [[package]] name = "output_vt100" version = "0.1.2" @@ -2728,12 +2737,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.3" diff --git a/cargo-smart-release/src/cli/main.rs b/cargo-smart-release/src/cli/main.rs index 86e9ddf269d..465a8583e2a 100644 --- 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 index 1633942431a..461face845e 100644 --- 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 index d4b0593b9aa..cea458f4541 100644 --- 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 index c176b81099f..9968fa0797a 100644 --- 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, }, - #[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: - #[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: 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, }, /// 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, }, /// 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 index d6799b1f0bd..71c85f970a2 100644 --- 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 index 3ccc44e6675..99f71771227 100644 --- 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,12 +42,12 @@ 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. /// @@ -56,7 +55,7 @@ pub enum ToolCommands { root: Option, }, /// 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))]