diff --git a/src/cargo/core/compiler/compile_kind.rs b/src/cargo/core/compiler/compile_kind.rs index e9fe5464888..36b41c90e8a 100644 --- a/src/cargo/core/compiler/compile_kind.rs +++ b/src/cargo/core/compiler/compile_kind.rs @@ -87,10 +87,10 @@ impl CompileKind { let deduplicated_targets = targets .iter() .map(|value| { - // This neatly substitutes the manually-specified `host` target directive + // This neatly substitutes the manually-specified `host-tuple` target directive // with the compiling machine's target triple. - if value.as_str() == "host" { + if value.as_str() == "host-tuple" { let host_triple = env!("RUST_HOST_TARGET"); Ok(CompileKind::Target(CompileTarget::new(host_triple)?)) } else { diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs index b1e14523942..8cca036ab68 100644 --- a/src/cargo/util/command_prelude.rs +++ b/src/cargo/util/command_prelude.rs @@ -1260,10 +1260,12 @@ fn get_target_triples() -> Vec { } } - // Allow tab-completion for `host` as the desired target. - candidates.push(clap_complete::CompletionCandidate::new("host").help(Some( - concat!("alias for: ", env!("RUST_HOST_TARGET")).into(), - ))); + // Allow tab-completion for `host-tuple` as the desired target. + candidates.push( + clap_complete::CompletionCandidate::new("host-tuple").help(Some( + concat!("alias for: ", env!("RUST_HOST_TARGET")).into(), + )), + ); candidates } diff --git a/src/doc/man/generated_txt/cargo-bench.txt b/src/doc/man/generated_txt/cargo-bench.txt index 4b3c401d352..26791aff901 100644 --- a/src/doc/man/generated_txt/cargo-bench.txt +++ b/src/doc/man/generated_txt/cargo-bench.txt @@ -228,8 +228,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-build.txt b/src/doc/man/generated_txt/cargo-build.txt index 2f8247937ed..659c6752ba4 100644 --- a/src/doc/man/generated_txt/cargo-build.txt +++ b/src/doc/man/generated_txt/cargo-build.txt @@ -145,8 +145,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-check.txt b/src/doc/man/generated_txt/cargo-check.txt index 42be19298c8..b87593258aa 100644 --- a/src/doc/man/generated_txt/cargo-check.txt +++ b/src/doc/man/generated_txt/cargo-check.txt @@ -142,8 +142,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-clean.txt b/src/doc/man/generated_txt/cargo-clean.txt index 09feaf50b34..a81fb9095fc 100644 --- a/src/doc/man/generated_txt/cargo-clean.txt +++ b/src/doc/man/generated_txt/cargo-clean.txt @@ -53,8 +53,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-doc.txt b/src/doc/man/generated_txt/cargo-doc.txt index 9a1f6a022ac..b1f951ef12d 100644 --- a/src/doc/man/generated_txt/cargo-doc.txt +++ b/src/doc/man/generated_txt/cargo-doc.txt @@ -124,8 +124,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-fetch.txt b/src/doc/man/generated_txt/cargo-fetch.txt index 91e308f650f..ac8ea1f8f5a 100644 --- a/src/doc/man/generated_txt/cargo-fetch.txt +++ b/src/doc/man/generated_txt/cargo-fetch.txt @@ -33,8 +33,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-fix.txt b/src/doc/man/generated_txt/cargo-fix.txt index 56e131b45fe..d643bca9f19 100644 --- a/src/doc/man/generated_txt/cargo-fix.txt +++ b/src/doc/man/generated_txt/cargo-fix.txt @@ -216,8 +216,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-install.txt b/src/doc/man/generated_txt/cargo-install.txt index 2001a2cd0f9..36507aa2354 100644 --- a/src/doc/man/generated_txt/cargo-install.txt +++ b/src/doc/man/generated_txt/cargo-install.txt @@ -194,8 +194,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-package.txt b/src/doc/man/generated_txt/cargo-package.txt index 54c22628015..9ee3f8720b7 100644 --- a/src/doc/man/generated_txt/cargo-package.txt +++ b/src/doc/man/generated_txt/cargo-package.txt @@ -196,8 +196,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-publish.txt b/src/doc/man/generated_txt/cargo-publish.txt index c303754b2eb..d5170f0ccaf 100644 --- a/src/doc/man/generated_txt/cargo-publish.txt +++ b/src/doc/man/generated_txt/cargo-publish.txt @@ -117,8 +117,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-run.txt b/src/doc/man/generated_txt/cargo-run.txt index 9f5f3a610b1..c93094d0eaf 100644 --- a/src/doc/man/generated_txt/cargo-run.txt +++ b/src/doc/man/generated_txt/cargo-run.txt @@ -69,8 +69,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-rustc.txt b/src/doc/man/generated_txt/cargo-rustc.txt index 763b9b3bbec..baf6eafdb6a 100644 --- a/src/doc/man/generated_txt/cargo-rustc.txt +++ b/src/doc/man/generated_txt/cargo-rustc.txt @@ -136,8 +136,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-rustdoc.txt b/src/doc/man/generated_txt/cargo-rustdoc.txt index da7ee6b6e8b..95401d12d36 100644 --- a/src/doc/man/generated_txt/cargo-rustdoc.txt +++ b/src/doc/man/generated_txt/cargo-rustdoc.txt @@ -136,8 +136,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/generated_txt/cargo-test.txt b/src/doc/man/generated_txt/cargo-test.txt index fc74f7df03a..6190b1559ea 100644 --- a/src/doc/man/generated_txt/cargo-test.txt +++ b/src/doc/man/generated_txt/cargo-test.txt @@ -250,8 +250,8 @@ OPTIONS o Any supported target in rustc --print target-list. - o "host", which will internally be substituted by the host’s - target. This can be particularly useful if you’re + o "host-tuple", which will internally be substituted by the + host’s target. This can be particularly useful if you’re cross-compiling some crates, and don’t want to specify your host’s machine as a target (for instance, an xtask in a shared project that may be worked on by many hosts). diff --git a/src/doc/man/includes/options-target-triple.md b/src/doc/man/includes/options-target-triple.md index 977b52b9358..990599e3fa4 100644 --- a/src/doc/man/includes/options-target-triple.md +++ b/src/doc/man/includes/options-target-triple.md @@ -7,7 +7,7 @@ Possible values: - Any supported target in `rustc --print target-list`. -- `"host"`, which will internally be substituted by the host's target. This can be particularly useful if you're cross-compiling some crates, and don't want to specify your host's machine as a target (for instance, an `xtask` in a shared project that may be worked on by many hosts). +- `"host-tuple"`, which will internally be substituted by the host's target. This can be particularly useful if you're cross-compiling some crates, and don't want to specify your host's machine as a target (for instance, an `xtask` in a shared project that may be worked on by many hosts). - A path to a custom target specification. See [Custom Target Lookup Path](../../rustc/targets/custom.html#custom-target-lookup-path) for more information. diff --git a/src/doc/src/commands/cargo-bench.md b/src/doc/src/commands/cargo-bench.md index a1c51921ef4..0a0f24dcfab 100644 --- a/src/doc/src/commands/cargo-bench.md +++ b/src/doc/src/commands/cargo-bench.md @@ -261,7 +261,7 @@ be specified multiple times, which enables all specified features.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-build.md b/src/doc/src/commands/cargo-build.md index 64387551538..c6b82bee6b0 100644 --- a/src/doc/src/commands/cargo-build.md +++ b/src/doc/src/commands/cargo-build.md @@ -176,7 +176,7 @@ be specified multiple times, which enables all specified features.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-check.md b/src/doc/src/commands/cargo-check.md index a80c704532b..158c4f75e7f 100644 --- a/src/doc/src/commands/cargo-check.md +++ b/src/doc/src/commands/cargo-check.md @@ -172,7 +172,7 @@ be specified multiple times, which enables all specified features.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-clean.md b/src/doc/src/commands/cargo-clean.md index 1eb9881e770..cc24f7b3119 100644 --- a/src/doc/src/commands/cargo-clean.md +++ b/src/doc/src/commands/cargo-clean.md @@ -64,7 +64,7 @@ Defaults to target in the root of the workspace.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-doc.md b/src/doc/src/commands/cargo-doc.md index 76c07546429..0afb4f81052 100644 --- a/src/doc/src/commands/cargo-doc.md +++ b/src/doc/src/commands/cargo-doc.md @@ -153,7 +153,7 @@ be specified multiple times, which enables all specified features.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-fetch.md b/src/doc/src/commands/cargo-fetch.md index 443762465ce..81d3e5eb2dd 100644 --- a/src/doc/src/commands/cargo-fetch.md +++ b/src/doc/src/commands/cargo-fetch.md @@ -34,7 +34,7 @@ you plan to use Cargo without a network with the `--offline` flag.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-fix.md b/src/doc/src/commands/cargo-fix.md index 5a0dfccc96d..4f9eacf2888 100644 --- a/src/doc/src/commands/cargo-fix.md +++ b/src/doc/src/commands/cargo-fix.md @@ -252,7 +252,7 @@ be specified multiple times, which enables all specified features.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-install.md b/src/doc/src/commands/cargo-install.md index 8e272a80e80..c1e9471ca2b 100644 --- a/src/doc/src/commands/cargo-install.md +++ b/src/doc/src/commands/cargo-install.md @@ -217,7 +217,7 @@ be specified multiple times, which enables all specified features.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-package.md b/src/doc/src/commands/cargo-package.md index 5c75c0048f4..75cbf295cbd 100644 --- a/src/doc/src/commands/cargo-package.md +++ b/src/doc/src/commands/cargo-package.md @@ -207,7 +207,7 @@ single quotes or double quotes around each pattern.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-publish.md b/src/doc/src/commands/cargo-publish.md index 6b6081d8276..ccdb093cc05 100644 --- a/src/doc/src/commands/cargo-publish.md +++ b/src/doc/src/commands/cargo-publish.md @@ -127,7 +127,7 @@ single quotes or double quotes around each pattern.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-run.md b/src/doc/src/commands/cargo-run.md index 968dbda0010..3fae83c054f 100644 --- a/src/doc/src/commands/cargo-run.md +++ b/src/doc/src/commands/cargo-run.md @@ -93,7 +93,7 @@ be specified multiple times, which enables all specified features.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-rustc.md b/src/doc/src/commands/cargo-rustc.md index 73a168102bd..979c5731ee4 100644 --- a/src/doc/src/commands/cargo-rustc.md +++ b/src/doc/src/commands/cargo-rustc.md @@ -165,7 +165,7 @@ be specified multiple times, which enables all specified features.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-rustdoc.md b/src/doc/src/commands/cargo-rustdoc.md index 8ae1559e7da..4e0efe186a7 100644 --- a/src/doc/src/commands/cargo-rustdoc.md +++ b/src/doc/src/commands/cargo-rustdoc.md @@ -171,7 +171,7 @@ be specified multiple times, which enables all specified features.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/commands/cargo-test.md b/src/doc/src/commands/cargo-test.md index 9f8716bfc1b..1b6a31aa111 100644 --- a/src/doc/src/commands/cargo-test.md +++ b/src/doc/src/commands/cargo-test.md @@ -283,7 +283,7 @@ be specified multiple times, which enables all specified features.

Possible values:

This may also be specified with the build.target config value.

diff --git a/src/doc/src/reference/config.md b/src/doc/src/reference/config.md index b90aeb92e74..ecb68d71cc9 100644 --- a/src/doc/src/reference/config.md +++ b/src/doc/src/reference/config.md @@ -462,7 +462,7 @@ The default [target platform triples][target triple] to compile to. Possible values: - Any supported target in `rustc --print target-list`. -- `"host"`, which will internally be substituted by the host's target. This can be particularly useful if you're cross-compiling some crates, and don't want to specify your host's machine as a target (for instance, an `xtask` in a shared project that may be worked on by many hosts). +- `"host-tuple"`, which will internally be substituted by the host's target. This can be particularly useful if you're cross-compiling some crates, and don't want to specify your host's machine as a target (for instance, an `xtask` in a shared project that may be worked on by many hosts). - A path to a custom target specification. See [Custom Target Lookup Path](../../rustc/targets/custom.html#custom-target-lookup-path) for more information. Can be overridden with the `--target` CLI option. diff --git a/src/etc/man/cargo-bench.1 b/src/etc/man/cargo-bench.1 index 62f056e33ab..8683fdcf624 100644 --- a/src/etc/man/cargo-bench.1 +++ b/src/etc/man/cargo-bench.1 @@ -277,7 +277,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-build.1 b/src/etc/man/cargo-build.1 index dd478a54114..dfb32de2e4e 100644 --- a/src/etc/man/cargo-build.1 +++ b/src/etc/man/cargo-build.1 @@ -176,7 +176,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-check.1 b/src/etc/man/cargo-check.1 index 0fd8d9b3dab..a75ea2cc1d3 100644 --- a/src/etc/man/cargo-check.1 +++ b/src/etc/man/cargo-check.1 @@ -172,7 +172,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-clean.1 b/src/etc/man/cargo-clean.1 index 4ca8ed98b40..60edaebe37b 100644 --- a/src/etc/man/cargo-clean.1 +++ b/src/etc/man/cargo-clean.1 @@ -67,7 +67,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-doc.1 b/src/etc/man/cargo-doc.1 index cfae7bb3a4b..9b81b7a8fcf 100644 --- a/src/etc/man/cargo-doc.1 +++ b/src/etc/man/cargo-doc.1 @@ -147,7 +147,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-fetch.1 b/src/etc/man/cargo-fetch.1 index 726087901f7..c2f4fdd047f 100644 --- a/src/etc/man/cargo-fetch.1 +++ b/src/etc/man/cargo-fetch.1 @@ -35,7 +35,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-fix.1 b/src/etc/man/cargo-fix.1 index 0e79e99b89f..26ad4865be9 100644 --- a/src/etc/man/cargo-fix.1 +++ b/src/etc/man/cargo-fix.1 @@ -267,7 +267,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-install.1 b/src/etc/man/cargo-install.1 index 04c90640eaf..18994303af0 100644 --- a/src/etc/man/cargo-install.1 +++ b/src/etc/man/cargo-install.1 @@ -252,7 +252,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-package.1 b/src/etc/man/cargo-package.1 index 168f3152fcc..7d20c6f38fb 100644 --- a/src/etc/man/cargo-package.1 +++ b/src/etc/man/cargo-package.1 @@ -249,7 +249,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-publish.1 b/src/etc/man/cargo-publish.1 index 6d9d3a4a8d1..ba7f2bf68c4 100644 --- a/src/etc/man/cargo-publish.1 +++ b/src/etc/man/cargo-publish.1 @@ -142,7 +142,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-run.1 b/src/etc/man/cargo-run.1 index f1640ee60cd..16afce2753a 100644 --- a/src/etc/man/cargo-run.1 +++ b/src/etc/man/cargo-run.1 @@ -82,7 +82,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-rustc.1 b/src/etc/man/cargo-rustc.1 index 865e8db4c1c..c42752ef1b3 100644 --- a/src/etc/man/cargo-rustc.1 +++ b/src/etc/man/cargo-rustc.1 @@ -162,7 +162,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-rustdoc.1 b/src/etc/man/cargo-rustdoc.1 index 77f9bc4bf88..b033294da10 100644 --- a/src/etc/man/cargo-rustdoc.1 +++ b/src/etc/man/cargo-rustdoc.1 @@ -164,7 +164,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/src/etc/man/cargo-test.1 b/src/etc/man/cargo-test.1 index 83e3c09ff4d..22e22e51c0d 100644 --- a/src/etc/man/cargo-test.1 +++ b/src/etc/man/cargo-test.1 @@ -297,7 +297,7 @@ Possible values: .RE .sp .RS 4 -\h'-04'\(bu\h'+03'\fB"host"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). +\h'-04'\(bu\h'+03'\fB"host\-tuple"\fR, which will internally be substituted by the host\[cq]s target. This can be particularly useful if you\[cq]re cross\-compiling some crates, and don\[cq]t want to specify your host\[cq]s machine as a target (for instance, an \fBxtask\fR in a shared project that may be worked on by many hosts). .RE .sp .RS 4 diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs index e2f9009f0df..40c46480508 100644 --- a/tests/testsuite/cross_compile.rs +++ b/tests/testsuite/cross_compile.rs @@ -157,7 +157,7 @@ fn target_host_arg() { .file("src/lib.rs", r#""#) .build(); - p.cargo("build -v --target host") + p.cargo("build -v --target host-tuple") .with_stderr_contains("[RUNNING] `rustc [..] --target [HOST_TARGET] [..]`") .run(); } @@ -174,7 +174,7 @@ fn target_host_config() { &format!( r#" [build] - target = "host" + target = "host-tuple" "#, ), )