fix: Deprecate features redundant with Actions

clap_bench/benches/03_complex.rs

@@ -1,4 +1,4 @@
-use clap::{arg, Arg, Command};
+use clap::{arg, Arg, ArgAction, Command};
 use criterion::{criterion_group, criterion_main, Criterion};
 
 static OPT3_VALS: [&str; 2] = ["fast", "slow"];
@@ -59,7 +59,7 @@ pub fn build_from_builder(c: &mut Criterion) {
                         .long("option")
                         .takes_value(true)
                         .multiple_values(true)
-                        .multiple_occurrences(true),
+                        .action(ArgAction::Append),
                 )
                 .arg(Arg::new("positional").help("tests positionals").index(1))
                 .arg(
@@ -68,7 +68,7 @@ pub fn build_from_builder(c: &mut Criterion) {
                         .help("tests flags")
                         .long("flag")
                         .global(true)
-                        .multiple_occurrences(true),
+                        .action(ArgAction::Append),
                 )
                 .arg(
                     Arg::new("flag2")
@@ -102,7 +102,6 @@ pub fn build_from_builder(c: &mut Criterion) {
                     Arg::new("positional3")
                         .takes_value(true)
                         .multiple_values(true)
-                        .multiple_occurrences(true)
                         .help("tests positionals with specific values")
                         .index(4)
                         .value_parser(POS3_VALS),
@@ -118,7 +117,7 @@ pub fn build_from_builder(c: &mut Criterion) {
                         .long("multvalsmo")
                         .takes_value(true)
                         .multiple_values(true)
-                        .multiple_occurrences(true)
+                        .action(ArgAction::Append)
                         .help("Tests multiple values, not mult occs")
                         .value_names(&["one", "two"]),
                 )
@@ -127,7 +126,7 @@ pub fn build_from_builder(c: &mut Criterion) {
                         .long("minvals2")
                         .takes_value(true)
                         .multiple_values(true)
-                        .multiple_occurrences(true)
+                        .action(ArgAction::Append)
                         .help("Tests 2 min vals")
                         .min_values(2),
                 )
@@ -136,7 +135,7 @@ pub fn build_from_builder(c: &mut Criterion) {
                         .long("maxvals3")
                         .takes_value(true)
                         .multiple_values(true)
-                        .multiple_occurrences(true)
+                        .action(ArgAction::Append)
                         .help("Tests 3 max vals")
                         .max_values(3),
                 )
@@ -151,7 +150,7 @@ pub fn build_from_builder(c: &mut Criterion) {
                                 .long("option")
                                 .takes_value(true)
                                 .multiple_values(true)
-                                .multiple_occurrences(true)
+                                .action(ArgAction::Append)
                                 .help("tests options"),
                         )
                         .arg(Arg::new("scpositional").index(1).help("tests positionals")),

clap_bench/benches/04_new_help.rs

@@ -1,5 +1,5 @@
 use clap::Command;
-use clap::{arg, Arg};
+use clap::{arg, Arg, ArgAction};
 use criterion::{criterion_group, criterion_main, Criterion};
 use std::io::Cursor;
 
@@ -95,7 +95,7 @@ fn app_example5<'c>() -> Command<'c> {
             .help("turns up the awesome")
             .short('a')
             .long("awesome")
-            .multiple_occurrences(true),
+            .action(ArgAction::Count),
     )
 }
 
@@ -120,7 +120,7 @@ fn app_example7<'c>() -> Command<'c> {
                 .help("the input file to use")
                 .takes_value(true)
                 .multiple_values(true)
-                .multiple_occurrences(true)
+                .action(ArgAction::Append)
                 .required(true)
                 .short('i')
                 .long("input")
@@ -138,7 +138,7 @@ fn app_example8<'c>() -> Command<'c> {
                 .help("the input file to use")
                 .takes_value(true)
                 .multiple_values(true)
-                .multiple_occurrences(true)
+                .action(ArgAction::Append)
                 .required(true)
                 .short('i')
                 .long("input")

clap_bench/benches/05_ripgrep.rs

@@ -3,7 +3,7 @@
 //
 // CLI used is adapted from ripgrep 48a8a3a691220f9e5b2b08f4051abe8655ea7e8a
 
-use clap::{value_parser, Arg, Command};
+use clap::{value_parser, Arg, ArgAction, Command};
 use criterion::{criterion_group, criterion_main, Criterion};
 use std::collections::HashMap;
 use std::io::Cursor;
@@ -323,17 +323,12 @@ where
             "type-list",
             "version",
         ]))
-        .arg(
-            arg("path")
-                .takes_value(true)
-                .multiple_values(true)
-                .multiple_occurrences(true),
-        )
+        .arg(arg("path").takes_value(true).multiple_values(true))
         .arg(
             flag("regexp")
                 .short('e')
                 .allow_hyphen_values(true)
-                .multiple_occurrences(true)
+                .action(ArgAction::Append)
                 .takes_value(true)
                 .value_name("pattern"),
         )
@@ -357,14 +352,14 @@ where
         .arg(
             flag("colors")
                 .value_name("SPEC")
-                .multiple_occurrences(true)
+                .action(ArgAction::Append)
                 .takes_value(true),
         )
         .arg(flag("fixed-strings").short('F'))
         .arg(
             flag("glob")
                 .short('g')
-                .multiple_occurrences(true)
+                .action(ArgAction::Append)
                 .takes_value(true)
                 .value_name("GLOB"),
         )
@@ -375,18 +370,18 @@ where
         .arg(
             flag("type")
                 .short('t')
-                .multiple_occurrences(true)
+                .action(ArgAction::Append)
                 .takes_value(true)
                 .value_name("TYPE"),
         )
         .arg(
             flag("type-not")
                 .short('T')
-                .multiple_occurrences(true)
+                .action(ArgAction::Append)
                 .takes_value(true)
                 .value_name("TYPE"),
         )
-        .arg(flag("unrestricted").short('u').multiple_occurrences(true))
+        .arg(flag("unrestricted").short('u').action(ArgAction::Append))
         .arg(flag("invert-match").short('v'))
         .arg(flag("word-regexp").short('w'))
         // Third, set up less common flags.
@@ -415,7 +410,7 @@ where
             flag("file")
                 .short('f')
                 .value_name("FILE")
-                .multiple_occurrences(true),
+                .action(ArgAction::Append),
         )
         .arg(flag("files-with-matches").short('l'))
         .arg(flag("files-without-match"))
