Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-14 14:52:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into issue-80

Browse source
This commit is contained in:
Kevin K 2015-09-01 00:03:16 -04:00
commit b17808ffbd
2 changed files with 106 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
benches/benchmarks.rs Normal file
View file

@ -0,0 +1,105 @@
#![feature(test)]
extern crate clap;
extern crate test;
use clap::{App, Arg, SubCommand};
use test::Bencher;
static M_VAL_NAMES: [&'static str; 2] = ["one", "two"];
static ARGS: &'static str = "-o --option=[opt]... 'tests options'
[positional] 'tests positionals'";
static OPT3_VALS: [&'static str; 2] = ["fast", "slow"];
static POS3_VALS: [&'static str; 2] = ["vi", "emacs"];
macro_rules! create_app {
() => ({
App::new("claptests")
.version("0.1")
.about("tests clap library")
.author("Kevin K. <kbknapp@gmail.com>")
.args_from_usage(ARGS)
.arg(Arg::from_usage("-f --flag... 'tests flags'")
.global(true))
.args(vec![
Arg::from_usage("[flag2] -F 'tests flags with exclusions'").conflicts_with("flag").requires("option2"),
Arg::from_usage("--long-option-2 [option2] 'tests long options with exclusions'").conflicts_with("option").requires("positional2"),
Arg::from_usage("[positional2] 'tests positionals with exclusions'"),
Arg::from_usage("-O --Option [option3] 'tests options with specific value sets'").possible_values(&OPT3_VALS),
Arg::from_usage("[positional3]... 'tests positionals with specific values'").possible_values(&POS3_VALS),
Arg::from_usage("--multvals [multvals] 'Tests mutliple values, not mult occs'").value_names(&M_VAL_NAMES),
Arg::from_usage("--multvalsmo [multvalsmo]... 'Tests mutliple values, not mult occs'").value_names(&M_VAL_NAMES),
Arg::from_usage("--minvals2 [minvals]... 'Tests 2 min vals'").min_values(2),
Arg::from_usage("--maxvals3 [maxvals]... 'Tests 3 max vals'").max_values(3)
])
.subcommand(SubCommand::with_name("subcmd")
.about("tests subcommands")
.version("0.1")
.author("Kevin K. <kbknapp@gmail.com>")
.arg_from_usage("-o --option [scoption]... 'tests options'")
.arg_from_usage("[scpositional] 'tests positionals'"))
})
}
#[bench]
fn build_app(b: &mut Bencher) {
b.iter(|| create_app!());
}
#[bench]
fn parse_clean(b: &mut Bencher) {
b.iter(|| create_app!().get_matches_from(vec![""]));
}
#[bench]
fn parse_flag(b: &mut Bencher) {
b.iter(|| create_app!().get_matches_from(vec!["", "-f"]));
}
#[bench]
fn parse_option(b: &mut Bencher) {
b.iter(|| create_app!().get_matches_from(vec!["", "-o", "option1"]));
}
#[bench]
fn parse_positional(b: &mut Bencher) {
b.iter(|| create_app!().get_matches_from(vec!["", "arg1"]));
}
#[bench]
fn parse_sc_clean(b: &mut Bencher) {
b.iter(|| create_app!().get_matches_from(vec!["", "subcmd"]));
}
#[bench]
fn parse_sc_flag(b: &mut Bencher) {
b.iter(|| create_app!().get_matches_from(vec!["", "subcmd", "-f"]));
}
#[bench]
fn parse_sc_option(b: &mut Bencher) {
b.iter(|| create_app!().get_matches_from(vec!["", "subcmd", "-o", "option1"]));
}
#[bench]
fn parse_sc_positional(b: &mut Bencher) {
b.iter(|| create_app!().get_matches_from(vec!["", "subcmd", "arg1"]));
}
#[bench]
fn parse_complex1(b: &mut Bencher) {
b.iter(|| create_app!().get_matches_from(vec!["", "-ff", "-o", "option1", "arg1", "-O", "fast", "arg2", "--multvals", "one", "two", "three"]));
}
#[bench]
fn parse_complex2(b: &mut Bencher) {
b.iter(|| create_app!().get_matches_from(vec!["", "arg1", "-f", "arg2", "--long-option-2", "some", "-O", "slow", "--multvalsmo", "one", "two", "--minvals2", "3", "2", "1"]));
}
#[bench]
fn parse_sc_complex(b: &mut Bencher) {
b.iter(|| create_app!().get_matches_from(vec!["", "subcmd", "-f", "-o", "option1", "arg1"]));
}

2
src/app/app.rs
View file

@ -1549,7 +1549,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
l
);
self.print_spaces(
if !self.unified_help {
if !self.unified_help || longest_opt == 0 {
(longest_flag + 4)
} else {
(longest_opt + 4)