summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorTommy Ip <hkmp7tommy@gmail.com>2017-09-20 19:31:59 +0100
committerTommy Ip <hkmp7tommy@gmail.com>2017-09-20 22:10:13 +0100
commit09d90e52682641e5d6d0a70e42011fd24ced1434 (patch)
tree8d91045fb497a0fedc7edbbb52e7abd468f7929f /src/bootstrap
parent2c78bb49fde79e93b110a979f1f11b3f1221e1ef (diff)
downloadrust-09d90e52682641e5d6d0a70e42011fd24ced1434.tar.gz
rust-09d90e52682641e5d6d0a70e42011fd24ced1434.zip
Do not show "available paths" help in ./x.py clean
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/flags.rs11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
index 34b0ca627aa..df378188b4a 100644
--- a/src/bootstrap/flags.rs
+++ b/src/bootstrap/flags.rs
@@ -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") {
             let config = Config::parse(&["build".to_string()]);
             let mut build = Build::new(config);
@@ -261,9 +261,10 @@ Arguments:
 
             let maybe_rules_help = Builder::get_help(&build, subcommand.as_str());
             extra_help.push_str(maybe_rules_help.unwrap_or_default().as_str());
-        } else {
-            extra_help.push_str(format!("Run `./x.py {} -h -v` to see a list of available paths.",
-                     subcommand).as_str());
+        } else if subcommand.as_str() != "clean" {
+            extra_help.push_str(format!(
+                "Run `./x.py {} -h -v` to see a list of available paths.",
+                subcommand).as_str());
         }
 
         // User passed in -h/--help?
@@ -293,7 +294,7 @@ Arguments:
             }
             "clean" => {
                 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);
                 }