Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove mention of --message-format taking multiple values #9173

Merged
merged 1 commit into from
Feb 15, 2021
+224 −150
Merged

Remove mention of --message-format taking multiple values #9173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/doc/man/generated_txt/cargo-bench.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,24 +241,28 @@ OPTIONS
times and consists of comma-separated values. Valid values:

o human (default): Display in a human-readable text format.
Conflicts with short and json.

o short: Emit shorter, human-readable text messages.
o short: Emit shorter, human-readable text messages. Conflicts with
human and json.

o json: Emit JSON messages to stdout. See the reference
<https://doc.rust-lang.org/cargo/reference/external-tools.html#json-messages>
for more details.
for more details. Conflicts with human and short.

o json-diagnostic-short: Ensure the rendered field of JSON messages
contains the "short" rendering from rustc.
contains the "short" rendering from rustc. Cannot be used with
human or short.

o json-diagnostic-rendered-ansi: Ensure the rendered field of JSON
messages contains embedded ANSI color codes for respecting
rustc's default color scheme.
rustc's default color scheme. Cannot be used with human or short.

o json-render-diagnostics: Instruct Cargo to not include rustc
diagnostics in in JSON messages printed, but instead Cargo itself
should render the JSON diagnostics coming from rustc. Cargo's own
JSON diagnostics and others coming from rustc are still emitted.
Cannot be used with human or short.

Manifest Options
--manifest-path path
Expand Down
12 changes: 8 additions & 4 deletions src/doc/man/generated_txt/cargo-build.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,24 +190,28 @@ OPTIONS
times and consists of comma-separated values. Valid values:

o human (default): Display in a human-readable text format.
Conflicts with short and json.

o short: Emit shorter, human-readable text messages.
o short: Emit shorter, human-readable text messages. Conflicts with
human and json.

o json: Emit JSON messages to stdout. See the reference
<https://doc.rust-lang.org/cargo/reference/external-tools.html#json-messages>
for more details.
for more details. Conflicts with human and short.

o json-diagnostic-short: Ensure the rendered field of JSON messages
contains the "short" rendering from rustc.
contains the "short" rendering from rustc. Cannot be used with
human or short.

o json-diagnostic-rendered-ansi: Ensure the rendered field of JSON
messages contains embedded ANSI color codes for respecting
rustc's default color scheme.
rustc's default color scheme. Cannot be used with human or short.

o json-render-diagnostics: Instruct Cargo to not include rustc
diagnostics in in JSON messages printed, but instead Cargo itself
should render the JSON diagnostics coming from rustc. Cargo's own
JSON diagnostics and others coming from rustc are still emitted.
Cannot be used with human or short.

--build-plan
Outputs a series of JSON messages to stdout that indicate the
Expand Down
12 changes: 8 additions & 4 deletions src/doc/man/generated_txt/cargo-check.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,24 +194,28 @@ OPTIONS
times and consists of comma-separated values. Valid values:

o human (default): Display in a human-readable text format.
Conflicts with short and json.

o short: Emit shorter, human-readable text messages.
o short: Emit shorter, human-readable text messages. Conflicts with
human and json.

o json: Emit JSON messages to stdout. See the reference
<https://doc.rust-lang.org/cargo/reference/external-tools.html#json-messages>
for more details.
for more details. Conflicts with human and short.

o json-diagnostic-short: Ensure the rendered field of JSON messages
contains the "short" rendering from rustc.
contains the "short" rendering from rustc. Cannot be used with
human or short.

o json-diagnostic-rendered-ansi: Ensure the rendered field of JSON
messages contains embedded ANSI color codes for respecting
rustc's default color scheme.
rustc's default color scheme. Cannot be used with human or short.

o json-render-diagnostics: Instruct Cargo to not include rustc
diagnostics in in JSON messages printed, but instead Cargo itself
should render the JSON diagnostics coming from rustc. Cargo's own
JSON diagnostics and others coming from rustc are still emitted.
Cannot be used with human or short.

Manifest Options
--manifest-path path
Expand Down
12 changes: 8 additions & 4 deletions src/doc/man/generated_txt/cargo-doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,24 +156,28 @@ OPTIONS
times and consists of comma-separated values. Valid values:

