Make --timings require = if passing an argument

This avoids ambiguity between its optional argument and positional
arguments.

src/cargo/util/command_prelude.rs

@@ -236,11 +236,14 @@ pub trait AppExt: Sized {
     }
 
     fn arg_timings(self) -> Self {
-        self._arg(optional_multi_opt(
-            "timings",
-            "FMTS",
-            "Timing output formats (comma separated): html, json (unstable)",
-        ))
+        self._arg(
+            optional_opt(
+                "timings",
+                "Timing output formats (comma separated): html, json (unstable)",
+            )
+            .value_name("FMTS")
+            .require_equals(true),
+        )
     }
 }
 

src/doc/man/generated_txt/cargo-bench.txt

@@ -219,7 +219,7 @@ OPTIONS
            than the required Rust version as configured in the project's
            rust-version field.
 
-       --timings fmts
+       --timings=fmts
            Output information how long each compilation takes, and track
            concurrency information over time. Accepts an optional
            comma-separated list of output formats; --timing without an argument

src/doc/man/generated_txt/cargo-build.txt

@@ -156,7 +156,7 @@ OPTIONS
            the required Rust version as configured in the project's
            rust-version field.
 
-       --timings fmts
+       --timings=fmts
            Output information how long each compilation takes, and track
            concurrency information over time. Accepts an optional
            comma-separated list of output formats; --timing without an argument

src/doc/man/generated_txt/cargo-check.txt

@@ -169,7 +169,7 @@ OPTIONS
            the required Rust version as configured in the project's
            rust-version field.
 
-       --timings fmts
+       --timings=fmts
            Output information how long each compilation takes, and track
            concurrency information over time. Accepts an optional
            comma-separated list of output formats; --timing without an argument

src/doc/man/generated_txt/cargo-doc.txt

@@ -140,7 +140,7 @@ OPTIONS
            the required Rust version as configured in the project's
            rust-version field.
 
-       --timings fmts
+       --timings=fmts
            Output information how long each compilation takes, and track
            concurrency information over time. Accepts an optional
            comma-separated list of output formats; --timing without an argument

src/doc/man/generated_txt/cargo-fix.txt

@@ -242,7 +242,7 @@ OPTIONS
            required Rust version as configured in the project's rust-version
            field.
 
-       --timings fmts
+       --timings=fmts
            Output information how long each compilation takes, and track
            concurrency information over time. Accepts an optional
            comma-separated list of output formats; --timing without an argument

src/doc/man/generated_txt/cargo-install.txt

@@ -205,7 +205,7 @@ OPTIONS
            <https://doc.rust-lang.org/cargo/reference/profiles.html> for more
            details on profiles.
 
-       --timings fmts
+       --timings=fmts
            Output information how long each compilation takes, and track
            concurrency information over time. Accepts an optional
            comma-separated list of output formats; --timing without an argument

src/doc/man/generated_txt/cargo-run.txt

@@ -85,7 +85,7 @@ OPTIONS
            required Rust version as configured in the project's rust-version
            field.
 
-       --timings fmts
+       --timings=fmts
            Output information how long each compilation takes, and track
            concurrency information over time. Accepts an optional
            comma-separated list of output formats; --timing without an argument

src/doc/man/generated_txt/cargo-rustc.txt

@@ -164,7 +164,7 @@ OPTIONS
            the required Rust version as configured in the project's
            rust-version field.
 
-       --timings fmts
+       --timings=fmts
            Output information how long each compilation takes, and track
            concurrency information over time. Accepts an optional
            comma-separated list of output formats; --timing without an argument

src/doc/man/generated_txt/cargo-rustdoc.txt

@@ -156,7 +156,7 @@ OPTIONS
            the required Rust version as configured in the project's
            rust-version field.
 
-       --timings fmts
+       --timings=fmts
            Output information how long each compilation takes, and track
            concurrency information over time. Accepts an optional
            comma-separated list of output formats; --timing without an argument

src/doc/man/generated_txt/cargo-test.txt

@@ -233,7 +233,7 @@ OPTIONS
            required Rust version as configured in the project's rust-version
            field.
 
-       --timings fmts
+       --timings=fmts
            Output information how long each compilation takes, and track
            concurrency information over time. Accepts an optional
            comma-separated list of output formats; --timing without an argument

src/doc/man/includes/options-timings.md

