fix(derive): Switch default actions/parsers for unstable-v4

clap_derive/src/attrs.rs

@@ -784,9 +784,18 @@ impl Attrs {
             .unwrap_or_else(|| {
                 if let Some(action) = self.action.as_ref() {
                     let inner_type = inner_type(field_type);
-                    default_value_parser(inner_type, action.span())
-                } else {
+                    let span = action.span();
+                    default_value_parser(inner_type, span)
+                } else if !self.ignore_parser() || cfg!(not(feature = "unstable-v4")) {
                     self.parser(field_type).value_parser()
+                } else {
+                    let inner_type = inner_type(field_type);
+                    let span = self
+                        .action
+                        .as_ref()
+                        .map(|a| a.span())
+                        .unwrap_or_else(|| self.kind.span());
+                    default_value_parser(inner_type, span)
                 }
             })
     }
@@ -797,13 +806,27 @@ impl Attrs {
             .map(|p| p.resolve(field_type))
             .unwrap_or_else(|| {
                 if let Some(value_parser) = self.value_parser.as_ref() {
-                    default_action(field_type, value_parser.span())
-                } else {
+                    let span = value_parser.span();
+                    default_action(field_type, span)
+                } else if !self.ignore_parser() || cfg!(not(feature = "unstable-v4")) {
                     self.parser(field_type).action()
+                } else {
+                    let span = self
+                        .value_parser
+                        .as_ref()
+                        .map(|a| a.span())
+                        .unwrap_or_else(|| self.kind.span());
+                    default_action(field_type, span)
                 }
             })
     }
 
+    #[cfg(feature = "unstable-v4")]
+    pub fn ignore_parser(&self) -> bool {
+        self.parser.is_none()
+    }
+
+    #[cfg(not(feature = "unstable-v4"))]
     pub fn ignore_parser(&self) -> bool {
         self.value_parser.is_some() || self.action.is_some()
     }

tests/derive/next/arguments.rs

@@ -19,7 +19,6 @@ use clap::Parser;
 fn required_argument() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(value_parser)]
         arg: i32,
     }
     assert_eq!(
@@ -34,7 +33,7 @@ fn required_argument() {
 fn argument_with_default() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(value_parser, default_value = "42")]
+        #[clap(default_value = "42")]
         arg: i32,
     }
     assert_eq!(
@@ -49,7 +48,6 @@ fn argument_with_default() {
 fn auto_value_name() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(value_parser)]
         my_special_arg: i32,
     }
 
@@ -69,7 +67,7 @@ fn auto_value_name() {
 fn explicit_value_name() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(value_parser, value_name = "BROWNIE_POINTS")]
+        #[clap(value_name = "BROWNIE_POINTS")]
         my_special_arg: i32,
     }
 
@@ -90,7 +88,6 @@ fn explicit_value_name() {
 fn option_type_is_optional() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(value_parser)]
         arg: Option<i32>,
     }
     assert_eq!(
@@ -105,7 +102,6 @@ fn option_type_is_optional() {
 fn vec_type_is_multiple_values() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(value_parser)]
         arg: Vec<i32>,
     }
     assert_eq!(

tests/derive/next/basic.rs

@@ -18,7 +18,7 @@ use clap::Parser;
 fn basic() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(short = 'a', long = "arg", value_parser)]
+        #[clap(short = 'a', long = "arg")]
         arg: i32,
     }
     assert_eq!(
@@ -31,7 +31,7 @@ fn basic() {
 fn update_basic() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(short = 'a', long = "arg", value_parser)]
+        #[clap(short = 'a', long = "arg")]
         single_value: i32,
     }
 

tests/derive/next/boxed.rs

@@ -16,7 +16,6 @@ enum Sub {
 
 #[derive(Args, PartialEq, Debug)]
 struct Ext {
-    #[clap(value_parser)]
     arg: u32,
 }
 

tests/derive/next/custom_string_parsers.rs

@@ -22,19 +22,19 @@ use std::path::PathBuf;
 
 #[derive(Parser, PartialEq, Debug)]
 struct PathOpt {
-    #[clap(short, long, value_parser)]
+    #[clap(short, long)]
     path: PathBuf,
 
-    #[clap(short, default_value = "../", value_parser)]
+    #[clap(short, default_value = "../")]
     default_path: PathBuf,
 
-    #[clap(short, value_parser, multiple_occurrences(true))]
+    #[clap(short, multiple_occurrences(true))]
     vector_path: Vec<PathBuf>,
 
-    #[clap(short, value_parser)]
+    #[clap(short)]
     option_path_1: Option<PathBuf>,
 
-    #[clap(short = 'q', value_parser)]
+    #[clap(short = 'q')]
     option_path_2: Option<PathBuf>,
 }
 
@@ -135,10 +135,10 @@ struct DefaultedOpt {
     #[clap(short, parse(from_str))]
     bytes: Bytes,
 
-    #[clap(short, value_parser)]
+    #[clap(short)]
     integer: u64,
 
-    #[clap(short, value_parser)]
+    #[clap(short)]
     path: PathBuf,
 }
 

tests/derive/next/default_value.rs

@@ -6,7 +6,7 @@ use crate::utils;
 fn default_value() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(value_parser, default_value = "3")]