o human (default): Display in a human-readable text format.
Conflicts with short and json.

o short: Emit shorter, human-readable text messages.
o short: Emit shorter, human-readable text messages. Conflicts with
human and json.

o json: Emit JSON messages to stdout. See the reference
<https://doc.rust-lang.org/cargo/reference/external-tools.html#json-messages>
for more details.
for more details. Conflicts with human and short.

o json-diagnostic-short: Ensure the rendered field of JSON messages
contains the "short" rendering from rustc.
contains the "short" rendering from rustc. Cannot be used with
human or short.

o json-diagnostic-rendered-ansi: Ensure the rendered field of JSON
messages contains embedded ANSI color codes for respecting
rustc's default color scheme.
rustc's default color scheme. Cannot be used with human or short.

o json-render-diagnostics: Instruct Cargo to not include rustc
diagnostics in in JSON messages printed, but instead Cargo itself
should render the JSON diagnostics coming from rustc. Cargo's own
JSON diagnostics and others coming from rustc are still emitted.
Cannot be used with human or short.

Manifest Options
--manifest-path path
Expand Down
12 changes: 8 additions & 4 deletions src/doc/man/generated_txt/cargo-fix.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,24 +243,28 @@ OPTIONS
times and consists of comma-separated values. Valid values:

o human (default): Display in a human-readable text format.
Conflicts with short and json.

o short: Emit shorter, human-readable text messages.
o short: Emit shorter, human-readable text messages. Conflicts with
human and json.

o json: Emit JSON messages to stdout. See the reference
<https://doc.rust-lang.org/cargo/reference/external-tools.html#json-messages>
for more details.
for more details. Conflicts with human and short.

o json-diagnostic-short: Ensure the rendered field of JSON messages
contains the "short" rendering from rustc.
contains the "short" rendering from rustc. Cannot be used with
human or short.

o json-diagnostic-rendered-ansi: Ensure the rendered field of JSON
messages contains embedded ANSI color codes for respecting
rustc's default color scheme.
rustc's default color scheme. Cannot be used with human or short.

o json-render-diagnostics: Instruct Cargo to not include rustc
diagnostics in in JSON messages printed, but instead Cargo itself
should render the JSON diagnostics coming from rustc. Cargo's own
JSON diagnostics and others coming from rustc are still emitted.
Cannot be used with human or short.

Manifest Options
--manifest-path path
Expand Down
12 changes: 8 additions & 4 deletions src/doc/man/generated_txt/cargo-run.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,24 +111,28 @@ OPTIONS
times and consists of comma-separated values. Valid values:

o human (default): Display in a human-readable text format.
Conflicts with short and json.

o short: Emit shorter, human-readable text messages.
o short: Emit shorter, human-readable text messages. Conflicts with
human and json.

o json: Emit JSON messages to stdout. See the reference
<https://doc.rust-lang.org/cargo/reference/external-tools.html#json-messages>
for more details.
for more details. Conflicts with human and short.

o json-diagnostic-short: Ensure the rendered field of JSON messages
contains the "short" rendering from rustc.
contains the "short" rendering from rustc. Cannot be used with
human or short.

o json-diagnostic-rendered-ansi: Ensure the rendered field of JSON
messages contains embedded ANSI color codes for respecting
rustc's default color scheme.
rustc's default color scheme. Cannot be used with human or short.

o json-render-diagnostics: Instruct Cargo to not include rustc
diagnostics in in JSON messages printed, but instead Cargo itself
should render the JSON diagnostics coming from rustc. Cargo's own
JSON diagnostics and others coming from rustc are still emitted.
Cannot be used with human or short.

Manifest Options
--manifest-path path
Expand Down
12 changes: 8 additions & 4 deletions src/doc/man/generated_txt/cargo-rustc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,24 +173,28 @@ OPTIONS
times and consists of comma-separated values. Valid values:

o human (default): Display in a human-readable text format.
Conflicts with short and json.

o short: Emit shorter, human-readable text messages.
o short: Emit shorter, human-readable text messages. Conflicts with
human and json.

o json: Emit JSON messages to stdout. See the reference
<https://doc.rust-lang.org/cargo/reference/external-tools.html#json-messages>
for more details.
for more details. Conflicts with human and short.

