fix: Deprecate most AppSettings

benches/03_complex.rs

@@ -1,4 +1,4 @@
-use clap::{arg, App, AppSettings, Arg};
+use clap::{arg, App, Arg};
 use criterion::{criterion_group, criterion_main, Criterion};
 
 static OPT3_VALS: [&str; 2] = ["fast", "slow"];
@@ -257,7 +257,7 @@ pub fn parse_args_negate_scs(c: &mut Criterion) {
     c.bench_function("parse_args_negate_scs", |b| {
         b.iter(|| {
             create_app!()
-                .setting(AppSettings::ArgsNegateSubcommands)
+                .args_conflicts_with_subcommands(true)
                 .get_matches_from(vec![
                     "myprog",
                     "arg1",

benches/06_rustup.rs

@@ -43,7 +43,7 @@ fn build_cli() -> App<'static> {
             App::new("install")
                 .about("Update Rust toolchains")
                 .after_help(TOOLCHAIN_INSTALL_HELP)
-                .setting(AppSettings::Hidden) // synonym for 'toolchain install'
+                .hide(true) // synonym for 'toolchain install'
                 .arg(Arg::new("toolchain").required(true)),
         )
         .subcommand(
@@ -89,17 +89,17 @@ fn build_cli() -> App<'static> {
                 )
                 .subcommand(
                     App::new("update")
-                        .setting(AppSettings::Hidden) // synonym for 'install'
+                        .hide(true) // synonym for 'install'
                         .arg(Arg::new("toolchain").required(true)),
                 )
                 .subcommand(
                     App::new("add")
-                        .setting(AppSettings::Hidden) // synonym for 'install'
+                        .hide(true) // synonym for 'install'
                         .arg(Arg::new("toolchain").required(true)),
                 )
                 .subcommand(
                     App::new("remove")
-                        .setting(AppSettings::Hidden) // synonym for 'uninstall'
+                        .hide(true) // synonym for 'uninstall'
                         .arg(Arg::new("toolchain").required(true)),
                 ),
         )
@@ -127,13 +127,13 @@ fn build_cli() -> App<'static> {
                 )
                 .subcommand(
                     App::new("install")
-                        .setting(AppSettings::Hidden) // synonym for 'add'
+                        .hide(true) // synonym for 'add'
                         .arg(Arg::new("target").required(true))
                         .arg(Arg::new("toolchain").long("toolchain").takes_value(true)),
                 )
                 .subcommand(
                     App::new("uninstall")
-                        .setting(AppSettings::Hidden) // synonym for 'remove'
+                        .hide(true) // synonym for 'remove'
                         .arg(Arg::new("target").required(true))
                         .arg(Arg::new("toolchain").long("toolchain").takes_value(true)),
                 ),
@@ -193,12 +193,12 @@ fn build_cli() -> App<'static> {
                 )
                 .subcommand(
                     App::new("add")
-                        .setting(AppSettings::Hidden) // synonym for 'set'
+                        .hide(true) // synonym for 'set'
                         .arg(Arg::new("toolchain").required(true)),
                 )
                 .subcommand(
                     App::new("remove")
-                        .setting(AppSettings::Hidden) // synonym for 'unset'
+                        .hide(true) // synonym for 'unset'
                         .about("Remove the override toolchain for a directory")
                         .arg(Arg::new("path").long("path").takes_value(true))
                         .arg(
@@ -212,7 +212,7 @@ fn build_cli() -> App<'static> {
             App::new("run")
                 .about("Run a command with an environment configured for a given toolchain")
                 .after_help(RUN_HELP)
-                .setting(AppSettings::TrailingVarArg)
+                .trailing_var_arg(true)
                 .arg(Arg::new("toolchain").required(true))
                 .arg(
                     Arg::new("command")
@@ -264,7 +264,7 @@ fn build_cli() -> App<'static> {
         .subcommand(
             App::new("telemetry")
                 .about("rustup telemetry commands")
-                .setting(AppSettings::Hidden)
+                .hide(true)
                 .setting(AppSettings::DeriveDisplayOrder)
                 .subcommand(App::new("enable").about("Enable rustup telemetry"))
                 .subcommand(App::new("disable").about("Disable rustup telemetry"))

clap_complete/examples/value_hints.rs

@@ -12,14 +12,14 @@
 //! . ./value_hints.fish
 //! ./target/debug/examples/value_hints --<TAB>
 //! ```
-use clap::{App, AppSettings, Arg, ValueHint};
+use clap::{App, Arg, ValueHint};
 use clap_complete::{generate, Generator, Shell};
 use std::io;
 
 fn build_cli() -> App<'static> {
     App::new("value_hints")
         // AppSettings::TrailingVarArg is required to use ValueHint::CommandWithArguments
-        .setting(AppSettings::TrailingVarArg)
+        .trailing_var_arg(true)
         .arg(
             Arg::new("generator")
                 .long("generate")

clap_complete/examples/value_hints_derive.rs

@@ -12,7 +12,7 @@
 //! . ./value_hints_derive.fish
 //! ./target/debug/examples/value_hints_derive --<TAB>
 //! ```
-use clap::{App, AppSettings, IntoApp, Parser, ValueHint};
+use clap::{App, IntoApp, Parser, ValueHint};
 use clap_complete::{generate, Generator, Shell};
 use std::ffi::OsString;
 use std::io;
@@ -21,8 +21,8 @@ use std::path::PathBuf;
 #[derive(Parser, Debug, PartialEq)]
 #[clap(
     name = "value_hints_derive",
-    // AppSettings::TrailingVarArg is required to use ValueHint::CommandWithArguments
-    setting = AppSettings::TrailingVarArg,
+    // App::trailing_var_ar is required to use ValueHint::CommandWithArguments
+    trailing_var_arg = true,
 )]
 struct Opt {
     /// If provided, outputs the completion file for given shell

clap_complete/tests/completions/bash.rs

@@ -7,7 +7,7 @@ fn build_app() -> App<'static> {
 fn build_app_with_name(s: &'static str) -> App<'static> {
     App::new(s)
         .version("3.0")
-        .setting(AppSettings::PropagateVersion)
+        .propagate_version(true)
         .about("Tests completions")
         .arg(
             Arg::new("file")

clap_complete/tests/completions/elvish.rs

@@ -7,7 +7,7 @@ fn build_app() -> App<'static> {
 fn build_app_with_name(s: &'static str) -> App<'static> {
     App::new(s)
         .version("3.0")
-        .setting(AppSettings::PropagateVersion)
+        .propagate_version(true)
         .about("Tests completions")
         .arg(
             Arg::new("file")

clap_complete/tests/completions/fish.rs

@@ -7,7 +7,7 @@ fn build_app() -> App<'static> {
 fn build_app_with_name(s: &'static str) -> App<'static> {
     App::new(s)
         .version("3.0")
-        .setting(AppSettings::PropagateVersion)
+        .propagate_version(true)
         .about("Tests completions")
         .arg(
             Arg::new("file")

clap_complete/tests/completions/mod.rs

@@ -1,4 +1,4 @@
-use clap::{App, AppSettings, Arg, ValueHint};
+use clap::{App, Arg, ValueHint};
 use clap_complete::{generate, shells::*, Generator};
 use std::fmt;
 

clap_complete/tests/completions/powershell.rs

@@ -7,7 +7,7 @@ fn build_app() -> App<'static> {
 fn build_app_with_name(s: &'static str) -> App<'static> {
     App::new(s)
         .version("3.0")
-        .setting(AppSettings::PropagateVersion)
+        .propagate_version(true)
         .about("Tests completions")
         .arg(
             Arg::new("file")

clap_complete/tests/completions/zsh.rs

@@ -7,7 +7,7 @@ fn build_app() -> App<'static> {
 fn build_app_with_name(s: &'static str) -> App<'static> {
     App::new(s)
         .version("3.0")
-        .setting(AppSettings::PropagateVersion)
+        .propagate_version(true)
         .about("Test test's completions")
         .arg(
             Arg::new("file")

clap_complete/tests/value_hints.rs

@@ -1,13 +1,13 @@
 mod completions;
 
-use clap::{App, AppSettings, Arg, ValueHint};
+use clap::{App, Arg, ValueHint};
 
 use clap_complete::shells::*;
 use completions::common;
 
 pub fn build_app_with_value_hints() -> App<'static> {
     App::new("my_app")
-        .setting(AppSettings::TrailingVarArg)
+        .trailing_var_arg(true)
         .arg(
             Arg::new("choice")
                 .long("choice")

clap_complete_fig/tests/completions/fig.rs

@@ -8,7 +8,7 @@ fn build_app() -> App<'static> {
 fn build_app_with_name(s: &'static str) -> App<'static> {
     App::new(s)
         .version("3.0")
-        .setting(AppSettings::PropagateVersion)
+        .propagate_version(true)
         .about("Tests completions")
         .arg(
             Arg::new("file")

clap_complete_fig/tests/completions/mod.rs

@@ -1,4 +1,4 @@
-use clap::{App, AppSettings, Arg, ValueHint};
+use clap::{App, Arg, ValueHint};
 use clap_complete::{generate, Generator};
 use std::fmt;
 

clap_complete_fig/tests/value_hints.rs

@@ -1,13 +1,13 @@
-use clap::{App, AppSettings, Arg, ValueHint};
+use clap::{App, Arg, ValueHint};
 use clap_complete_fig::Fig;
 use completions::common;
 
 mod completions;
 
 pub fn build_app_with_value_hints() -> App<'static> {
     App::new("my_app")
-        .setting(AppSettings::DisableVersionFlag)
-        .setting(AppSettings::TrailingVarArg)
+        .disable_version_flag(true)
+        .trailing_var_arg(true)
         .arg(
             Arg::new("choice")
                 .long("choice")

clap_derive/src/derives/subcommand.rs

@@ -165,11 +165,11 @@ fn gen_augment(
                         Some(subty) => {
                             if is_simple_ty(subty, "OsString") {
                                 quote_spanned! { kind.span()=>
-                                    let #app_var = #app_var.setting(clap::AppSettings::AllowExternalSubcommands).setting(clap::AppSettings::AllowInvalidUtf8ForExternalSubcommands);
+                                    let #app_var = #app_var.allow_external_subcommands(true).allow_invalid_utf8_for_external_subcommands(true);
                                 }
                             } else {
                                 quote_spanned! { kind.span()=>
-                                    let #app_var = #app_var.setting(clap::AppSettings::AllowExternalSubcommands);
+                                    let #app_var = #app_var.allow_external_subcommands(true);
                                 }
                             }
                         }

clap_mangen/src/lib.rs

@@ -264,6 +264,5 @@ fn app_has_arguments(app: &clap::App) -> bool {
 
 // Does the application have any subcommands?
 fn app_has_subcommands(app: &clap::App) -> bool {
-    app.get_subcommands()
-        .any(|i| !i.is_set(clap::AppSettings::Hidden))
+    app.get_subcommands().any(|i| !i.is_hide_set())
 }

clap_mangen/src/render.rs

@@ -144,10 +144,7 @@ pub(crate) fn options(roff: &mut Roff, app: &clap::App) {
 }
 
 pub(crate) fn subcommands(roff: &mut Roff, app: &clap::App, section: &str) {
-    for sub in app
-        .get_subcommands()
-        .filter(|s| !s.is_set(AppSettings::Hidden))
-    {
+    for sub in app.get_subcommands().filter(|s| !s.is_hide_set()) {
         roff.control("TP", []);
 
         let name = format!("{}-{}({})", app.get_name(), sub.get_name(), section);
@@ -179,10 +176,7 @@ pub(crate) fn after_help(roff: &mut Roff, app: &clap::App) {
 }
 
 fn subcommand_markers(cmd: &clap::App) -> (&'static str, &'static str) {
-    markers(
-        cmd.is_set(AppSettings::SubcommandRequired)
-            || cmd.is_set(AppSettings::SubcommandRequiredElseHelp),
-    )
+    markers(cmd.is_subcommand_required_set() || cmd.is_set(AppSettings::SubcommandRequiredElseHelp))
 }
 
 fn option_markers(opt: &clap::Arg) -> (&'static str, &'static str) {

examples/cargo-example.rs

@@ -3,7 +3,7 @@
 fn main() {
     let app = clap::App::new("cargo")
         .bin_name("cargo")
-        .setting(clap::AppSettings::SubcommandRequired)
+        .subcommand_required(true)
         .subcommand(
             clap::app_from_crate!().name("example").arg(
                 clap::arg!(--"manifest-path" <PATH>)

examples/git-derive.rs

@@ -3,7 +3,7 @@
 use std::ffi::OsString;
 use std::path::PathBuf;
 
-use clap::{AppSettings, Parser, Subcommand};
+use clap::{Parser, Subcommand};
 
 /// A fictional versioning CLI
 #[derive(Parser)]
@@ -17,19 +17,19 @@ struct Cli {
 #[derive(Subcommand)]
 enum Commands {
     /// Clones repos
-    #[clap(setting(AppSettings::ArgRequiredElseHelp))]
+    #[clap(arg_required_else_help = true)]
     Clone {
         /// The remote to clone
         remote: String,
     },
     /// pushes things
-    #[clap(setting(AppSettings::ArgRequiredElseHelp))]
+    #[clap(arg_required_else_help = true)]
     Push {
         /// The remote to target
         remote: String,
     },
     /// adds things
-    #[clap(setting(AppSettings::ArgRequiredElseHelp))]
+    #[clap(arg_required_else_help = true)]
     Add {
         /// Stuff to add
         #[clap(required = true, parse(from_os_str))]

examples/git.rs

@@ -8,24 +8,24 @@ fn main() {
     let matches = App::new("git")
         .about("A fictional versioning CLI")
         .setting(AppSettings::SubcommandRequiredElseHelp)
-        .setting(AppSettings::AllowExternalSubcommands)
-        .setting(AppSettings::AllowInvalidUtf8ForExternalSubcommands)
+        .allow_external_subcommands(true)
+        .allow_invalid_utf8_for_external_subcommands(true)
         .subcommand(
             App::new("clone")
                 .about("Clones repos")
                 .arg(arg!(<REMOTE> "The remote to clone"))
-                .setting(AppSettings::ArgRequiredElseHelp),
+                .arg_required_else_help(true),
         )
         .subcommand(
             App::new("push")
                 .about("pushes things")
                 .arg(arg!(<REMOTE> "The remote to target"))
-                .setting(AppSettings::ArgRequiredElseHelp),
+                .arg_required_else_help(true),
         )
         .subcommand(
             App::new("add")
                 .about("adds things")
-                .setting(AppSettings::ArgRequiredElseHelp)
+                .arg_required_else_help(true)
                 .arg(arg!(<PATH> ... "Stuff to add").allow_invalid_utf8(true)),
         )
         .get_matches();

examples/multicall-busybox.rs

@@ -2,7 +2,7 @@
 
 use std::process::exit;
 
-use clap::{App, AppSettings, Arg};
+use clap::{App, Arg};
 
 fn applet_commands() -> [App<'static>; 2] {
     [
@@ -13,10 +13,10 @@ fn applet_commands() -> [App<'static>; 2] {
 
 fn main() {
     let app = App::new(env!("CARGO_CRATE_NAME"))
-        .setting(AppSettings::Multicall)
+        .multicall(true)
         .subcommand(
             App::new("busybox")
-                .setting(AppSettings::ArgRequiredElseHelp)
+                .arg_required_else_help(true)
                 .subcommand_value_name("APPLET")
                 .subcommand_help_heading("APPLETS")
                 .arg(

examples/multicall-hostname.rs

@@ -1,16 +1,16 @@
 // Note: this requires the `unstable-multicall` feature
 
-use clap::{App, AppSettings};
+use clap::App;
 
 fn main() {
     let app = App::new(env!("CARGO_CRATE_NAME"))
-        .setting(AppSettings::ArgRequiredElseHelp)
+        .arg_required_else_help(true)
         .subcommand_value_name("APPLET")
         .subcommand_help_heading("APPLETS")
         .subcommand(App::new("hostname").about("show hostname part of FQDN"))
         .subcommand(App::new("dnsdomainname").about("show domain name part of FQDN"));
 
-    let app = app.setting(AppSettings::Multicall);
+    let app = app.multicall(true);
 
     match app.get_matches().subcommand_name() {
         Some("hostname") => println!("www"),