+        #[clap(default_value = "3")]
         arg: i32,
     }
     assert_eq!(Opt { arg: 3 }, Opt::try_parse_from(&["test"]).unwrap());
@@ -20,7 +20,7 @@ fn default_value() {
 fn default_value_t() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(value_parser, default_value_t = 3)]
+        #[clap(default_value_t = 3)]
         arg: i32,
     }
     assert_eq!(Opt { arg: 3 }, Opt::try_parse_from(&["test"]).unwrap());
@@ -34,7 +34,7 @@ fn default_value_t() {
 fn auto_default_value_t() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(value_parser, default_value_t)]
+        #[clap(default_value_t)]
         arg: i32,
     }
     assert_eq!(Opt { arg: 0 }, Opt::try_parse_from(&["test"]).unwrap());
@@ -50,7 +50,7 @@ fn detect_os_variant() {
 
     #[derive(clap::Parser)]
     pub struct Options {
-        #[clap(value_parser, default_value_os = ("123".as_ref()))]
+        #[clap(default_value_os = ("123".as_ref()))]
         x: String,
     }
     Options::command().debug_assert();

tests/derive/next/doc_comments_help.rs

@@ -23,7 +23,7 @@ fn doc_comments() {
     struct LoremIpsum {
         /// Fooify a bar
         /// and a baz
-        #[clap(short, long, action)]
+        #[clap(short, long)]
         foo: bool,
     }
 
@@ -39,12 +39,7 @@ fn help_is_better_than_comments() {
     #[clap(name = "lorem-ipsum", about = "Dolor sit amet")]
     struct LoremIpsum {
         /// Fooify a bar
-        #[clap(
-            short,
-            long,
-            help = "DO NOT PASS A BAR UNDER ANY CIRCUMSTANCES",
-            action
-        )]
+        #[clap(short, long, help = "DO NOT PASS A BAR UNDER ANY CIRCUMSTANCES")]
         foo: bool,
     }
 
@@ -76,11 +71,11 @@ fn field_long_doc_comment_both_help_long_help() {
         /// Dot is removed from multiline comments.
         ///
         /// Long help
-        #[clap(long, action)]
+        #[clap(long)]
         foo: bool,
 
         /// Dot is removed from one short comment.
-        #[clap(long, action)]
+        #[clap(long)]
         bar: bool,
     }
 
@@ -111,7 +106,7 @@ fn top_long_doc_comment_both_help_long_help() {
         ///
         /// Or something else
         Foo {
-            #[clap(value_parser, help = "foo")]
+            #[clap(help = "foo")]
             bars: String,
         },
     }
@@ -146,7 +141,7 @@ fn verbatim_doc_comment() {
     #[derive(Parser, Debug)]
     #[clap(verbatim_doc_comment)]
     struct SeeFigure1 {
-        #[clap(long, action)]
+        #[clap(long)]
         foo: bool,
     }
 
@@ -176,10 +171,10 @@ fn verbatim_doc_comment_field() {
     #[derive(Parser, Debug)]
     struct Command {
         /// This help ends in a period.
-        #[clap(long, verbatim_doc_comment, action)]
+        #[clap(long, verbatim_doc_comment)]
         foo: bool,
         /// This help does not end in a period.
-        #[clap(long, action)]
+        #[clap(long)]
         bar: bool,
     }
 
@@ -196,7 +191,7 @@ fn multiline_separates_default() {
         /// Multiline
         ///
         /// Doc comment
-        #[clap(long, default_value = "x", value_parser)]
+        #[clap(long, default_value = "x")]
         x: String,
     }
 
@@ -234,10 +229,7 @@ fn doc_comment_about_handles_both_abouts() {
     /// Sub doc comment body
     #[derive(Parser, PartialEq, Eq, Debug)]
     pub enum Sub {
-        Compress {
-            #[clap(value_parser)]
-            output: String,
-        },
+        Compress { output: String },
     }
 
     let cmd = Opts::command();

tests/derive/next/explicit_name_no_renaming.rs

@@ -6,7 +6,7 @@ use clap::Parser;
 fn explicit_short_long_no_rename() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(short = '.', long = ".foo", value_parser)]
+        #[clap(short = '.', long = ".foo")]
         foo: String,
     }
 
@@ -27,7 +27,7 @@ fn explicit_short_long_no_rename() {
 fn explicit_name_no_rename() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(name = ".options", value_parser)]
+        #[clap(name = ".options")]
         foo: String,
     }
 

tests/derive/next/flags.rs

@@ -20,7 +20,7 @@ use clap::Parser;
 fn bool_type_is_flag() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(short, long, action)]
+        #[clap(short, long)]
         alice: bool,
     }
 
@@ -113,7 +113,7 @@ fn non_bool_type_flag() {
 fn mixed_type_flags() {
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(short, long, action)]
+        #[clap(short, long)]
         alice: bool,
         #[clap(short, long, action = clap::ArgAction::Count)]
         bob: u8,
@@ -181,7 +181,6 @@ fn ignore_qualified_bool_type() {
 
     #[derive(Parser, PartialEq, Debug)]
     struct Opt {
-        #[clap(action)]
         arg: inner::bool,
     }