Make --timings=html unstable, and only stabilize --timings

src/cargo/util/command_prelude.rs

@@ -239,7 +239,7 @@ pub trait AppExt: Sized {
         self._arg(
             optional_opt(
                 "timings",
-                "Timing output formats (comma separated): html, json (unstable)",
+                "Timing output formats (unstable) (comma separated): html, json",
             )
             .value_name("FMTS")
             .require_equals(true),
@@ -516,7 +516,12 @@ pub trait ArgMatchesExt {
                 for timing_output in timing_output.split(',') {
                     let timing_output = timing_output.to_ascii_lowercase();
                     let timing_output = match timing_output.as_str() {
-                        "html" => TimingOutput::Html,
+                        "html" => {
+                            config
+                                .cli_unstable()
+                                .fail_if_stable_opt("--timings=html", 7405)?;
+                            TimingOutput::Html
+                        }
                         "json" => {
                             config
                                 .cli_unstable()

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

@@ -223,7 +223,9 @@ OPTIONS
            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 output formats:
+           will default to --timing=html. Specifying an output format (rather
+           than the default) is unstable and requires -Zunstable-options. Valid
+           output formats:
 
            o  html: Write a human-readable file cargo-timing.html to the
               target/cargo-timings directory with a report of the compilation.

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

@@ -160,7 +160,9 @@ OPTIONS
            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 output formats:
+           will default to --timing=html. Specifying an output format (rather
+           than the default) is unstable and requires -Zunstable-options. Valid
+           output formats:
 
            o  html: Write a human-readable file cargo-timing.html to the
               target/cargo-timings directory with a report of the compilation.

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

@@ -173,7 +173,9 @@ OPTIONS
            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 output formats:
+           will default to --timing=html. Specifying an output format (rather
+           than the default) is unstable and requires -Zunstable-options. Valid
+           output formats:
 
            o  html: Write a human-readable file cargo-timing.html to the
               target/cargo-timings directory with a report of the compilation.

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

@@ -144,7 +144,9 @@ OPTIONS
            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 output formats:
+           will default to --timing=html. Specifying an output format (rather
+           than the default) is unstable and requires -Zunstable-options. Valid
+           output formats:
 
            o  html: Write a human-readable file cargo-timing.html to the
               target/cargo-timings directory with a report of the compilation.

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

@@ -246,7 +246,9 @@ OPTIONS
            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 output formats:
+           will default to --timing=html. Specifying an output format (rather
+           than the default) is unstable and requires -Zunstable-options. Valid
+           output formats:
 
            o  html: Write a human-readable file cargo-timing.html to the
               target/cargo-timings directory with a report of the compilation.

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

@@ -209,7 +209,9 @@ OPTIONS
            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 output formats:
+           will default to --timing=html. Specifying an output format (rather
+           than the default) is unstable and requires -Zunstable-options. Valid
+           output formats:
 
            o  html: Write a human-readable file cargo-timing.html to the
               target/cargo-timings directory with a report of the compilation.

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

@@ -89,7 +89,9 @@ OPTIONS
            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 output formats:
+           will default to --timing=html. Specifying an output format (rather
+           than the default) is unstable and requires -Zunstable-options. Valid
+           output formats:
 
            o  html: Write a human-readable file cargo-timing.html to the
               target/cargo-timings directory with a report of the compilation.

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

@@ -168,7 +168,9 @@ OPTIONS
            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 output formats:
+           will default to --timing=html. Specifying an output format (rather
+           than the default) is unstable and requires -Zunstable-options. Valid
+           output formats:
 
            o  html: Write a human-readable file cargo-timing.html to the
               target/cargo-timings directory with a report of the compilation.

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

@@ -160,7 +160,9 @@ OPTIONS
            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 output formats:
+           will default to --timing=html. Specifying an output format (rather
+           than the default) is unstable and requires -Zunstable-options. Valid
+           output formats:
 
            o  html: Write a human-readable file cargo-timing.html to the
               target/cargo-timings directory with a report of the compilation.

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

@@ -237,7 +237,9 @@ OPTIONS
            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 output formats:
+           will default to --timing=html. Specifying an output format (rather
+           than the default) is unstable and requires -Zunstable-options. Valid
+           output formats:
 
            o  html: Write a human-readable file cargo-timing.html to the
               target/cargo-timings directory with a report of the compilation.

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

@@ -1,8 +1,9 @@
 {{#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
-output formats:
+formats; `--timing` without an argument will default to `--timing=html`.
+Specifying an output format (rather than the default) is unstable and requires
+`-Zunstable-options`. Valid output formats:
 
 - `html`: Write a human-readable file `cargo-timing.html` to the
   `target/cargo-timings` directory with a report of the compilation. Also write

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

@@ -268,8 +268,9 @@ required Rust version as configured in the project's <code>rust-version</code> f
 <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
-output formats:</p>
+formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>.
+Specifying an output format (rather than the default) is unstable and requires
+<code>-Zunstable-options</code>. Valid output formats:</p>
 <ul>
 <li><code>html</code>: Write a human-readable file <code>cargo-timing.html</code> to the
 <code>target/cargo-timings</code> directory with a report of the compilation. Also write

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

@@ -203,8 +203,9 @@ required Rust version as configured in the project's <code>rust-version</code> f
 <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
-output formats:</p>
+formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>.
+Specifying an output format (rather than the default) is unstable and requires
+<code>-Zunstable-options</code>. Valid output formats:</p>
 <ul>
 <li><code>html</code>: Write a human-readable file <code>cargo-timing.html</code> to the
 <code>target/cargo-timings</code> directory with a report of the compilation. Also write

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

@@ -212,8 +212,9 @@ required Rust version as configured in the project's <code>rust-version</code> f
 <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
-output formats:</p>
+formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>.
+Specifying an output format (rather than the default) is unstable and requires
+<code>-Zunstable-options</code>. Valid output formats:</p>
 <ul>
 <li><code>html</code>: Write a human-readable file <code>cargo-timing.html</code> to the
 <code>target/cargo-timings</code> directory with a report of the compilation. Also write

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

@@ -186,8 +186,9 @@ required Rust version as configured in the project's <code>rust-version</code> f
 <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
-output formats:</p>
+formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>.
+Specifying an output format (rather than the default) is unstable and requires
+<code>-Zunstable-options</code>. Valid output formats:</p>
 <ul>
 <li><code>html</code>: Write a human-readable file <code>cargo-timing.html</code> to the
 <code>target/cargo-timings</code> directory with a report of the compilation. Also write

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

@@ -292,8 +292,9 @@ required Rust version as configured in the project's <code>rust-version</code> f
 <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
-output formats:</p>
+formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>.
+Specifying an output format (rather than the default) is unstable and requires
+<code>-Zunstable-options</code>. Valid output formats:</p>
 <ul>
 <li><code>html</code>: Write a human-readable file <code>cargo-timing.html</code> to the
 <code>target/cargo-timings</code> directory with a report of the compilation. Also write

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

@@ -239,8 +239,9 @@ See the <a href="../reference/profiles.html">the reference</a> for more details
 <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
-output formats:</p>
+formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>.
+Specifying an output format (rather than the default) is unstable and requires
+<code>-Zunstable-options</code>. Valid output formats:</p>
 <ul>
 <li><code>html</code>: Write a human-readable file <code>cargo-timing.html</code> to the
 <code>target/cargo-timings</code> directory with a report of the compilation. Also write

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

@@ -121,8 +121,9 @@ required Rust version as configured in the project's <code>rust-version</code> f
 <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
-output formats:</p>
+formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>.
+Specifying an output format (rather than the default) is unstable and requires
+<code>-Zunstable-options</code>. Valid output formats:</p>
 <ul>
 <li><code>html</code>: Write a human-readable file <code>cargo-timing.html</code> to the
 <code>target/cargo-timings</code> directory with a report of the compilation. Also write

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

@@ -200,8 +200,9 @@ required Rust version as configured in the project's <code>rust-version</code> f
 <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
-output formats:</p>
+formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>.
+Specifying an output format (rather than the default) is unstable and requires
+<code>-Zunstable-options</code>. Valid output formats:</p>
 <ul>
 <li><code>html</code>: Write a human-readable file <code>cargo-timing.html</code> to the
 <code>target/cargo-timings</code> directory with a report of the compilation. Also write

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

@@ -205,8 +205,9 @@ required Rust version as configured in the project's <code>rust-version</code> f
 <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
-output formats:</p>
+formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>.
+Specifying an output format (rather than the default) is unstable and requires
+<code>-Zunstable-options</code>. Valid output formats:</p>
 <ul>
 <li><code>html</code>: Write a human-readable file <code>cargo-timing.html</code> to the
 <code>target/cargo-timings</code> directory with a report of the compilation. Also write

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

@@ -284,8 +284,9 @@ required Rust version as configured in the project's <code>rust-version</code> f
 <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
-output formats:</p>
+formats; <code>--timing</code> without an argument will default to <code>--timing=html</code>.
+Specifying an output format (rather than the default) is unstable and requires
+<code>-Zunstable-options</code>. Valid output formats:</p>
 <ul>
 <li><code>html</code>: Write a human-readable file <code>cargo-timing.html</code> to the
 <code>target/cargo-timings</code> directory with a report of the compilation. Also write

src/doc/src/reference/unstable.md

@@ -1297,5 +1297,5 @@ See the [Features chapter](features.md#dependency-features) for more information
 ### timings
 
 The `-Ztimings` option has been stabilized as `--timings` in the 1.60 release.
-(The machine-readable `--timings=json` output remains unstable and requires
-`-Zunstable-options`.)
+(`--timings=html` and the machine-readable `--timings=json` output remain
+unstable and require `-Zunstable-options`.)

src/etc/man/cargo-bench.1

@@ -273,8 +273,9 @@ required Rust version as configured in the project's \fBrust\-version\fR field.
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output
-formats; \fB\-\-timing\fR without an argument will default to \fB\-\-timing=html\fR\&. Valid
-output formats:
+formats; \fB\-\-timing\fR without an argument will default to \fB\-\-timing=html\fR\&.
+Specifying an output format (rather than the default) is unstable and requires
+\fB\-Zunstable\-options\fR\&. Valid output formats:
 .sp
 .RS 4
 \h'-04'\(bu\h'+02'\fBhtml\fR: Write a human\-readable file \fBcargo\-timing.html\fR to the

src/etc/man/cargo-build.1

@@ -192,8 +192,9 @@ required Rust version as configured in the project's \fBrust\-version\fR field.
 .RS 4
 Output information how long each compilation takes, and track concurrency
 information over time. Accepts an optional comma\-separated list of output
-formats; \fB\-\-timing\fR without an argument will default to \fB\-\-timing=html\fR\&. Valid
-output formats:
+formats; \fB\-\-timing\fR without an argument will default to \fB\-\-timing=html\fR\&.
+Specifying an output format (rather than the default) is unstable and requires
+\fB\-Zunstable\-options\fR\&. Valid output formats:
 .sp
 .RS 4
 \h'-04'\(bu\h'+02'\fBhtml\fR: Write a human\-readable file \fBcargo\-timing.html\fR to the