diff --git a/examples/git.rs b/examples/git.rs index 8d7108cad67..cfb6848f4ab 100644 --- a/examples/git.rs +++ b/examples/git.rs @@ -2,12 +2,13 @@ use std::path::PathBuf; -use clap::{arg, App, AppSettings}; +use clap::{arg, App}; fn main() { let matches = App::new("git") .about("A fictional versioning CLI") - .setting(AppSettings::SubcommandRequiredElseHelp) + .subcommand_required(true) + .arg_required_else_help(true) .allow_external_subcommands(true) .allow_invalid_utf8_for_external_subcommands(true) .subcommand( diff --git a/examples/pacman.rs b/examples/pacman.rs index 5b42f0d5b23..155e31d6cb2 100644 --- a/examples/pacman.rs +++ b/examples/pacman.rs @@ -1,10 +1,11 @@ -use clap::{App, AppSettings, Arg}; +use clap::{App, Arg}; fn main() { let matches = App::new("pacman") .about("package manager utility") .version("5.2.1") - .setting(AppSettings::SubcommandRequiredElseHelp) + .subcommand_required(true) + .arg_required_else_help(true) .author("Pacman Development Team") // Query subcommand // diff --git a/examples/tutorial_builder/03_04_subcommands.rs b/examples/tutorial_builder/03_04_subcommands.rs index 98d35ef7b3f..d5900824ae6 100644 --- a/examples/tutorial_builder/03_04_subcommands.rs +++ b/examples/tutorial_builder/03_04_subcommands.rs @@ -1,9 +1,10 @@ -use clap::{app_from_crate, arg, App, AppSettings}; +use clap::{app_from_crate, arg, App}; fn main() { let matches = app_from_crate!() .propagate_version(true) - .setting(AppSettings::SubcommandRequiredElseHelp) + .subcommand_required(true) + .arg_required_else_help(true) .subcommand( App::new("add") .about("Adds files to myapp") @@ -16,8 +17,6 @@ fn main() { "'myapp add' was used, name is: {:?}", sub_matches.value_of("NAME") ), - _ => unreachable!( - "Exhausted list of subcommands and SubcommandRequiredElseHelp prevents `None`" - ), + _ => unreachable!("Exhausted list of subcommands and subcommand_required prevents `None`"), } } diff --git a/examples/tutorial_builder/README.md b/examples/tutorial_builder/README.md index 0679f6ff946..b5ebc695de7 100644 --- a/examples/tutorial_builder/README.md +++ b/examples/tutorial_builder/README.md @@ -306,7 +306,7 @@ $ 03_04_subcommands add bob ``` -Because we set `AppSettings::SubcommandRequiredElseHelp`: +Because we set `App::arg_required_else_help`: ```console $ 03_04_subcommands ? failed