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

refactor(app::Parser) Replace continue and .push() with iterator adaptors

Browse source
This commit is contained in:
tormol 2016-10-04 18:45:35 +02:00
parent 9679713a30
commit a214a34529
1 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/app/parser.rs
View file

@ -353,32 +353,22 @@ impl<'a, 'b> Parser<'a, 'b>
c_flags.dedup(); c_flags.dedup();
c_opt.dedup(); c_opt.dedup();
grps.dedup(); grps.dedup();
let mut args_in_groups = vec![]; let args_in_groups = grps.iter()
for g in &grps { .flat_map(|g| self.arg_names_in_group(g) )
for a in self.arg_names_in_group(g) { .collect::<Vec<_>>();
args_in_groups.push(a);
}
}
let mut pmap = BTreeMap::new(); let pmap = c_pos.into_iter()
for p in c_pos { .filter(|&p| matcher.is_none() || !matcher.as_ref().unwrap().contains(p) )
if matcher.is_some() && matcher.as_ref().unwrap().contains(p) { .filter_map(|p| self.positionals.values().find(|x| x.name == p ) )
continue; .filter(|p| !args_in_groups.contains(&p.name) )
} .map(|p| (p.index, p) )
if let Some(p) = self.positionals.values().find(|x| &x.name == &p) { .collect::<BTreeMap<u64,&PosBuilder>>();// sort by index
if args_in_groups.contains(&p.name) {
continue;
}
pmap.insert(p.index, p.to_string());
}
}
debugln!("args_in_groups={:?}", args_in_groups); debugln!("args_in_groups={:?}", args_in_groups);
for (_, s) in pmap { for &p in pmap.values() {
if (!args_in_groups.is_empty()) && (args_in_groups.contains(&&*s)) { let s = p.to_string();
continue; if args_in_groups.is_empty() || !args_in_groups.contains(&&*s) {
ret_val.push_back(s);
} }
ret_val.push_back(s);
} }
macro_rules! write_arg { macro_rules! write_arg {
($i:expr, $m:ident, $v:ident, $r:ident, $aig:ident) => { ($i:expr, $m:ident, $v:ident, $r:ident, $aig:ident) => {