OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refer to a subcommand as a subcommand.

Browse Source 
For some reason 'command' and 'subcommand' were intermixed to mean the same thing.  Lets just call it the one thing that it is.
This commit is contained in:
Nathan Stocks 2017-03-30 20:49:06 -06:00
parent 5c94997b6b
commit e1b0027b51
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/bootstrap/flags.rs
View File

@ -90,12 +90,11 @@ impl Flags {
opts.optflag("h", "help", "print this help message");
let usage = |n, opts: &Options| -> ! {
let command = args.get(0).map(|s| &**s);
let brief = format!("Usage: x.py {} [options] [<args>...]",
command.unwrap_or("<command>"));
let subcommand = args.get(0).map(|s| &**s);
let brief = format!("Usage: x.py <subcommand> [options] [<args>...]");
println!("{}", opts.usage(&brief));
match command {
match subcommand {
Some("build") => {
println!("\
Arguments:
@ -156,13 +155,13 @@ Arguments:
_ => {}
}
if let Some(command) = command {
if command == "build" ||
command == "dist" ||
command == "doc" ||
command == "test" ||
command == "bench" ||
command == "clean" {
if let Some(subcommand) = subcommand {
if subcommand == "build" ||
subcommand == "dist" ||
subcommand == "doc" ||
subcommand == "test" ||
subcommand == "bench" ||
subcommand == "clean" {
println!("Available invocations:");
if args.iter().any(|a| a == "-v") {
let flags = Flags::parse(&["build".to_string()]);
@ -170,10 +169,10 @@ Arguments:
config.build = flags.build.clone();
let mut build = Build::new(flags, config);
metadata::build(&mut build);
step::build_rules(&build).print_help(command);
step::build_rules(&build).print_help(subcommand);
} else {
println!(" ... elided, run `./x.py {} -h -v` to see",
command);
subcommand);
}
println!("");
@ -189,13 +188,13 @@ Subcommands:
clean Clean out build directories
dist Build and/or install distribution artifacts
To learn more about a subcommand, run `./x.py <command> -h`
To learn more about a subcommand, run `./x.py <subcommand> -h`
");
process::exit(n);
};
if args.len() == 0 {
println!("a command must be passed");
println!("a subcommand must be passed");
usage(1, &opts);
}
let parse = |opts: &Options| {
@ -258,7 +257,7 @@ To learn more about a subcommand, run `./x.py <command> -h`
}
"--help" => usage(0, &opts),
cmd => {
println!("unknown command: {}", cmd);
println!("unknown subcommand: {}", cmd);
usage(1, &opts);
}
};