Skip to content

Commit

Permalink
Auto merge of #10941 - hi-rustin:rustin-patch-docs, r=weihanglo
Browse files Browse the repository at this point in the history
Mark --timings=html unstable in the document

### What does this PR try to resolve?

Mark -timings=html unstable in the document. The document was confusing because if you try `--timings=html` it still requires the unstable flag.

### How should we test and review this PR?

Check out the document.

### Additional information

Other information you want to mention in this PR, such as prior arts,
future extensions, an unresolved problem, or a TODO list.
  • Loading branch information
bors committed Aug 5, 2022
2 parents 5ac9be2 + a6e6b89 commit 40d71af
Show file tree
Hide file tree
Showing 31 changed files with 91 additions and 81 deletions.
13 changes: 7 additions & 6 deletions src/doc/man/generated_txt/cargo-bench.txt
Original file line number Diff line number Diff line change
Expand Up @@ -238,12 +238,13 @@ OPTIONS
(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.
Also write a report to the same directory with a timestamp in the
filename if you want to look at older runs. HTML output is
suitable for human consumption only, and does not provide
machine-readable timing data.
o html (unstable, requires -Zunstable-options): Write a
human-readable file cargo-timing.html to the target/cargo-timings
directory with a report of the compilation. Also write a report
to the same directory with a timestamp in the filename if you
want to look at older runs. HTML output is suitable for human
consumption only, and does not provide machine-readable timing
data.

o json (unstable, requires -Zunstable-options): Emit
machine-readable JSON information about timing information.
Expand Down
13 changes: 7 additions & 6 deletions src/doc/man/generated_txt/cargo-build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,13 @@ OPTIONS
(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.
Also write a report to the same directory with a timestamp in the
filename if you want to look at older runs. HTML output is
suitable for human consumption only, and does not provide
machine-readable timing data.
o html (unstable, requires -Zunstable-options): Write a
human-readable file cargo-timing.html to the target/cargo-timings
directory with a report of the compilation. Also write a report
to the same directory with a timestamp in the filename if you
want to look at older runs. HTML output is suitable for human
consumption only, and does not provide machine-readable timing
data.

o json (unstable, requires -Zunstable-options): Emit
machine-readable JSON information about timing information.
Expand Down
13 changes: 7 additions & 6 deletions src/doc/man/generated_txt/cargo-check.txt
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,13 @@ OPTIONS
(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.
Also write a report to the same directory with a timestamp in the
filename if you want to look at older runs. HTML output is
suitable for human consumption only, and does not provide
machine-readable timing data.
o html (unstable, requires -Zunstable-options): Write a
human-readable file cargo-timing.html to the target/cargo-timings
directory with a report of the compilation. Also write a report
to the same directory with a timestamp in the filename if you
want to look at older runs. HTML output is suitable for human
consumption only, and does not provide machine-readable timing
data.

o json (unstable, requires -Zunstable-options): Emit
machine-readable JSON information about timing information.
Expand Down
13 changes: 7 additions & 6 deletions src/doc/man/generated_txt/cargo-doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,13 @@ OPTIONS
(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.
Also write a report to the same directory with a timestamp in the
filename if you want to look at older runs. HTML output is
suitable for human consumption only, and does not provide
machine-readable timing data.
o html (unstable, requires -Zunstable-options): Write a
human-readable file cargo-timing.html to the target/cargo-timings
directory with a report of the compilation. Also write a report
to the same directory with a timestamp in the filename if you
want to look at older runs. HTML output is suitable for human
consumption only, and does not provide machine-readable timing
data.

o json (unstable, requires -Zunstable-options): Emit
machine-readable JSON information about timing information.
Expand Down
13 changes: 7 additions & 6 deletions src/doc/man/generated_txt/cargo-fix.txt
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,13 @@ OPTIONS
(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.
Also write a report to the same directory with a timestamp in the
filename if you want to look at older runs. HTML output is
suitable for human consumption only, and does not provide
machine-readable timing data.
o html (unstable, requires -Zunstable-options): Write a
human-readable file cargo-timing.html to the target/cargo-timings
directory with a report of the compilation. Also write a report
to the same directory with a timestamp in the filename if you
want to look at older runs. HTML output is suitable for human
consumption only, and does not provide machine-readable timing
data.

o json (unstable, requires -Zunstable-options): Emit
machine-readable JSON information about timing information.
Expand Down
13 changes: 7 additions & 6 deletions src/doc/man/generated_txt/cargo-install.txt
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,13 @@ OPTIONS
(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.
Also write a report to the same directory with a timestamp in the
filename if you want to look at older runs. HTML output is
suitable for human consumption only, and does not provide
machine-readable timing data.
o html (unstable, requires -Zunstable-options): Write a
human-readable file cargo-timing.html to the target/cargo-timings
directory with a report of the compilation. Also write a report
to the same directory with a timestamp in the filename if you
want to look at older runs. HTML output is suitable for human
consumption only, and does not provide machine-readable timing
data.

o json (unstable, requires -Zunstable-options): Emit
machine-readable JSON information about timing information.
Expand Down
13 changes: 7 additions & 6 deletions src/doc/man/generated_txt/cargo-run.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,13 @@ OPTIONS
(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.
Also write a report to the same directory with a timestamp in the
filename if you want to look at older runs. HTML output is
suitable for human consumption only, and does not provide
machine-readable timing data.
o html (unstable, requires -Zunstable-options): Write a
human-readable file cargo-timing.html to the target/cargo-timings
directory with a report of the compilation. Also write a report
to the same directory with a timestamp in the filename if you
want to look at older runs. HTML output is suitable for human
consumption only, and does not provide machine-readable timing
data.

o json (unstable, requires -Zunstable-options): Emit
machine-readable JSON information about timing information.
Expand Down
13 changes: 7 additions & 6 deletions src/doc/man/generated_txt/cargo-rustc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,13 @@ OPTIONS
(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.
Also write a report to the same directory with a timestamp in the
filename if you want to look at older runs. HTML output is
suitable for human consumption only, and does not provide
machine-readable timing data.
o html (unstable, requires -Zunstable-options): Write a
human-readable file cargo-timing.html to the target/cargo-timings
directory with a report of the compilation. Also write a report
to the same directory with a timestamp in the filename if you
want to look at older runs. HTML output is suitable for human
consumption only, and does not provide machine-readable timing
data.

o json (unstable, requires -Zunstable-options): Emit
machine-readable JSON information about timing information.
Expand Down
13 changes: 7 additions & 6 deletions src/doc/man/generated_txt/cargo-rustdoc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,13 @@ OPTIONS
(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.
Also write a report to the same directory with a timestamp in the
filename if you want to look at older runs. HTML output is
suitable for human consumption only, and does not provide
machine-readable timing data.
o html (unstable, requires -Zunstable-options): Write a
human-readable file cargo-timing.html to the target/cargo-timings
directory with a report of the compilation. Also write a report
to the same directory with a timestamp in the filename if you
want to look at older runs. HTML output is suitable for human
consumption only, and does not provide machine-readable timing
data.

o json (unstable, requires -Zunstable-options): Emit
machine-readable JSON information about timing information.
Expand Down
13 changes: 7 additions & 6 deletions src/doc/man/generated_txt/cargo-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -256,12 +256,13 @@ OPTIONS
(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.
Also write a report to the same directory with a timestamp in the
filename if you want to look at older runs. HTML output is
suitable for human consumption only, and does not provide
machine-readable timing data.
o html (unstable, requires -Zunstable-options): Write a
human-readable file cargo-timing.html to the target/cargo-timings
directory with a report of the compilation. Also write a report
to the same directory with a timestamp in the filename if you
want to look at older runs. HTML output is suitable for human
consumption only, and does not provide machine-readable timing
data.

o json (unstable, requires -Zunstable-options): Emit
machine-readable JSON information about timing information.
Expand Down
2 changes: 1 addition & 1 deletion src/doc/man/includes/options-timings.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ formats; `--timings` without an argument will default to `--timings=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
- `html` (unstable, requires `-Zunstable-options`): Write a human-readable file `cargo-timing.html` to the
`target/cargo-timings` directory with a report of the compilation. Also write
a report to the same directory with a timestamp in the filename if you want
to look at older runs. HTML output is suitable for human consumption only,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-bench.md
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ formats; <code>--timings</code> without an argument will default to <code>--timi
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
<li><code>html</code> (unstable, requires <code>-Zunstable-options</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
a report to the same directory with a timestamp in the filename if you want
to look at older runs. HTML output is suitable for human consumption only,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ formats; <code>--timings</code> without an argument will default to <code>--timi
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
<li><code>html</code> (unstable, requires <code>-Zunstable-options</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
a report to the same directory with a timestamp in the filename if you want
to look at older runs. HTML output is suitable for human consumption only,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-check.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ formats; <code>--timings</code> without an argument will default to <code>--timi
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
<li><code>html</code> (unstable, requires <code>-Zunstable-options</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
a report to the same directory with a timestamp in the filename if you want
to look at older runs. HTML output is suitable for human consumption only,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ formats; <code>--timings</code> without an argument will default to <code>--timi
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
<li><code>html</code> (unstable, requires <code>-Zunstable-options</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
a report to the same directory with a timestamp in the filename if you want
to look at older runs. HTML output is suitable for human consumption only,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-fix.md
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ formats; <code>--timings</code> without an argument will default to <code>--timi
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
<li><code>html</code> (unstable, requires <code>-Zunstable-options</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
a report to the same directory with a timestamp in the filename if you want
to look at older runs. HTML output is suitable for human consumption only,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ formats; <code>--timings</code> without an argument will default to <code>--timi
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
<li><code>html</code> (unstable, requires <code>-Zunstable-options</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
a report to the same directory with a timestamp in the filename if you want
to look at older runs. HTML output is suitable for human consumption only,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-run.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ formats; <code>--timings</code> without an argument will default to <code>--timi
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
<li><code>html</code> (unstable, requires <code>-Zunstable-options</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
a report to the same directory with a timestamp in the filename if you want
to look at older runs. HTML output is suitable for human consumption only,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-rustc.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ formats; <code>--timings</code> without an argument will default to <code>--timi
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
<li><code>html</code> (unstable, requires <code>-Zunstable-options</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
a report to the same directory with a timestamp in the filename if you want
to look at older runs. HTML output is suitable for human consumption only,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-rustdoc.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ formats; <code>--timings</code> without an argument will default to <code>--timi
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
<li><code>html</code> (unstable, requires <code>-Zunstable-options</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
a report to the same directory with a timestamp in the filename if you want
to look at older runs. HTML output is suitable for human consumption only,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/commands/cargo-test.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ formats; <code>--timings</code> without an argument will default to <code>--timi
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
<li><code>html</code> (unstable, requires <code>-Zunstable-options</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
a report to the same directory with a timestamp in the filename if you want
to look at older runs. HTML output is suitable for human consumption only,
Expand Down
Loading

0 comments on commit 40d71af

Please sign in to comment.