o json-diagnostic-short: Ensure the rendered field of JSON messages
contains the "short" rendering from rustc.
contains the "short" rendering from rustc. Cannot be used with
human or short.

o json-diagnostic-rendered-ansi: Ensure the rendered field of JSON
messages contains embedded ANSI color codes for respecting
rustc's default color scheme.
rustc's default color scheme. Cannot be used with human or short.

o json-render-diagnostics: Instruct Cargo to not include rustc
diagnostics in in JSON messages printed, but instead Cargo itself
should render the JSON diagnostics coming from rustc. Cargo's own
JSON diagnostics and others coming from rustc are still emitted.
Cannot be used with human or short.

Manifest Options
--manifest-path path
Expand Down
12 changes: 8 additions & 4 deletions src/doc/man/generated_txt/cargo-rustdoc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,24 +180,28 @@ OPTIONS
times and consists of comma-separated values. Valid values:

o human (default): Display in a human-readable text format.
Conflicts with short and json.

o short: Emit shorter, human-readable text messages.
o short: Emit shorter, human-readable text messages. Conflicts with
human and json.

o json: Emit JSON messages to stdout. See the reference
<https://doc.rust-lang.org/cargo/reference/external-tools.html#json-messages>
for more details.
for more details. Conflicts with human and short.

o json-diagnostic-short: Ensure the rendered field of JSON messages
contains the "short" rendering from rustc.
contains the "short" rendering from rustc. Cannot be used with
human or short.

o json-diagnostic-rendered-ansi: Ensure the rendered field of JSON
messages contains embedded ANSI color codes for respecting
rustc's default color scheme.
rustc's default color scheme. Cannot be used with human or short.

o json-render-diagnostics: Instruct Cargo to not include rustc
diagnostics in in JSON messages printed, but instead Cargo itself
should render the JSON diagnostics coming from rustc. Cargo's own
JSON diagnostics and others coming from rustc are still emitted.
Cannot be used with human or short.

Manifest Options
--manifest-path path
Expand Down
12 changes: 8 additions & 4 deletions src/doc/man/generated_txt/cargo-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,24 +263,28 @@ OPTIONS
times and consists of comma-separated values. Valid values:

o human (default): Display in a human-readable text format.
Conflicts with short and json.

o short: Emit shorter, human-readable text messages.
o short: Emit shorter, human-readable text messages. Conflicts with
human and json.

o json: Emit JSON messages to stdout. See the reference
<https://doc.rust-lang.org/cargo/reference/external-tools.html#json-messages>
for more details.
for more details. Conflicts with human and short.

o json-diagnostic-short: Ensure the rendered field of JSON messages
contains the "short" rendering from rustc.
contains the "short" rendering from rustc. Cannot be used with
human or short.

o json-diagnostic-rendered-ansi: Ensure the rendered field of JSON
messages contains embedded ANSI color codes for respecting
rustc's default color scheme.
rustc's default color scheme. Cannot be used with human or short.

o json-render-diagnostics: Instruct Cargo to not include rustc
diagnostics in in JSON messages printed, but instead Cargo itself
should render the JSON diagnostics coming from rustc. Cargo's own
JSON diagnostics and others coming from rustc are still emitted.
Cannot be used with human or short.

Manifest Options
--manifest-path path
Expand Down
14 changes: 8 additions & 6 deletions src/doc/man/includes/options-message-format.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@
The output format for diagnostic messages. Can be specified multiple times
and consists of comma-separated values. Valid values:

