Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2025-03-04 15:27:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved some for loops to more readable iterators

Browse source
This commit is contained in:
Kevin K 2015-03-18 10:15:55 -04:00
parent bd4de8ff69
commit ff8ea640e9
1 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/app.rs
View file

@ -526,12 +526,15 @@ impl App {
} }
if let Some(ref reqs) = v.requires { if let Some(ref reqs) = v.requires {
if ! reqs.is_empty() { if ! reqs.is_empty() {
for n in reqs.iter() { // Add all required args which aren't already found in matches to the
if matches.opts.contains_key(n) { continue; } // final required list
if matches.flags.contains_key(n) { continue; } for n in reqs.iter().filter(|&a|
if matches.positionals.contains_key(n) { continue; } ! matches.opts.contains_key(a) ||
self.required.insert(n); ! matches.flags.contains_key(a) ||
} ! matches.positionals.contains_key(a) ) {
self.required.insert(n);
}
} }
} }
break; break;
@ -744,13 +747,16 @@ impl App {
} }
if let Some(ref reqs) = opt.requires { if let Some(ref reqs) = opt.requires {
if ! reqs.is_empty() { if ! reqs.is_empty() {
for n in reqs.iter() { // Add all required args which aren't already found in matches to the
if matches.opts.contains_key(n) { continue; } // final required list
if matches.flags.contains_key(n) { continue; } for n in reqs.iter().filter(|&a|
if matches.positionals.contains_key(n) { continue; } ! matches.opts.contains_key(a) ||
self.required.insert(n); ! matches.flags.contains_key(a) ||
} ! matches.positionals.contains_key(a) ) {
}
self.required.insert(n);
}
}
} }
skip = true; skip = true;
} }
@ -810,11 +816,14 @@ impl App {
} }
if let Some(ref reqs) = p.requires { if let Some(ref reqs) = p.requires {
if ! reqs.is_empty() { if ! reqs.is_empty() {
for n in reqs.iter() { // Add all required args which aren't already found in matches to the
if matches.opts.contains_key(n) { continue; } // final required list
if matches.flags.contains_key(n) { continue; } for n in reqs.iter().filter(|&a|
if matches.positionals.contains_key(n) { continue; } ! matches.opts.contains_key(a) ||
self.required.insert(n); ! matches.flags.contains_key(a) ||
! matches.positionals.contains_key(a) ) {
self.required.insert(n);
} }
} }
} }