Auto merge of #12915 - epage:test-targets, r=weihanglo

fix(cli): Clarify --test is for targets, not test functions

We already refer to test targets as "test targets" instead of "tests" in `--test` but not `--tests` or in the error output.  This makes it uniformly refer to them as "test targets", making it clearer that these aren't test functions.

Fixes #7864

Author: bors

src/bin/cargo/commands/bench.rs

@@ -37,9 +37,9 @@ pub fn cli() -> Command {
             "Benchmark only the specified example",
             "Benchmark all examples",
             "Benchmark only the specified test target",
-            "Benchmark all tests",
+            "Benchmark all test targets",
             "Benchmark only the specified bench target",
-            "Benchmark all benches",
+            "Benchmark all bench targets",
             "Benchmark all targets",
         )
         .arg_features()

src/bin/cargo/commands/build.rs

@@ -23,9 +23,9 @@ pub fn cli() -> Command {
             "Build only the specified example",
             "Build all examples",
             "Build only the specified test target",
-            "Build all tests",
+            "Build all test targets",
             "Build only the specified bench target",
-            "Build all benches",
+            "Build all bench targets",
             "Build all targets",
         )
         .arg_features()

src/bin/cargo/commands/check.rs

@@ -23,9 +23,9 @@ pub fn cli() -> Command {
             "Check only the specified example",
             "Check all examples",
             "Check only the specified test target",
-            "Check all tests",
+            "Check all test targets",
             "Check only the specified bench target",
-            "Check all benches",
+            "Check all bench targets",
             "Check all targets",
         )
         .arg_features()

src/bin/cargo/commands/fix.rs

@@ -41,9 +41,9 @@ pub fn cli() -> Command {
             "Fix only the specified example",
             "Fix all examples",
             "Fix only the specified test target",
-            "Fix all tests",
+            "Fix all test targets",
             "Fix only the specified bench target",
-            "Fix all benches",
+            "Fix all bench targets",
             "Fix all targets (default)",
         )
         .arg_features()

src/bin/cargo/commands/rustc.rs

@@ -39,9 +39,9 @@ pub fn cli() -> Command {
             "Build only the specified example",
             "Build all examples",
             "Build only the specified test target",
-            "Build all tests",
+            "Build all test targets",
             "Build only the specified bench target",
-            "Build all benches",
+            "Build all bench targets",
             "Build all targets",
         )
         .arg_features()

src/bin/cargo/commands/rustdoc.rs

@@ -27,9 +27,9 @@ pub fn cli() -> Command {
             "Build only the specified example",
             "Build all examples",
             "Build only the specified test target",
-            "Build all tests",
+            "Build all test targets",
             "Build only the specified bench target",
-            "Build all benches",
+            "Build all bench targets",
             "Build all targets",
         )
         .arg_features()

src/bin/cargo/commands/test.rs

@@ -43,9 +43,9 @@ pub fn cli() -> Command {
             "Test only the specified example",
             "Test all examples",
             "Test only the specified test target",
-            "Test all tests",
+            "Test all test targets",
             "Test only the specified bench target",
-            "Test all benches",
+            "Test all bench targets",
             "Test all targets (does not include doctests)",
         )
         .arg_features()

src/cargo/util/workspace.rs

@@ -87,11 +87,11 @@ pub fn print_available_binaries(ws: &Workspace<'_>, options: &CompileOptions) ->
 }
 
 pub fn print_available_benches(ws: &Workspace<'_>, options: &CompileOptions) -> CargoResult<()> {
-    print_available_targets(Target::is_bench, ws, options, "--bench", "benches")
+    print_available_targets(Target::is_bench, ws, options, "--bench", "bench targets")
 }
 
 pub fn print_available_tests(ws: &Workspace<'_>, options: &CompileOptions) -> CargoResult<()> {
-    print_available_targets(Target::is_test, ws, options, "--test", "tests")
+    print_available_targets(Target::is_test, ws, options, "--test", "test targets")
 }
 
 /// The path that we pass to rustc is actually fairly important because it will

tests/testsuite/cargo_bench/help/stdout.log

@@ -31,9 +31,9 @@ Target Selection:
       --bin [<NAME>]      Benchmark only the specified binary
       --examples          Benchmark all examples
       --example [<NAME>]  Benchmark only the specified example
-      --tests             Benchmark all tests
+      --tests             Benchmark all test targets
       --test [<NAME>]     Benchmark only the specified test target
-      --benches           Benchmark all benches
+      --benches           Benchmark all bench targets
       --bench [<NAME>]    Benchmark only the specified bench target
       --all-targets       Benchmark all targets
 

tests/testsuite/cargo_build/help/stdout.log

@@ -26,9 +26,9 @@ Target Selection:
       --bin [<NAME>]      Build only the specified binary
       --examples          Build all examples
       --example [<NAME>]  Build only the specified example
-      --tests             Build all tests
+      --tests             Build all test targets
       --test [<NAME>]     Build only the specified test target
-      --benches           Build all benches
+      --benches           Build all bench targets
       --bench [<NAME>]    Build only the specified bench target
       --all-targets       Build all targets