- `human` (default): Display in a human-readable text format.
- `short`: Emit shorter, human-readable text messages.
- `human` (default): Display in a human-readable text format. Conflicts with
`short` and `json`.
- `short`: Emit shorter, human-readable text messages. Conflicts with `human`
and `json`.
- `json`: Emit JSON messages to stdout. See
[the reference](../reference/external-tools.html#json-messages)
for more details.
for more details. Conflicts with `human` and `short`.
- `json-diagnostic-short`: Ensure the `rendered` field of JSON messages contains
the "short" rendering from rustc.
the "short" rendering from rustc. Cannot be used with `human` or `short`.
- `json-diagnostic-rendered-ansi`: Ensure the `rendered` field of JSON messages
contains embedded ANSI color codes for respecting rustc's default color
scheme.
scheme. Cannot be used with `human` or `short`.
- `json-render-diagnostics`: Instruct Cargo to not include rustc diagnostics in
in JSON messages printed, but instead Cargo itself should render the
JSON diagnostics coming from rustc. Cargo's own JSON diagnostics and others
coming from rustc are still emitted.
coming from rustc are still emitted. Cannot be used with `human` or `short`.
{{/option}}
14 changes: 8 additions & 6 deletions src/doc/src/commands/cargo-bench.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,20 +296,22 @@ terminal.</li>
<dd class="option-desc">The output format for diagnostic messages. Can be specified multiple times
and consists of comma-separated values. Valid values:</p>
<ul>
<li><code>human</code> (default): Display in a human-readable text format.</li>
<li><code>short</code>: Emit shorter, human-readable text messages.</li>
<li><code>human</code> (default): Display in a human-readable text format. Conflicts with
<code>short</code> and <code>json</code>.</li>
<li><code>short</code>: Emit shorter, human-readable text messages. Conflicts with <code>human</code>
and <code>json</code>.</li>
<li><code>json</code>: Emit JSON messages to stdout. See
<a href="../reference/external-tools.html#json-messages">the reference</a>
for more details.</li>
for more details. Conflicts with <code>human</code> and <code>short</code>.</li>
<li><code>json-diagnostic-short</code>: Ensure the <code>rendered</code> field of JSON messages contains
the &quot;short&quot; rendering from rustc.</li>
the &quot;short&quot; rendering from rustc. Cannot be used with <code>human</code> or <code>short</code>.</li>
<li><code>json-diagnostic-rendered-ansi</code>: Ensure the <code>rendered</code> field of JSON messages
contains embedded ANSI color codes for respecting rustc's default color
scheme.</li>
scheme. Cannot be used with <code>human</code> or <code>short</code>.</li>
<li><code>json-render-diagnostics</code>: Instruct Cargo to not include rustc diagnostics in
in JSON messages printed, but instead Cargo itself should render the
JSON diagnostics coming from rustc. Cargo's own JSON diagnostics and others
coming from rustc are still emitted.</li>
coming from rustc are still emitted. Cannot be used with <code>human</code> or <code>short</code>.</li>
</ul></dd>


Expand Down
14 changes: 8 additions & 6 deletions src/doc/src/commands/cargo-build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,20 +244,22 @@ terminal.</li>
<dd class="option-desc">The output format for diagnostic messages. Can be specified multiple times
and consists of comma-separated values. Valid values:</p>
<ul>
<li><code>human</code> (default): Display in a human-readable text format.</li>
<li><code>short</code>: Emit shorter, human-readable text messages.</li>
<li><code>human</code> (default): Display in a human-readable text format. Conflicts with
<code>short</code> and <code>json</code>.</li>
<li><code>short</code>: Emit shorter, human-readable text messages. Conflicts with <code>human</code>
and <code>json</code>.</li>
<li><code>json</code>: Emit JSON messages to stdout. See
<a href="../reference/external-tools.html#json-messages">the reference</a>
for more details.</li>
for more details. Conflicts with <code>human</code> and <code>short</code>.</li>
<li><code>json-diagnostic-short</code>: Ensure the <code>rendered</code> field of JSON messages contains
the &quot;short&quot; rendering from rustc.</li>
the &quot;short&quot; rendering from rustc. Cannot be used with <code>human</code> or <code>short</code>.</li>
<li><code>json-diagnostic-rendered-ansi</code>: Ensure the <code>rendered</code> field of JSON messages
contains embedded ANSI color codes for respecting rustc's default color
scheme.</li>
scheme. Cannot be used with <code>human</code> or <code>short</code>.</li>
<li><code>json-render-diagnostics</code>: Instruct Cargo to not include rustc diagnostics in
in JSON messages printed, but instead Cargo itself should render the
JSON diagnostics coming from rustc. Cargo's own JSON diagnostics and others
coming from rustc are still emitted.</li>
coming from rustc are still emitted. Cannot be used with <code>human</code> or <code>short</code>.</li>
</ul></dd>


Expand Down
Loading