Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2025-01-18 23:53:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: removes legacy panics and fixes grammar

Browse source
This commit is contained in:
Kevin K 2015-10-01 00:05:41 -04:00
parent 1ac7e99491
commit 958ebb8629
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/args/argbuilder/option.rs
View file

@ -55,8 +55,8 @@ impl<'n> OptBuilder<'n> {
pub fn from_arg(a: &Arg<'n, 'n, 'n, 'n, 'n,'n>,
reqs: &mut Vec<&'n str>) -> Self {
if a.short.is_none() && a.long.is_none() {
panic!("Argument \"{}\" has take_value(true), yet neither a short() or long() \
were supplied", a.name);
panic!("Argument \"{}\" has takes_value(true), yet neither a short() or long() \
was supplied", a.name);
}
// No need to check for .index() as that is handled above
let mut ob = OptBuilder {
@ -93,14 +93,6 @@ impl<'n> OptBuilder<'n> {
if let Some(ref vec) = ob.val_names {
ob.num_vals = Some(vec.len() as u8);
}
if ob.min_vals.is_some() && !a.multiple {
panic!("Argument \"{}\" does not allow multiple values, yet it is expecting {} \
values", ob.name, ob.num_vals.unwrap());
}
if ob.max_vals.is_some() && !a.multiple {
panic!("Argument \"{}\" does not allow multiple values, yet it is expecting {} \
values", ob.name, ob.num_vals.unwrap());
}
// Check if there is anything in the blacklist (mutually excludes list) and add any
// values
if let Some(ref bl) = a.blacklist {

8
src/args/argbuilder/positional.rs
View file

@ -93,14 +93,6 @@ impl<'n> PosBuilder<'n> {
if a.hidden {
pb.settings.set(&ArgSettings::Hidden);
}
if pb.min_vals.is_some() && !a.multiple {
panic!("Argument \"{}\" does not allow multiple values, yet it is expecting {} \
values", pb.name, pb.num_vals.unwrap());
}
if pb.max_vals.is_some() && !a.multiple {
panic!("Argument \"{}\" does not allow multiple values, yet it is expecting {} \
values", pb.name, pb.num_vals.unwrap());
}
// Check if there is anything in the blacklist (mutually excludes list) and add any
// values
if let Some(ref bl) = a.blacklist {