WIP: fix(cli): Make --help easier to browse

This mirrors some of the categories from `cargo help` (the man pages).

Author: epage

src/bin/cargo/commands/bench.rs

@@ -16,6 +16,12 @@ pub fn cli() -> Command {
                 .num_args(0..)
                 .last(true),
         )
+        .arg_package_spec(
+            "Package to run benchmarks for",
+            "Benchmark all packages in the workspace",
+            "Exclude packages from the benchmark",
+        )
+        .arg_features()
         .arg_targets_all(
             "Benchmark only this package's library",
             "Benchmark only the specified binary",
@@ -29,14 +35,8 @@ pub fn cli() -> Command {
             "Benchmark all targets",
         )
         .arg(flag("no-run", "Compile, but don't run benchmarks"))
-        .arg_package_spec(
-            "Package to run benchmarks for",
-            "Benchmark all packages in the workspace",
-            "Exclude packages from the benchmark",
-        )
         .arg_jobs()
         .arg_profile("Build artifacts with the specified profile")
-        .arg_features()
         .arg_target_triple("Build for the target triple")
         .arg_target_dir()
         .arg_manifest_path()

src/bin/cargo/commands/build.rs

@@ -13,6 +13,7 @@ pub fn cli() -> Command {
             "Build all packages in the workspace",
             "Exclude packages from the build",
         )
+        .arg_features()
         .arg_jobs()
         .arg_targets_all(
             "Build only this package's library",
@@ -28,7 +29,6 @@ pub fn cli() -> Command {
         )
         .arg_release("Build artifacts in release mode, with optimizations")
         .arg_profile("Build artifacts with the specified profile")
-        .arg_features()
         .arg_target_triple("Build for the target triple")
         .arg_target_dir()
         .arg(

src/bin/cargo/commands/check.rs

@@ -13,6 +13,7 @@ pub fn cli() -> Command {
             "Check all packages in the workspace",
             "Exclude packages from the check",
         )
+        .arg_features()
         .arg_jobs()
         .arg_targets_all(
             "Check only this package's library",
@@ -28,7 +29,6 @@ pub fn cli() -> Command {
         )
         .arg_release("Check artifacts in release mode, with optimizations")
         .arg_profile("Check artifacts with the specified profile")
-        .arg_features()
         .arg_target_triple("Check for the target triple")
         .arg_target_dir()
         .arg_manifest_path()

src/bin/cargo/commands/doc.rs

@@ -17,6 +17,7 @@ pub fn cli() -> Command {
             "Document all packages in the workspace",
             "Exclude packages from the build",
         )
+        .arg_features()
         .arg(flag(
             "no-deps",
             "Don't build documentation for dependencies",
@@ -32,7 +33,6 @@ pub fn cli() -> Command {
         )
         .arg_release("Build artifacts in release mode, with optimizations")
         .arg_profile("Build artifacts with the specified profile")
-        .arg_features()
         .arg_target_triple("Build for the target triple")
         .arg_target_dir()
         .arg_manifest_path()

src/bin/cargo/commands/fix.rs

@@ -11,6 +11,7 @@ pub fn cli() -> Command {
             "Fix all packages in the workspace",
             "Exclude packages from the fixes",
         )
+        .arg_features()
         .arg_jobs()
         .arg_targets_all(
             "Fix only this package's library",
@@ -26,7 +27,6 @@ pub fn cli() -> Command {
         )
         .arg_release("Fix artifacts in release mode, with optimizations")
         .arg_profile("Build artifacts with the specified profile")
-        .arg_features()
         .arg_target_triple("Fix for the target triple")
         .arg_target_dir()
         .arg_manifest_path()

src/bin/cargo/commands/package.rs

@@ -25,14 +25,14 @@ pub fn cli() -> Command {
             "allow-dirty",
             "Allow dirty working directories to be packaged",
         ))
-        .arg_target_triple("Build for the target triple")
-        .arg_target_dir()
-        .arg_features()
         .arg_package_spec_no_all(
             "Package(s) to assemble",
             "Assemble all packages in the workspace",
             "Don't assemble specified packages",
         )
+        .arg_features()
+        .arg_target_triple("Build for the target triple")
+        .arg_target_dir()
         .arg_manifest_path()
         .arg_jobs()
         .after_help("Run `cargo help package` for more detailed information.\n")

src/bin/cargo/commands/run.rs

@@ -27,10 +27,10 @@ pub fn cli() -> Command {
             "Name of the example target to run",
         )
         .arg_package("Package with the target to run")
+        .arg_features()
         .arg_jobs()
         .arg_release("Build artifacts in release mode, with optimizations")
         .arg_profile("Build artifacts with the specified profile")
-        .arg_features()
         .arg_target_triple("Build for the target triple")
         .arg_target_dir()
         .arg_manifest_path()

src/bin/cargo/commands/rustc.rs

@@ -16,6 +16,7 @@ pub fn cli() -> Command {
                 .trailing_var_arg(true),
         )
         .arg_package("Package to build")
+        .arg_features()
         .arg_jobs()
         .arg_targets_all(
             "Build only this package's library",
@@ -31,7 +32,6 @@ pub fn cli() -> Command {
         )
         .arg_release("Build artifacts in release mode, with optimizations")
         .arg_profile("Build artifacts with the specified profile")
-        .arg_features()
         .arg_target_triple("Target triple which compiles will be for")
         .arg(
             opt(

src/bin/cargo/commands/rustdoc.rs

@@ -17,6 +17,7 @@ pub fn cli() -> Command {
             "Opens the docs in a browser after the operation",
         ))
         .arg_package("Package to document")
+        .arg_features()
         .arg_jobs()
         .arg_targets_all(
             "Build only this package's library",
@@ -32,7 +33,6 @@ pub fn cli() -> Command {
         )
         .arg_release("Build artifacts in release mode, with optimizations")
         .arg_profile("Build artifacts with the specified profile")
-        .arg_features()
         .arg_target_triple("Build for the target triple")
         .arg_target_dir()
         .arg_manifest_path()

src/bin/cargo/commands/test.rs

@@ -44,10 +44,10 @@ pub fn cli() -> Command {
             "Test all packages in the workspace",
             "Exclude packages from the test",
         )
+        .arg_features()
         .arg_jobs()
         .arg_release("Build artifacts in release mode, with optimizations")
         .arg_profile("Build artifacts with the specified profile")
-        .arg_features()
         .arg_target_triple("Build for the target triple")
         .arg_target_dir()
         .arg_manifest_path()