Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-11-10 14:54:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14 from kbknapp/dev

Browse source 
Moving to stable Rust APIs
This commit is contained in:
Kevin K. 2015-03-18 12:44:24 -04:00
commit 7a6c606e9e
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/app.rs
View file

@ -347,13 +347,13 @@ impl App {
let flags = ! self.flags.is_empty();
let pos = ! self.positionals_idx.is_empty();
let req_pos = self.positionals_idx.values().filter_map(|ref x| if x.required { Some(x.name) } else {None})
.fold(String::new(), |acc, ref name| acc + &format!("<{}> ", name.to_uppercase())[..]);
.fold(String::new(), |acc, ref name| acc + &format!("<{}> ", name)[..]);
let req_opts = self.opts.values().filter(|ref x| x.required)
.fold(String::new(), |acc, ref o| acc + &format!("{}{} ",if let Some(s) = o.short {
format!("-{} ", s)
} else {
format!("--{}=",o.long.unwrap())
},o.name.to_uppercase()));
},o.name));
let opts = ! self.opts.is_empty();
let subcmds = ! self.subcommands.is_empty();
@ -409,7 +409,7 @@ impl App {
println!("\t{}{}{}\t{}",
if let Some(ref s) = v.short{format!("-{} ",s)}else{format!(" ")},
if let Some(ref l) = v.long {format!(",--{}=",l)}else {needs_tab = true; format!(" ")},
format!("{}", v.name.to_uppercase()),
format!("{}", v.name),
if let Some(ref h) = v.help {if needs_tab {format!("\t{}", *h)} else { format!("{}", *h) } } else {format!(" ")} );
}
}
@ -563,7 +563,7 @@ impl App {
}
} else {
// Short flag or opt
let arg_c = arg.char_at(0);
let arg_c = arg.chars().nth(0).unwrap();
self.check_for_help_and_version(arg_c);
if ! self.parse_single_short_flag(matches, arg_c) {

3
src/arg.rs
View file

@ -105,8 +105,7 @@ impl Arg {
/// .short("c")
/// # ).get_matches();
pub fn short(mut self, s: &'static str) -> Arg {
self.short = Some(s.trim_left_matches(|c| c == '-')
.char_at(0));
self.short = s.trim_left_matches(|c| c == '-').chars().nth(0);
self
}

2
src/lib.rs
View file

@ -1,6 +1,6 @@
#![crate_type= "lib"]
#![feature(collections, libc, exit_status)]
#![feature(libc, exit_status)]
//! A simply library for parsing command line arguments when writing
//! command line and console applications.