@@ -1,4 +1,4 @@
-{{#option "`--timings` _fmts_"}}
+{{#option "`--timings=`_fmts_"}}
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma-separated list of output
 formats; `--timing` without an argument will default to `--timing=html`. Valid

src/doc/src/commands/cargo-bench.md

@@ -265,7 +265,7 @@ required Rust version as configured in the project's <code>rust-version</code> f
 
 
 
-<dt class="option-term" id="option-cargo-bench---timings"><a class="option-anchor" href="#option-cargo-bench---timings"></a><code>--timings</code> <em>fmts</em></dt>
+<dt class="option-term" id="option-cargo-bench---timings=fmts"><a class="option-anchor" href="#option-cargo-bench---timings=fmts"></a><code>--timings=</code><em>fmts</em></dt>
 <dd class="option-desc">Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma-separated list of output
 formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>. Valid

src/doc/src/commands/cargo-build.md

@@ -200,7 +200,7 @@ required Rust version as configured in the project's <code>rust-version</code> f
 
 
 
-<dt class="option-term" id="option-cargo-build---timings"><a class="option-anchor" href="#option-cargo-build---timings"></a><code>--timings</code> <em>fmts</em></dt>
+<dt class="option-term" id="option-cargo-build---timings=fmts"><a class="option-anchor" href="#option-cargo-build---timings=fmts"></a><code>--timings=</code><em>fmts</em></dt>
 <dd class="option-desc">Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma-separated list of output
 formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>. Valid

src/doc/src/commands/cargo-check.md

@@ -209,7 +209,7 @@ required Rust version as configured in the project's <code>rust-version</code> f
 
 
 
-<dt class="option-term" id="option-cargo-check---timings"><a class="option-anchor" href="#option-cargo-check---timings"></a><code>--timings</code> <em>fmts</em></dt>
+<dt class="option-term" id="option-cargo-check---timings=fmts"><a class="option-anchor" href="#option-cargo-check---timings=fmts"></a><code>--timings=</code><em>fmts</em></dt>
 <dd class="option-desc">Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma-separated list of output
 formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>. Valid

src/doc/src/commands/cargo-doc.md

@@ -183,7 +183,7 @@ required Rust version as configured in the project's <code>rust-version</code> f
 
 
 
-<dt class="option-term" id="option-cargo-doc---timings"><a class="option-anchor" href="#option-cargo-doc---timings"></a><code>--timings</code> <em>fmts</em></dt>
+<dt class="option-term" id="option-cargo-doc---timings=fmts"><a class="option-anchor" href="#option-cargo-doc---timings=fmts"></a><code>--timings=</code><em>fmts</em></dt>
 <dd class="option-desc">Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma-separated list of output
 formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>. Valid

src/doc/src/commands/cargo-fix.md

@@ -289,7 +289,7 @@ required Rust version as configured in the project's <code>rust-version</code> f
 
 
 
-<dt class="option-term" id="option-cargo-fix---timings"><a class="option-anchor" href="#option-cargo-fix---timings"></a><code>--timings</code> <em>fmts</em></dt>
+<dt class="option-term" id="option-cargo-fix---timings=fmts"><a class="option-anchor" href="#option-cargo-fix---timings=fmts"></a><code>--timings=</code><em>fmts</em></dt>
 <dd class="option-desc">Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma-separated list of output
 formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>. Valid

src/doc/src/commands/cargo-install.md

@@ -236,7 +236,7 @@ See the <a href="../reference/profiles.html">the reference</a> for more details
 
 
 
-<dt class="option-term" id="option-cargo-install---timings"><a class="option-anchor" href="#option-cargo-install---timings"></a><code>--timings</code> <em>fmts</em></dt>
+<dt class="option-term" id="option-cargo-install---timings=fmts"><a class="option-anchor" href="#option-cargo-install---timings=fmts"></a><code>--timings=</code><em>fmts</em></dt>
 <dd class="option-desc">Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma-separated list of output
 formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>. Valid

src/doc/src/commands/cargo-run.md

@@ -118,7 +118,7 @@ required Rust version as configured in the project's <code>rust-version</code> f
 
 
 
-<dt class="option-term" id="option-cargo-run---timings"><a class="option-anchor" href="#option-cargo-run---timings"></a><code>--timings</code> <em>fmts</em></dt>
+<dt class="option-term" id="option-cargo-run---timings=fmts"><a class="option-anchor" href="#option-cargo-run---timings=fmts"></a><code>--timings=</code><em>fmts</em></dt>
 <dd class="option-desc">Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma-separated list of output
 formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>. Valid

src/doc/src/commands/cargo-rustc.md

@@ -197,7 +197,7 @@ required Rust version as configured in the project's <code>rust-version</code> f
 
 
 
-<dt class="option-term" id="option-cargo-rustc---timings"><a class="option-anchor" href="#option-cargo-rustc---timings"></a><code>--timings</code> <em>fmts</em></dt>
+<dt class="option-term" id="option-cargo-rustc---timings=fmts"><a class="option-anchor" href="#option-cargo-rustc---timings=fmts"></a><code>--timings=</code><em>fmts</em></dt>
 <dd class="option-desc">Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma-separated list of output
 formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>. Valid

src/doc/src/commands/cargo-rustdoc.md

@@ -202,7 +202,7 @@ required Rust version as configured in the project's <code>rust-version</code> f
 
 
 
-<dt class="option-term" id="option-cargo-rustdoc---timings"><a class="option-anchor" href="#option-cargo-rustdoc---timings"></a><code>--timings</code> <em>fmts</em></dt>
+<dt class="option-term" id="option-cargo-rustdoc---timings=fmts"><a class="option-anchor" href="#option-cargo-rustdoc---timings=fmts"></a><code>--timings=</code><em>fmts</em></dt>
 <dd class="option-desc">Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma-separated list of output
 formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>. Valid

src/doc/src/commands/cargo-test.md

@@ -281,7 +281,7 @@ required Rust version as configured in the project's <code>rust-version</code> f
 
 
 
-<dt class="option-term" id="option-cargo-test---timings"><a class="option-anchor" href="#option-cargo-test---timings"></a><code>--timings</code> <em>fmts</em></dt>
+<dt class="option-term" id="option-cargo-test---timings=fmts"><a class="option-anchor" href="#option-cargo-test---timings=fmts"></a><code>--timings=</code><em>fmts</em></dt>
 <dd class="option-desc">Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma-separated list of output
 formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>. Valid

src/etc/man/cargo-bench.1

@@ -269,7 +269,7 @@ Benchmark the target even if the selected Rust compiler is older than the
 required Rust version as configured in the project's \fBrust\-version\fR field.
 .RE
 .sp
-\fB\-\-timings\fR \fIfmts\fR
+\fB\-\-timings=\fR\fIfmts\fR
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output

src/etc/man/cargo-build.1

@@ -188,7 +188,7 @@ Build the target even if the selected Rust compiler is older than the
 required Rust version as configured in the project's \fBrust\-version\fR field.
 .RE
 .sp
-\fB\-\-timings\fR \fIfmts\fR
+\fB\-\-timings=\fR\fIfmts\fR
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output

src/etc/man/cargo-check.1

@@ -199,7 +199,7 @@ Check the target even if the selected Rust compiler is older than the
 required Rust version as configured in the project's \fBrust\-version\fR field.
 .RE
 .sp
-\fB\-\-timings\fR \fIfmts\fR
+\fB\-\-timings=\fR\fIfmts\fR
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output

src/etc/man/cargo-doc.1

@@ -166,7 +166,7 @@ Document the target even if the selected Rust compiler is older than the
 required Rust version as configured in the project's \fBrust\-version\fR field.
 .RE
 .sp
-\fB\-\-timings\fR \fIfmts\fR
+\fB\-\-timings=\fR\fIfmts\fR
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output

src/etc/man/cargo-fix.1

@@ -294,7 +294,7 @@ Fix the target even if the selected Rust compiler is older than the
 required Rust version as configured in the project's \fBrust\-version\fR field.
 .RE
 .sp
-\fB\-\-timings\fR \fIfmts\fR
+\fB\-\-timings=\fR\fIfmts\fR
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output

src/etc/man/cargo-install.1

@@ -267,7 +267,7 @@ Install with the given profile.
 See the \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles.
 .RE
 .sp
-\fB\-\-timings\fR \fIfmts\fR
+\fB\-\-timings=\fR\fIfmts\fR
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output

src/etc/man/cargo-run.1

@@ -99,7 +99,7 @@ Run the target even if the selected Rust compiler is older than the
 required Rust version as configured in the project's \fBrust\-version\fR field.
 .RE
 .sp
-\fB\-\-timings\fR \fIfmts\fR
+\fB\-\-timings=\fR\fIfmts\fR
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output

src/etc/man/cargo-rustc.1

@@ -194,7 +194,7 @@ Build the target even if the selected Rust compiler is older than the
 required Rust version as configured in the project's \fBrust\-version\fR field.
 .RE
 .sp
-\fB\-\-timings\fR \fIfmts\fR
+\fB\-\-timings=\fR\fIfmts\fR
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output

src/etc/man/cargo-rustdoc.1

@@ -185,7 +185,7 @@ Document the target even if the selected Rust compiler is older than the
 required Rust version as configured in the project's \fBrust\-version\fR field.
 .RE
 .sp
-\fB\-\-timings\fR \fIfmts\fR
+\fB\-\-timings=\fR\fIfmts\fR
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output

src/etc/man/cargo-test.1

@@ -285,7 +285,7 @@ Test the target even if the selected Rust compiler is older than the
 required Rust version as configured in the project's \fBrust\-version\fR field.
 .RE
 .sp
-\fB\-\-timings\fR \fIfmts\fR
+\fB\-\-timings=\fR\fIfmts\fR
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output