@@ -427,7 +422,7 @@ where
         .arg(
             flag("ignore-file")
                 .value_name("FILE")
-                .multiple_occurrences(true),
+                .action(ArgAction::Append),
         )
         .arg(flag("follow").short('L'))
         .arg(
@@ -464,12 +459,12 @@ where
         .arg(
             flag("type-add")
                 .value_name("TYPE")
-                .multiple_occurrences(true),
+                .action(ArgAction::Append),
         )
         .arg(
             flag("type-clear")
                 .value_name("TYPE")
-                .multiple_occurrences(true),
+                .action(ArgAction::Append),
         )
 }
 

clap_bench/benches/06_rustup.rs

@@ -218,8 +218,7 @@ fn build_cli() -> Command<'static> {
                     Arg::new("command")
                         .required(true)
                         .takes_value(true)
-                        .multiple_values(true)
-                        .multiple_occurrences(true),
+                        .multiple_values(true),
                 ),
         )
         .subcommand(

clap_complete/src/dynamic.rs

@@ -22,42 +22,44 @@ pub mod bash {
     #[derive(Clone, Debug)]
     pub struct CompleteArgs {
         /// Path to write completion-registration to
-        #[clap(long, required = true, parse(from_os_str))]
+        #[clap(long, required = true, value_parser)]
         register: Option<std::path::PathBuf>,
 
         #[clap(
             long,
             required = true,
             value_name = "COMP_CWORD",
             hide_short_help = true,
-            group = "complete"
+            group = "complete",
+            value_parser
         )]
         index: Option<usize>,
 
-        #[clap(long, hide_short_help = true, group = "complete")]
+        #[clap(long, hide_short_help = true, group = "complete", value_parser)]
         ifs: Option<String>,
 
         #[clap(
             long = "type",
             required = true,
-            arg_enum,
             hide_short_help = true,
-            group = "complete"
+            group = "complete",
+            value_parser
         )]
         comp_type: Option<CompType>,
 
-        #[clap(long, hide_short_help = true, group = "complete")]
+        #[clap(long, hide_short_help = true, group = "complete", action)]
         space: bool,
 
         #[clap(
             long,
             conflicts_with = "space",
             hide_short_help = true,
-            group = "complete"
+            group = "complete",
+            action
         )]
         no_space: bool,
 
-        #[clap(raw = true, hide_short_help = true, group = "complete")]
+        #[clap(raw = true, hide_short_help = true, group = "complete", value_parser)]
         comp_words: Vec<OsString>,
     }
 

