don't talk about benchmark mode / test mode in help

RalfJung · RalfJung · commit 937ddf72bbc0 · 2024-10-12T16:26:46.000+02:00
diff --git a/src/bin/cargo/commands/test.rs b/src/bin/cargo/commands/test.rs
@@ -43,7 +43,7 @@ pub fn cli() -> Command {
             "Test only the specified test target",
             "Test all targets that have `test = true` set",
             "Test only the specified bench target",
-            "Test all targets in benchmark mode that have `bench = true` set",
+            "Test all targets that have `bench = true` set",
             "Test all targets (does not include doctests)",
         )
         .arg(
diff --git a/src/doc/man/generated_txt/cargo-bench.txt b/src/doc/man/generated_txt/cargo-bench.txt
@@ -172,7 +172,7 @@ OPTIONS
            multiple times and supports common Unix glob patterns.
 
        --tests
-           Benchmark all targets in test mode that have the test = true
+           Benchmark all targets that have the test = true
            manifest flag set. By default this includes the library and binaries
            built as unittests, and integration tests. Be aware that this will
            also build any required dependencies, so the lib target may be built
@@ -185,7 +185,7 @@ OPTIONS
            multiple times and supports common Unix glob patterns.
 
        --benches
-           Benchmark all targets in benchmark mode that have the bench = true
+           Benchmark all targets that have the bench = true
            manifest flag set. By default this includes the library and binaries
            built as benchmarks, and bench targets. Be aware that this will also
            build any required dependencies, so the lib target may be built
diff --git a/src/doc/man/generated_txt/cargo-build.txt b/src/doc/man/generated_txt/cargo-build.txt
@@ -89,7 +89,7 @@ OPTIONS
            multiple times and supports common Unix glob patterns.
 
        --tests
-           Build all targets in test mode that have the test = true manifest
+           Build all targets that have the test = true manifest
            flag set. By default this includes the library and binaries built as
            unittests, and integration tests. Be aware that this will also build
            any required dependencies, so the lib target may be built twice
@@ -102,7 +102,7 @@ OPTIONS
            times and supports common Unix glob patterns.
 
        --benches
-           Build all targets in benchmark mode that have the bench = true
+           Build all targets that have the bench = true
            manifest flag set. By default this includes the library and binaries
            built as benchmarks, and bench targets. Be aware that this will also
            build any required dependencies, so the lib target may be built
diff --git a/src/doc/man/generated_txt/cargo-check.txt b/src/doc/man/generated_txt/cargo-check.txt
@@ -86,7 +86,7 @@ OPTIONS
            multiple times and supports common Unix glob patterns.
 
        --tests
-           Check all targets in test mode that have the test = true manifest
+           Check all targets that have the test = true manifest
            flag set. By default this includes the library and binaries built as
            unittests, and integration tests. Be aware that this will also build
            any required dependencies, so the lib target may be built twice
@@ -99,7 +99,7 @@ OPTIONS
            times and supports common Unix glob patterns.
 
        --benches
-           Check all targets in benchmark mode that have the bench = true
+           Check all targets that have the bench = true
            manifest flag set. By default this includes the library and binaries
            built as benchmarks, and bench targets. Be aware that this will also
            build any required dependencies, so the lib target may be built
diff --git a/src/doc/man/generated_txt/cargo-fix.txt b/src/doc/man/generated_txt/cargo-fix.txt
@@ -159,7 +159,7 @@ OPTIONS
            multiple times and supports common Unix glob patterns.
 
        --tests
-           Fix all targets in test mode that have the test = true manifest flag
+           Fix all targets that have the test = true manifest flag
            set. By default this includes the library and binaries built as
            unittests, and integration tests. Be aware that this will also build
            any required dependencies, so the lib target may be built twice
@@ -172,7 +172,7 @@ OPTIONS
            times and supports common Unix glob patterns.
 
        --benches
-           Fix all targets in benchmark mode that have the bench = true
+           Fix all targets that have the bench = true
            manifest flag set. By default this includes the library and binaries
            built as benchmarks, and bench targets. Be aware that this will also
            build any required dependencies, so the lib target may be built
diff --git a/src/doc/man/generated_txt/cargo-rustc.txt b/src/doc/man/generated_txt/cargo-rustc.txt
@@ -80,7 +80,7 @@ OPTIONS
            multiple times and supports common Unix glob patterns.
 
        --tests
-           Build all targets in test mode that have the test = true manifest
+           Build all targets that have the test = true manifest
            flag set. By default this includes the library and binaries built as
            unittests, and integration tests. Be aware that this will also build
            any required dependencies, so the lib target may be built twice
@@ -93,7 +93,7 @@ OPTIONS
            times and supports common Unix glob patterns.
 
        --benches
-           Build all targets in benchmark mode that have the bench = true
+           Build all targets that have the bench = true
            manifest flag set. By default this includes the library and binaries
            built as benchmarks, and bench targets. Be aware that this will also
            build any required dependencies, so the lib target may be built
diff --git a/src/doc/man/generated_txt/cargo-rustdoc.txt b/src/doc/man/generated_txt/cargo-rustdoc.txt
@@ -80,7 +80,7 @@ OPTIONS
            multiple times and supports common Unix glob patterns.
 
        --tests
-           Document all targets in test mode that have the test = true manifest
+           Document all targets that have the test = true manifest
            flag set. By default this includes the library and binaries built as
            unittests, and integration tests. Be aware that this will also build
            any required dependencies, so the lib target may be built twice
@@ -93,7 +93,7 @@ OPTIONS
            multiple times and supports common Unix glob patterns.
 
        --benches
-           Document all targets in benchmark mode that have the bench = true
+           Document all targets that have the bench = true
            manifest flag set. By default this includes the library and binaries
            built as benchmarks, and bench targets. Be aware that this will also
            build any required dependencies, so the lib target may be built
diff --git a/src/doc/man/generated_txt/cargo-test.txt b/src/doc/man/generated_txt/cargo-test.txt
@@ -190,7 +190,7 @@ OPTIONS
            multiple times and supports common Unix glob patterns.
 
        --tests
-           Test all targets in test mode that have the test = true manifest
+           Test all targets that have the test = true manifest
            flag set. By default this includes the library and binaries built as
            unittests, and integration tests. Be aware that this will also build
            any required dependencies, so the lib target may be built twice
@@ -203,7 +203,7 @@ OPTIONS
            times and supports common Unix glob patterns.
 
        --benches
-           Test all targets in benchmark mode that have the bench = true
+           Test all targets that have the bench = true
            manifest flag set. By default this includes the library and binaries
            built as benchmarks, and bench targets. Be aware that this will also
            build any required dependencies, so the lib target may be built
diff --git a/src/doc/man/includes/options-targets.md b/src/doc/man/includes/options-targets.md
@@ -25,7 +25,7 @@ multiple times and supports common Unix glob patterns.
 {{/option}}
 
 {{#option "`--tests`" }}
-{{actionverb}} all targets in test mode that have the `test = true` manifest
+{{actionverb}} all targets that have the `test = true` manifest
 flag set. By default this includes the library and binaries built as
 unittests, and integration tests. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
@@ -40,7 +40,7 @@ times and supports common Unix glob patterns.
 {{/option}}
 
 {{#option "`--benches`" }}
-{{actionverb}} all targets in benchmark mode that have the `bench = true`
+{{actionverb}} all targets that have the `bench = true`
 manifest flag set. By default this includes the library and binaries built
 as benchmarks, and bench targets. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
diff --git a/src/doc/src/commands/cargo-bench.md b/src/doc/src/commands/cargo-bench.md
@@ -193,7 +193,7 @@ multiple times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-bench---tests"><a class="option-anchor" href="#option-cargo-bench---tests"></a><code>--tests</code></dt>
-<dd class="option-desc">Benchmark all targets in test mode that have the <code>test = true</code> manifest
+<dd class="option-desc">Benchmark all targets that have the <code>test = true</code> manifest
 flag set. By default this includes the library and binaries built as
 unittests, and integration tests. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
@@ -208,7 +208,7 @@ times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-bench---benches"><a class="option-anchor" href="#option-cargo-bench---benches"></a><code>--benches</code></dt>
-<dd class="option-desc">Benchmark all targets in benchmark mode that have the <code>bench = true</code>
+<dd class="option-desc">Benchmark all targets that have the <code>bench = true</code>
 manifest flag set. By default this includes the library and binaries built
 as benchmarks, and bench targets. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
diff --git a/src/doc/src/commands/cargo-build.md b/src/doc/src/commands/cargo-build.md
@@ -108,7 +108,7 @@ multiple times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-build---tests"><a class="option-anchor" href="#option-cargo-build---tests"></a><code>--tests</code></dt>
-<dd class="option-desc">Build all targets in test mode that have the <code>test = true</code> manifest
+<dd class="option-desc">Build all targets that have the <code>test = true</code> manifest
 flag set. By default this includes the library and binaries built as
 unittests, and integration tests. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
@@ -123,7 +123,7 @@ times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-build---benches"><a class="option-anchor" href="#option-cargo-build---benches"></a><code>--benches</code></dt>
-<dd class="option-desc">Build all targets in benchmark mode that have the <code>bench = true</code>
+<dd class="option-desc">Build all targets that have the <code>bench = true</code>
 manifest flag set. By default this includes the library and binaries built
 as benchmarks, and bench targets. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
diff --git a/src/doc/src/commands/cargo-check.md b/src/doc/src/commands/cargo-check.md
@@ -104,7 +104,7 @@ multiple times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-check---tests"><a class="option-anchor" href="#option-cargo-check---tests"></a><code>--tests</code></dt>
-<dd class="option-desc">Check all targets in test mode that have the <code>test = true</code> manifest
+<dd class="option-desc">Check all targets that have the <code>test = true</code> manifest
 flag set. By default this includes the library and binaries built as
 unittests, and integration tests. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
@@ -119,7 +119,7 @@ times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-check---benches"><a class="option-anchor" href="#option-cargo-check---benches"></a><code>--benches</code></dt>
-<dd class="option-desc">Check all targets in benchmark mode that have the <code>bench = true</code>
+<dd class="option-desc">Check all targets that have the <code>bench = true</code>
 manifest flag set. By default this includes the library and binaries built
 as benchmarks, and bench targets. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
diff --git a/src/doc/src/commands/cargo-fix.md b/src/doc/src/commands/cargo-fix.md
@@ -184,7 +184,7 @@ multiple times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-fix---tests"><a class="option-anchor" href="#option-cargo-fix---tests"></a><code>--tests</code></dt>
-<dd class="option-desc">Fix all targets in test mode that have the <code>test = true</code> manifest
+<dd class="option-desc">Fix all targets that have the <code>test = true</code> manifest
 flag set. By default this includes the library and binaries built as
 unittests, and integration tests. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
@@ -199,7 +199,7 @@ times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-fix---benches"><a class="option-anchor" href="#option-cargo-fix---benches"></a><code>--benches</code></dt>
-<dd class="option-desc">Fix all targets in benchmark mode that have the <code>bench = true</code>
+<dd class="option-desc">Fix all targets that have the <code>bench = true</code>
 manifest flag set. By default this includes the library and binaries built
 as benchmarks, and bench targets. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
diff --git a/src/doc/src/commands/cargo-rustc.md b/src/doc/src/commands/cargo-rustc.md
@@ -97,7 +97,7 @@ multiple times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-rustc---tests"><a class="option-anchor" href="#option-cargo-rustc---tests"></a><code>--tests</code></dt>
-<dd class="option-desc">Build all targets in test mode that have the <code>test = true</code> manifest
+<dd class="option-desc">Build all targets that have the <code>test = true</code> manifest
 flag set. By default this includes the library and binaries built as
 unittests, and integration tests. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
@@ -112,7 +112,7 @@ times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-rustc---benches"><a class="option-anchor" href="#option-cargo-rustc---benches"></a><code>--benches</code></dt>
-<dd class="option-desc">Build all targets in benchmark mode that have the <code>bench = true</code>
+<dd class="option-desc">Build all targets that have the <code>bench = true</code>
 manifest flag set. By default this includes the library and binaries built
 as benchmarks, and bench targets. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
diff --git a/src/doc/src/commands/cargo-rustdoc.md b/src/doc/src/commands/cargo-rustdoc.md
@@ -103,7 +103,7 @@ multiple times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-rustdoc---tests"><a class="option-anchor" href="#option-cargo-rustdoc---tests"></a><code>--tests</code></dt>
-<dd class="option-desc">Document all targets in test mode that have the <code>test = true</code> manifest
+<dd class="option-desc">Document all targets that have the <code>test = true</code> manifest
 flag set. By default this includes the library and binaries built as
 unittests, and integration tests. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
@@ -118,7 +118,7 @@ times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-rustdoc---benches"><a class="option-anchor" href="#option-cargo-rustdoc---benches"></a><code>--benches</code></dt>
-<dd class="option-desc">Document all targets in benchmark mode that have the <code>bench = true</code>
+<dd class="option-desc">Document all targets that have the <code>bench = true</code>
 manifest flag set. By default this includes the library and binaries built
 as benchmarks, and bench targets. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
diff --git a/src/doc/src/commands/cargo-test.md b/src/doc/src/commands/cargo-test.md
@@ -206,7 +206,7 @@ multiple times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-test---tests"><a class="option-anchor" href="#option-cargo-test---tests"></a><code>--tests</code></dt>
-<dd class="option-desc">Test all targets in test mode that have the <code>test = true</code> manifest
+<dd class="option-desc">Test all targets that have the <code>test = true</code> manifest
 flag set. By default this includes the library and binaries built as
 unittests, and integration tests. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
@@ -221,7 +221,7 @@ times and supports common Unix glob patterns.</dd>
 
 
 <dt class="option-term" id="option-cargo-test---benches"><a class="option-anchor" href="#option-cargo-test---benches"></a><code>--benches</code></dt>
-<dd class="option-desc">Test all targets in benchmark mode that have the <code>bench = true</code>
+<dd class="option-desc">Test all targets that have the <code>bench = true</code>
 manifest flag set. By default this includes the library and binaries built
 as benchmarks, and bench targets. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
diff --git a/src/etc/man/cargo-bench.1 b/src/etc/man/cargo-bench.1
@@ -208,7 +208,7 @@ multiple times and supports common Unix glob patterns.
 .sp
 \fB\-\-tests\fR
 .RS 4
-Benchmark all targets in test mode that have the \fBtest = true\fR manifest
+Benchmark all targets that have the \fBtest = true\fR manifest
 flag set. By default this includes the library and binaries built as
 unittests, and integration tests. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
@@ -225,7 +225,7 @@ times and supports common Unix glob patterns.
 .sp
 \fB\-\-benches\fR
 .RS 4
-Benchmark all targets in benchmark mode that have the \fBbench = true\fR
+Benchmark all targets that have the \fBbench = true\fR
 manifest flag set. By default this includes the library and binaries built
 as benchmarks, and bench targets. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
diff --git a/src/etc/man/cargo-build.1 b/src/etc/man/cargo-build.1
@@ -107,7 +107,7 @@ multiple times and supports common Unix glob patterns.
 .sp
 \fB\-\-tests\fR
 .RS 4
-Build all targets in test mode that have the \fBtest = true\fR manifest
+Build all targets that have the \fBtest = true\fR manifest
 flag set. By default this includes the library and binaries built as
 unittests, and integration tests. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
@@ -124,7 +124,7 @@ times and supports common Unix glob patterns.
 .sp
 \fB\-\-benches\fR
 .RS 4
-Build all targets in benchmark mode that have the \fBbench = true\fR
+Build all targets that have the \fBbench = true\fR
 manifest flag set. By default this includes the library and binaries built
 as benchmarks, and bench targets. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
diff --git a/src/etc/man/cargo-check.1 b/src/etc/man/cargo-check.1
@@ -103,7 +103,7 @@ multiple times and supports common Unix glob patterns.
 .sp
 \fB\-\-tests\fR
 .RS 4
-Check all targets in test mode that have the \fBtest = true\fR manifest
+Check all targets that have the \fBtest = true\fR manifest
 flag set. By default this includes the library and binaries built as
 unittests, and integration tests. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
@@ -120,7 +120,7 @@ times and supports common Unix glob patterns.
 .sp
 \fB\-\-benches\fR
 .RS 4
-Check all targets in benchmark mode that have the \fBbench = true\fR
+Check all targets that have the \fBbench = true\fR
 manifest flag set. By default this includes the library and binaries built
 as benchmarks, and bench targets. Be aware that this will also build any
 required dependencies, so the lib target may be built twice (once as a
diff --git a/src/etc/man/cargo-fix.1 b/src/etc/man/cargo-fix.1
diff --git a/src/etc/man/cargo-rustc.1 b/src/etc/man/cargo-rustc.1
diff --git a/src/etc/man/cargo-rustdoc.1 b/src/etc/man/cargo-rustdoc.1
diff --git a/src/etc/man/cargo-test.1 b/src/etc/man/cargo-test.1
diff --git a/tests/testsuite/cargo_test/help/stdout.term.svg b/tests/testsuite/cargo_test/help/stdout.term.svg

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ pub fn cli() -> Command {`
`43`	`43`	`"Test only the specified test target",`
`44`	`44`	"Test all targets that have `test = true` set",
`45`	`45`	`"Test only the specified bench target",`
`46`		- "Test all targets in benchmark mode that have `bench = true` set",
	`46`	+ "Test all targets that have `bench = true` set",
`47`	`47`	`"Test all targets (does not include doctests)",`
`48`	`48`	`)`
`49`	`49`	`.arg(`