Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-13 22:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Arg::required_unless_all => required_unless_eq_all

Browse source
This commit is contained in:
CreepySkeleton 2020-05-31 04:41:52 +03:00
parent b12102c832
commit ce3171ace5
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/build/arg/mod.rs
View file

@ -695,7 +695,7 @@ impl<'help> Arg<'help> {
/// ```rust
/// # use clap::Arg;
/// Arg::new("config")
/// .required_unless_all(&["cfg", "dbg"])
/// .required_unless_eq_all(&["cfg", "dbg"])
/// # ;
/// ```
///
@ -706,7 +706,7 @@ impl<'help> Arg<'help> {
/// # use clap::{App, Arg};
/// let res = App::new("prog")
/// .arg(Arg::new("cfg")
/// .required_unless_all(&["dbg", "infile"])
/// .required_unless_eq_all(&["dbg", "infile"])
/// .takes_value(true)
/// .long("config"))
/// .arg(Arg::new("dbg")
@ -721,14 +721,14 @@ impl<'help> Arg<'help> {
/// assert!(res.is_ok());
/// ```
///
/// Setting [`Arg::required_unless_all(names)`] and *not* supplying
/// Setting [`Arg::required_unless_eq_all(names)`] and *not* supplying
/// either *all* of `unless` args or the `self` arg is an error.
///
/// ```rust
/// # use clap::{App, Arg, ErrorKind};
/// let res = App::new("prog")
/// .arg(Arg::new("cfg")
/// .required_unless_all(&["dbg", "infile"])
/// .required_unless_eq_all(&["dbg", "infile"])
/// .takes_value(true)
/// .long("config"))
/// .arg(Arg::new("dbg")
@ -744,8 +744,8 @@ impl<'help> Arg<'help> {
/// assert_eq!(res.unwrap_err().kind, ErrorKind::MissingRequiredArgument);
/// ```
/// [`Arg::required_unless_eq_any`]: ./struct.Arg.html#method.required_unless_eq_any
/// [`Arg::required_unless_all(names)`]: ./struct.Arg.html#method.required_unless_all
pub fn required_unless_all(mut self, names: &[&str]) -> Self {
/// [`Arg::required_unless_eq_all(names)`]: ./struct.Arg.html#method.required_unless_eq_all
pub fn required_unless_eq_all(mut self, names: &[&str]) -> Self {
self.r_unless.extend(names.iter().map(Id::from));
self.setting(ArgSettings::RequiredUnlessAll)
}
@ -761,7 +761,7 @@ impl<'help> Arg<'help> {
/// ```rust
/// # use clap::Arg;
/// Arg::new("config")
/// .required_unless_all(&["cfg", "dbg"])
/// .required_unless_eq_all(&["cfg", "dbg"])
/// # ;
/// ```
///
@ -813,7 +813,7 @@ impl<'help> Arg<'help> {
/// ```
/// [required]: ./struct.Arg.html#method.required
/// [`Arg::required_unless_eq_any(names)`]: ./struct.Arg.html#method.required_unless_eq_any
/// [`Arg::required_unless_all`]: ./struct.Arg.html#method.required_unless_all
/// [`Arg::required_unless_eq_all`]: ./struct.Arg.html#method.required_unless_eq_all
pub fn required_unless_eq_any(mut self, names: &[&str]) -> Self {
self.r_unless.extend(names.iter().map(Id::from));
self
@ -4313,9 +4313,9 @@ impl<'help> From<&'help Yaml> for Arg<'help> {
"overrides_with" => yaml_vec_or_str!(v, a, overrides_with),
"possible_values" => yaml_vec_or_str!(v, a, possible_value),
"case_insensitive" => yaml_to_bool!(a, v, case_insensitive),
"required_unless_eq_any" => yaml_vec_or_str!(v, a, required_unless),
"required_unless_all" => {
a = yaml_vec_or_str!(v, a, required_unless_present);
"required_unless_eq_any" => yaml_vec_or_str!(v, a, required_unless_eq_any),
"required_unless_eq_all" => {
a = yaml_vec_or_str!(v, a, required_unless_eq_all);
a.set_mut(ArgSettings::RequiredUnlessAll);
a
}

6
tests/require.rs
View file

@ -252,11 +252,11 @@ fn required_unless_err() {
// REQUIRED_UNLESS_ALL
#[test]
fn required_unless_all() {
fn required_unless_eq_all() {
let res = App::new("unlessall")
.arg(
Arg::new("cfg")
.required_unless_all(&["dbg", "infile"])
.required_unless_eq_all(&["dbg", "infile"])
.takes_value(true)
.long("config"),
)
@ -276,7 +276,7 @@ fn required_unless_all_err() {
let res = App::new("unlessall")
.arg(
Arg::new("cfg")
.required_unless_all(&["dbg", "infile"])
.required_unless_eq_all(&["dbg", "infile"])
.takes_value(true)
.long("config"),
)