Skip to content

Commit a9398e8

Browse files
authored
Unrolled build for #150319
Rollup merge of #150319 - tshepang:triple-is-tuple, r=Kivooeo use new term in description of --target this changes _triple_ to _tuple_ in `--target` description
2 parents 8796b3b + e796582 commit a9398e8

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

compiler/rustc_session/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1798,7 +1798,7 @@ pub fn rustc_optgroups() -> Vec<RustcOptGroup> {
17981798
"<OPT>",
17991799
),
18001800
opt(Stable, Flag, "", "test", "Build a test harness", ""),
1801-
opt(Stable, Opt, "", "target", "Target triple for which the code is compiled", "<TARGET>"),
1801+
opt(Stable, Opt, "", "target", "Target tuple for which the code is compiled", "<TARGET>"),
18021802
opt(Stable, Multi, "A", "allow", "Set lint allowed", "<LINT>"),
18031803
opt(Stable, Multi, "W", "warn", "Set lint warnings", "<LINT>"),
18041804
opt(Stable, Multi, "", "force-warn", "Set lint force-warn", "<LINT>"),

src/doc/man/rustc.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ Provide a detailed explanation of an error message.
7979
Build a test harness.
8080
.TP
8181
\fB\-\-target\fR \fITARGET\fR
82-
Target triple for which the code is compiled. This option defaults to the host’s target
83-
triple. The target triple has the general format <arch><sub>\-<vendor>\-<sys>\-<abi>, where:
82+
Target tuple for which the code is compiled. This option defaults to the host’s target
83+
tuple. The target tuple has the general format <arch><sub>\-<vendor>\-<sys>\-<abi>, where:
8484
.RS
8585
.TP
8686
.B <arch>

src/doc/rustc/src/command-line-arguments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ and instead produce a test harness. See the [Tests chapter](tests/index.md)
284284
for more information about tests.
285285

286286
<a id="option-target"></a>
287-
## `--target`: select a target triple to build
287+
## `--target`: select a target tuple to build
288288

289289
This controls which [target](targets/index.md) to produce.
290290

tests/run-make/rustc-help/help-v.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Options:
5151
--explain <OPT> Provide a detailed explanation of an error message
5252
--test Build a test harness
5353
--target <TARGET>
54-
Target triple for which the code is compiled
54+
Target tuple for which the code is compiled
5555
-A, --allow <LINT> Set lint allowed
5656
-W, --warn <LINT> Set lint warnings
5757
--force-warn <LINT>

tests/run-make/rustc-help/help.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Options:
5151
--explain <OPT> Provide a detailed explanation of an error message
5252
--test Build a test harness
5353
--target <TARGET>
54-
Target triple for which the code is compiled
54+
Target tuple for which the code is compiled
5555
-A, --allow <LINT> Set lint allowed
5656
-W, --warn <LINT> Set lint warnings
5757
--force-warn <LINT>

0 commit comments

Comments
 (0)