Do not show "available paths" help in ./x.py clean

This commit is contained in:
Tommy Ip 2017-09-20 19:31:59 +01:00
parent 2c78bb49fd
commit 09d90e5268

View File

@ -253,7 +253,7 @@ Arguments:
} }
}); });
// All subcommands can have an optional "Available paths" section // All subcommands except `clean` can have an optional "Available paths" section
if matches.opt_present("verbose") { if matches.opt_present("verbose") {
let config = Config::parse(&["build".to_string()]); let config = Config::parse(&["build".to_string()]);
let mut build = Build::new(config); let mut build = Build::new(config);
@ -261,9 +261,10 @@ Arguments:
let maybe_rules_help = Builder::get_help(&build, subcommand.as_str()); let maybe_rules_help = Builder::get_help(&build, subcommand.as_str());
extra_help.push_str(maybe_rules_help.unwrap_or_default().as_str()); extra_help.push_str(maybe_rules_help.unwrap_or_default().as_str());
} else { } else if subcommand.as_str() != "clean" {
extra_help.push_str(format!("Run `./x.py {} -h -v` to see a list of available paths.", extra_help.push_str(format!(
subcommand).as_str()); "Run `./x.py {} -h -v` to see a list of available paths.",
subcommand).as_str());
} }
// User passed in -h/--help? // User passed in -h/--help?
@ -293,7 +294,7 @@ Arguments:
} }
"clean" => { "clean" => {
if paths.len() > 0 { if paths.len() > 0 {
println!("\nclean takes no arguments\n"); println!("\nclean does not take a path argument\n");
usage(1, &opts, &subcommand_help, &extra_help); usage(1, &opts, &subcommand_help, &extra_help);
} }