clap_complete/src/shells/zsh.rs

@@ -451,6 +451,7 @@ fn write_opts_of(p: &Command, p_global: Option<&Command>) -> String {
         let help = o.get_help().map_or(String::new(), escape_help);
         let conflicts = arg_conflicts(p, o, p_global);
 
+        #[allow(deprecated)]
         let multiple = if o.is_multiple_occurrences_set() {
             "*"
         } else {
@@ -554,6 +555,7 @@ fn write_flags_of(p: &Command, p_global: Option<&Command>) -> String {
         let help = f.get_help().map_or(String::new(), escape_help);
         let conflicts = arg_conflicts(p, &f, p_global);
 
+        #[allow(deprecated)]
         let multiple = if f.is_multiple_occurrences_set() {
             "*"
         } else {
@@ -632,6 +634,7 @@ fn write_positionals_of(p: &Command) -> String {
     for arg in p.get_positionals() {
         debug!("write_positionals_of:iter: arg={}", arg.get_id());
 
+        #[allow(deprecated)]
         let cardinality = if arg.is_multiple_values_set() || arg.is_multiple_occurrences_set() {
             "*:"
         } else if !arg.is_required_set() {

clap_complete/tests/common.rs

@@ -6,7 +6,7 @@ pub fn basic_command(name: &'static str) -> clap::Command<'static> {
             clap::Command::new("test").about("Subcommand").arg(
                 clap::Arg::new("debug")
                     .short('d')
-                    .multiple_occurrences(true),
+                    .action(clap::ArgAction::Count),
             ),
         )
 }
@@ -23,7 +23,7 @@ pub fn feature_sample_command(name: &'static str) -> clap::Command<'static> {
         )
         .arg(
             clap::Arg::new("config")
-                .multiple_occurrences(true)
+                .action(clap::ArgAction::Count)
                 .help("some config file")
                 .short('c')
                 .visible_short_alias('C')
@@ -57,7 +57,7 @@ pub fn special_commands_command(name: &'static str) -> clap::Command<'static> {
                 .arg(
                     clap::Arg::new("path")
                         .takes_value(true)
-                        .multiple_occurrences(true),
+                        .multiple_values(true),
                 ),
         )
         .subcommand(clap::Command::new("some-cmd-with-hyphens").alias("hyphen"))

clap_complete_fig/src/fig.rs

@@ -216,6 +216,7 @@ fn gen_options(cmd: &Command, indent: usize) -> String {
                 buffer.push_str(&format!("{:indent$}],\n", "", indent = indent + 4));
             }
 
+            #[allow(deprecated)]
             if option.is_multiple_occurrences_set() {
                 buffer.push_str(&format!(
                     "{:indent$}isRepeatable: true,\n",
@@ -303,6 +304,7 @@ fn gen_options(cmd: &Command, indent: usize) -> String {
                 buffer.push_str(&format!("{:indent$}],\n", "", indent = indent + 4));
             }
 
+            #[allow(deprecated)]
             if flag.is_multiple_occurrences_set() {
                 buffer.push_str(&format!(
                     "{:indent$}isRepeatable: true,\n",

clap_complete_fig/tests/common.rs

@@ -6,7 +6,7 @@ pub fn basic_command(name: &'static str) -> clap::Command<'static> {
             clap::Command::new("test").about("Subcommand").arg(
                 clap::Arg::new("debug")
                     .short('d')
-                    .multiple_occurrences(true),
+                    .action(clap::ArgAction::Count),
             ),
         )
 }
@@ -23,7 +23,7 @@ pub fn feature_sample_command(name: &'static str) -> clap::Command<'static> {
         )
         .arg(
             clap::Arg::new("config")
-                .multiple_occurrences(true)
+                .action(clap::ArgAction::Count)
                 .help("some config file")
                 .short('c')
                 .visible_short_alias('C')
@@ -57,7 +57,7 @@ pub fn special_commands_command(name: &'static str) -> clap::Command<'static> {
                 .arg(
                     clap::Arg::new("path")
                         .takes_value(true)
-                        .multiple_occurrences(true),
+                        .multiple_values(true),
                 ),
         )
         .subcommand(clap::Command::new("some-cmd-with-hyphens").alias("hyphen"))

clap_complete_fig/tests/snapshots/special_commands.fig.js

@@ -49,6 +49,7 @@ const completion: Fig.Spec = {
       ],
       args: {
         name: "path",
+        isVariadic: true,
         isOptional: true,
       },
     },