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

Fixed opts & version tests

Browse source
This commit is contained in:
Alena Yuryeva 2018-08-11 21:11:11 +03:00
parent c501773ed3
commit deb9fc91f6
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/parse/parser.rs
View file

@ -292,21 +292,12 @@ where
//I wonder whether this part is even needed if we insert all Args using make_entries
let mut key: Vec<(KeyType, usize)> = Vec::new();
for (i, a) in self.app.args.values().enumerate() {
if let Some(ref index) = a.index {
key.push((KeyType::Position(*index), i));
} else {
if let Some(ref c) = a.short {
key.push((KeyType::Short(*c), i));
}
if let Some(ref l) = a.long {
key.push((KeyType::Long(OsString::from(l)), i));
}
if let Some(ref v) = a.aliases {
for (item, _) in v {
key.push((KeyType::Long(OsString::from(item)), i));
}
}
let mut counter = 0;
for (i, a) in self.app.args.values_mut().enumerate() {
if a.index == None && a.short == None && a.long == None {
counter += 1;
a.index = Some(counter);
key.push((KeyType::Position(counter), i));
}
// Add args with default requirements
@ -1019,7 +1010,7 @@ where
};
if let Some(opt) = self.app.args.get(KeyType::Long(arg.into())) {
debugln!(
"Parser::parse_long_arg: Found valid opt '{}'",
"Parser::parse_long_arg: Found valid opt or flag '{}'",
opt.to_string()
);
self.app.settings.set(AS::ValidArgFound);
@ -1027,7 +1018,7 @@ where
if opt.is_set(ArgSettings::TakesValue) {
return Ok(self.parse_opt(val, opt, val.is_some(), matcher)?);
}
self.check_for_help_and_version_str(arg)?;
self.parse_flag(opt, matcher)?;
return Ok(ParseResult::Flag);

2
tests/version.rs
View file

@ -27,7 +27,7 @@ fn version_long() {
.author("Kevin K.")
.about("tests stuff")
.version("1.3")
.get_matches_from_safe(vec!["myprog", "--version"]);
.try_get_matches_from(vec!["myprog", "--version"]);
assert!(m.is_err());
assert_eq!(m.unwrap_err().kind, ErrorKind::VersionDisplayed);