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

fix: Remove references to number_of_values

Browse source
This commit is contained in:
Ed Page 2022-08-04 09:08:43 -05:00
parent 14c8f333cd
commit 29753b6798
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/builder/command.rs
View file

@ -2016,7 +2016,7 @@ impl<'help> Command<'help> {
///
/// The values of the trailing positional argument will contain all args from itself on.
///
/// **NOTE:** The final positional argument **must** have [`Arg::number_of_values(..)`].
/// **NOTE:** The final positional argument **must** have [`Arg::num_args(..)`].
///
/// # Examples
///
@ -2030,7 +2030,7 @@ impl<'help> Command<'help> {
/// let trail: Vec<_> = m.get_many::<String>("cmd").unwrap().collect();
/// assert_eq!(trail, ["arg1", "-r", "val1"]);
/// ```
/// [`Arg::number_of_values(true)`]: crate::Arg::number_of_values()
/// [`Arg::num_args(..)`]: crate::Arg::num_args()
pub fn trailing_var_arg(self, yes: bool) -> Self {
if yes {
self.setting(AppSettings::TrailingVarArg)

16
src/builder/debug_asserts.rs
View file

@ -131,7 +131,7 @@ pub(crate) fn assert_app(cmd: &Command) {
panic!(
"Command {}: Argument '{}' has the same index as '{}' \
and they are both positional arguments\n\n\t \
Use Arg::number_of_values(1..) to allow one \
Use `Arg::num_args(1..)` to allow one \
positional argument to take multiple values",
cmd.get_name(),
first.name,
@ -517,7 +517,7 @@ fn _verify_positionals(cmd: &Command) -> bool {
|| last.is_last_set();
assert!(
ok,
"When using a positional argument with .num_args(1..) that is *not the \
"When using a positional argument with `.num_args(1..)` that is *not the \
last* positional argument, the last positional argument (i.e. the one \
with the highest index) *must* have .required(true) or .last(true) set."
);
@ -527,7 +527,7 @@ fn _verify_positionals(cmd: &Command) -> bool {
assert!(
ok,
"Only the last positional argument, or second to last positional \
argument may be set to .num_args(1..)"
argument may be set to `.num_args(1..)`"
);
// Next we check how many have both Multiple and not a specific number of values set
@ -545,7 +545,7 @@ fn _verify_positionals(cmd: &Command) -> bool {
&& count == 2);
assert!(
ok,
"Only one positional argument with .num_args(1..) set is allowed per \
"Only one positional argument with `.num_args(1..)` set is allowed per \
command, unless the second one also has .last(true) set"
);
}
@ -697,7 +697,7 @@ fn assert_arg(arg: &Arg) {
let num_val_names = arg.get_value_names().unwrap_or(&[]).len();
if num_vals.max_values() < num_val_names {
panic!(
"Argument {}: Too many value names ({}) compared to number_of_values ({})",
"Argument {}: Too many value names ({}) compared to `num_args` ({})",
arg.name, num_val_names, num_vals
);
}
@ -706,14 +706,14 @@ fn assert_arg(arg: &Arg) {
assert_eq!(
num_vals.takes_values(),
arg.is_takes_value_set(),
"Argument {}: mismatch between `number_of_values` ({}) and `takes_value`",
"Argument {}: mismatch between `num_args` ({}) and `takes_value`",
arg.name,
num_vals,
);
assert_eq!(
num_vals.is_multiple(),
arg.is_multiple_values_set(),
"Argument {}: mismatch between `number_of_values` ({}) and `multiple_values`",
"Argument {}: mismatch between `num_args` ({}) and `multiple_values`",
arg.name,
num_vals,
);
@ -730,7 +730,7 @@ fn assert_arg(arg: &Arg) {
if arg.get_num_args() == Some(1.into()) {
assert!(
!arg.is_multiple_values_set(),
"Argument {}: mismatch between `number_of_values` and `multiple_values`",
"Argument {}: mismatch between `num_args` and `multiple_values`",
arg.name
);
}

2
tests/builder/help.rs
View file

@ -2533,7 +2533,7 @@ OPTIONS:
}
#[test]
#[should_panic = "Argument foo: Too many value names (2) compared to number_of_values (1)"]
#[should_panic = "Argument foo: Too many value names (2) compared to `num_args` (1)"]
fn too_many_value_names_panics() {
Command::new("test")
.arg(

6
tests/builder/multiple_values.rs
View file

@ -1087,7 +1087,7 @@ fn req_delimiter_complex() {
#[cfg(debug_assertions)]
#[test]
#[should_panic = "When using a positional argument with \
.num_args(1..) that is *not the last* positional argument, the last \
`.num_args(1..)` that is *not the last* positional argument, the last \
positional argument (i.e. the one with the highest index) *must* have \
.required(true) or .last(true) set."]
fn low_index_positional_not_required() {
@ -1106,7 +1106,7 @@ fn low_index_positional_not_required() {
// This tests a programmer error and will only succeed with debug_assertions
#[cfg(debug_assertions)]
#[test]
#[should_panic = "Only one positional argument with .num_args(1..) \
#[should_panic = "Only one positional argument with `.num_args(1..)` \
set is allowed per command, unless the second one also has .last(true) set"]
fn low_index_positional_last_multiple_too() {
let _ = Command::new("lip")
@ -1131,7 +1131,7 @@ fn low_index_positional_last_multiple_too() {
#[cfg(debug_assertions)]
#[test]
#[should_panic = "Only the last positional argument, or second to \
last positional argument may be set to .num_args(1..)"]
last positional argument may be set to `.num_args(1..)`"]
fn low_index_positional_too_far_back() {
let _ = Command::new("lip")
.arg(