diff --git a/src/doc/man/cargo-bench.adoc b/src/doc/man/cargo-bench.adoc
index e1bdb149003..4b235acedb8 100644
--- a/src/doc/man/cargo-bench.adoc
+++ b/src/doc/man/cargo-bench.adoc
@@ -29,10 +29,12 @@ like `foobar`):
Benchmarks are built with the `--test` option to `rustc` which creates an
executable with a `main` function that automatically runs all functions
-annotated with the `#[bench]` attribute. The libtest harness may be disabled
-by setting `harness = false` in the target manifest settings, in which case
-your code will need to provide its own `main` function to handle running
-benchmarks.
+annotated with the `#[bench]` attribute. Cargo passes the `--bench` flag to
+the test harness to tell it to run only benchmarks.
+
+The libtest harness may be disabled by setting `harness = false` in the target
+manifest settings, in which case your code will need to provide its own `main`
+function to handle running benchmarks.
== OPTIONS
@@ -49,7 +51,7 @@ include::options-packages.adoc[]
When no target selection options are given, `cargo bench` will build the
following targets of the selected packages:
-- lib – used to link with binaries and benchmarks
+- lib — used to link with binaries and benchmarks
- bins (only if benchmark targets are built and required features are
available)
- lib as a benchmark
diff --git a/src/doc/man/cargo-install.adoc b/src/doc/man/cargo-install.adoc
index 71994bdc9e1..94be115de19 100644
--- a/src/doc/man/cargo-install.adoc
+++ b/src/doc/man/cargo-install.adoc
@@ -98,7 +98,7 @@ include::options-features.adoc[]
include::options-target-triple.adoc[]
*--debug*::
- Build in debug mode instead of release mode.
+ Build with the `dev` profile instead the `release` profile.
=== Miscellaneous Options
diff --git a/src/doc/man/cargo-login.adoc b/src/doc/man/cargo-login.adoc
index 70d90d1cdd7..17d0e66ad41 100644
--- a/src/doc/man/cargo-login.adoc
+++ b/src/doc/man/cargo-login.adoc
@@ -13,7 +13,7 @@ cargo-login - Save an API token from the registry locally
== DESCRIPTION
This command will save the API token to disk so that commands that require
-authentication (such as man:cargo-publish[1]) will be automatically
+authentication, such as man:cargo-publish[1], will be automatically
authenticated. The token is saved in `$CARGO_HOME/credentials`. `CARGO_HOME`
defaults to `.cargo` in your home directory.
@@ -27,10 +27,6 @@ Take care to keep the token secret, it should not be shared with anyone else.
=== Login Options
-*--host* _HOST_::
- Host to set the token for. This option does not affect the behavior of the
- login command, and only affects the message displayed.
-
include::options-registry.adoc[]
=== Display Options
diff --git a/src/doc/man/cargo-test.adoc b/src/doc/man/cargo-test.adoc
index 8e144fe44d3..252782531b5 100644
--- a/src/doc/man/cargo-test.adoc
+++ b/src/doc/man/cargo-test.adoc
@@ -28,13 +28,18 @@ output of `cargo test -- --help`. As an example, this will run all tests with
Tests are built with the `--test` option to `rustc` which creates an
executable with a `main` function that automatically runs all functions
-annotated with the `#[test]` attribute in multiple threads. The libtest
-harness may be disabled by setting `harness = false` in the target manifest
-settings, in which case your code will need to provide its own `main` function
-to handle running tests.
+annotated with the `\#[test]` attribute in multiple threads. `#[bench]`
+annotated functions will also be run with one iteration to verify that they
+are functional.
+
+The libtest harness may be disabled by setting `harness = false` in the target
+manifest settings, in which case your code will need to provide its own `main`
+function to handle running tests.
Documentation tests are also run by default, which is handled by `rustdoc`. It
-extracts code samples from documentation comments and executes them.
+extracts code samples from documentation comments and executes them. See the
+link:https://doc.rust-lang.org/rustdoc/[rustdoc book] for more information on
+writing doc tests.
== OPTIONS
@@ -51,10 +56,10 @@ include::options-packages.adoc[]
When no target selection options are given, `cargo test` will build the
following targets of the selected packages:
-- lib – used to link with binaries, examples, integration tests, and doc tests
+- lib — used to link with binaries, examples, integration tests, and doc tests
- bins (only if integration tests are built and required features are
available)
-- examples – to ensure they compile
+- examples — to ensure they compile
- lib as a unit test
- bins as unit tests
- integration tests
diff --git a/src/doc/man/cargo-update.adoc b/src/doc/man/cargo-update.adoc
index 71bea3b8088..c8a5274350a 100644
--- a/src/doc/man/cargo-update.adoc
+++ b/src/doc/man/cargo-update.adoc
@@ -42,6 +42,9 @@ If `-p` is not specified, all dependencies are updated.
set the package to. If the package comes from a git repository, this can
be a git revision (such as a SHA hash or tag).
+*--dry-run*::
+ Displays what would be updated, but doesn't actually write the lockfile.
+
=== Display Options
include::options-display.adoc[]
diff --git a/src/doc/man/generated/cargo-bench.html b/src/doc/man/generated/cargo-bench.html
index 71b4439d31e..dfdb65b1eee 100644
--- a/src/doc/man/generated/cargo-bench.html
+++ b/src/doc/man/generated/cargo-bench.html
@@ -34,10 +34,13 @@
DESCRIPTION
Benchmarks are built with the --test
option to rustc
which creates an
executable with a main
function that automatically runs all functions
-annotated with the #[bench]
attribute. The libtest harness may be disabled
-by setting harness = false
in the target manifest settings, in which case
-your code will need to provide its own main
function to handle running
-benchmarks.
+annotated with the
#[bench]
attribute. Cargo passes the
--bench
flag to
+the test harness to tell it to run only benchmarks.
+
+
+
The libtest harness may be disabled by setting harness = false
in the target
+manifest settings, in which case your code will need to provide its own main
+function to handle running benchmarks.
@@ -101,7 +104,7 @@ Target Selection
-
-
lib – used to link with binaries and benchmarks
+lib — used to link with binaries and benchmarks
-
bins (only if benchmark targets are built and required features are
@@ -159,10 +162,13 @@
Target Selection
- --tests
-
-
Benchmark all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting test = false
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting test = true
in the target settings.
+Benchmark all targets in test mode that have the test = true
manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the test
flag in the
+manifest settings for the target.
- --bench NAME…
-
@@ -170,15 +176,18 @@
Target Selection
- --benches
-
-
Benchmark all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting bench =
-false
in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting bench = true
in the target
-settings.
+Benchmark all targets in benchmark mode that have the bench = true
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the bench
flag in the
+manifest settings for the target.
- --all-targets
-
-
Benchmark all targets.
+Benchmark all targets. This is equivalent to specifying --lib --bins
+--tests --benches --examples
.
@@ -215,44 +224,14 @@ Compilation Options
- --target TRIPLE
-
-
Benchmark for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Benchmark for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
diff --git a/src/doc/man/generated/cargo-build.html b/src/doc/man/generated/cargo-build.html
index c6b6b556ddf..8739f29314e 100644
--- a/src/doc/man/generated/cargo-build.html
+++ b/src/doc/man/generated/cargo-build.html
@@ -91,10 +91,13 @@ Target Selection
--tests
-Build all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting test = false
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting test = true
in the target settings.
+Build all targets in test mode that have the test = true
manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the test
flag in the
+manifest settings for the target.
--bench NAME…
@@ -102,15 +105,18 @@ Target Selection
--benches
-Build all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting bench =
-false
in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting bench = true
in the target
-settings.
+Build all targets in benchmark mode that have the bench = true
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the bench
flag in the
+manifest settings for the target.
--all-targets
-Build all targets.
+Build all targets. This is equivalent to specifying --lib --bins
+--tests --benches --examples
.
@@ -147,48 +153,18 @@ Compilation Options
- --target TRIPLE
-
-
Build for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Build for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
- --release
-
-
Build artifacts in release mode, with optimizations. See the
+
Build optimized artifacts with the release
profile. See the
PROFILES section for details on how this affects profile selection.
@@ -356,11 +332,11 @@ PROFILES
dev
or test
profiles are used. If the --release
flag is given, then the
release
or bench
profiles are used.
-
+
-
-
-
+
+
+
@@ -376,7 +352,8 @@ PROFILES
release
|
-test, bench |
+test, bench, or any target
+ in "test" or "bench" mode |
test
|
bench
|
diff --git a/src/doc/man/generated/cargo-check.html b/src/doc/man/generated/cargo-check.html
index fc90c633d1f..8d98c14f85b 100644
--- a/src/doc/man/generated/cargo-check.html
+++ b/src/doc/man/generated/cargo-check.html
@@ -95,10 +95,13 @@ Target Selection
--tests
-Check all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting test = false
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting test = true
in the target settings.
+Check all targets in test mode that have the test = true
manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the test
flag in the
+manifest settings for the target.
--bench NAME…
@@ -106,15 +109,18 @@ Target Selection
--benches
-Check all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting bench =
-false
in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting bench = true
in the target
-settings.
+Check all targets in benchmark mode that have the bench = true
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the bench
flag in the
+manifest settings for the target.
--all-targets
-Check all targets.
+Check all targets. This is equivalent to specifying --lib --bins
+--tests --benches --examples
.
@@ -151,48 +157,18 @@ Compilation Options
- --target TRIPLE
-
-
Check for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Check for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
- --release
-
-
Check artifacts in release mode, with optimizations. See the
+
Check optimized artifacts with the release
profile. See the
PROFILES section for details on how this affects profile selection.
- --profile NAME
@@ -351,11 +327,11 @@ PROFILES
dev
or test
profiles are used. If the --release
flag is given, then the
release
or bench
profiles are used.
-
+
-
-
-
+
+
+
@@ -371,7 +347,8 @@ PROFILES
release
|
-test, bench |
+test, bench, or any target
+ in "test" or "bench" mode |
test
|
bench
|
diff --git a/src/doc/man/generated/cargo-clean.html b/src/doc/man/generated/cargo-clean.html
index 302cf634444..d5488dc4b20 100644
--- a/src/doc/man/generated/cargo-clean.html
+++ b/src/doc/man/generated/cargo-clean.html
@@ -65,44 +65,14 @@ Clean Options
- --target TRIPLE
-
-
Clean for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Clean for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
diff --git a/src/doc/man/generated/cargo-doc.html b/src/doc/man/generated/cargo-doc.html
index 28be3142d4d..a064ac2a6ea 100644
--- a/src/doc/man/generated/cargo-doc.html
+++ b/src/doc/man/generated/cargo-doc.html
@@ -133,48 +133,18 @@ Compilation Options
- --target TRIPLE
-
-
Document for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Document for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
- --release
-
-
Document artifacts in release mode, with optimizations. See the
+
Document optimized artifacts with the release
profile. See the
PROFILES section for details on how this affects profile selection.
@@ -325,11 +295,11 @@ PROFILES
dev
or test
profiles are used. If the --release
flag is given, then the
release
or bench
profiles are used.
-
+
-
-
-
+
+
+
@@ -345,7 +315,8 @@ PROFILES
release
|
-test, bench |
+test, bench, or any target
+ in "test" or "bench" mode |
test
|
bench
|
diff --git a/src/doc/man/generated/cargo-fetch.html b/src/doc/man/generated/cargo-fetch.html
index 845442f55d0..37114598976 100644
--- a/src/doc/man/generated/cargo-fetch.html
+++ b/src/doc/man/generated/cargo-fetch.html
@@ -37,44 +37,14 @@ Fetch options
- --target TRIPLE
-
-
Fetch for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Fetch for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
diff --git a/src/doc/man/generated/cargo-fix.html b/src/doc/man/generated/cargo-fix.html
index d425badcc96..6f5839e1323 100644
--- a/src/doc/man/generated/cargo-fix.html
+++ b/src/doc/man/generated/cargo-fix.html
@@ -166,10 +166,13 @@ Target Selection
- --tests
-
-
Fix all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting test = false
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting test = true
in the target settings.
+Fix all targets in test mode that have the test = true
manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the test
flag in the
+manifest settings for the target.
- --bench NAME…
-
@@ -177,15 +180,18 @@
Target Selection
- --benches
-
-
Fix all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting bench =
-false
in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting bench = true
in the target
-settings.
+Fix all targets in benchmark mode that have the bench = true
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the bench
flag in the
+manifest settings for the target.
- --all-targets
-
-
Fix all targets.
+Fix all targets. This is equivalent to specifying --lib --bins
+--tests --benches --examples
.
@@ -222,48 +228,18 @@ Compilation Options
- --target TRIPLE
-
-
Fix for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Fix for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
- --release
-
-
Fix artifacts in release mode, with optimizations. See the
+
Fix optimized artifacts with the release
profile. See the
PROFILES section for details on how this affects profile selection.
- --profile NAME
@@ -422,11 +398,11 @@ PROFILES
dev
or test
profiles are used. If the --release
flag is given, then the
release
or bench
profiles are used.
-
+
-
-
-
+
+
+
@@ -442,7 +418,8 @@ PROFILES
release
|
-test, bench |
+test, bench, or any target
+ in "test" or "bench" mode |
test
|
bench
|
diff --git a/src/doc/man/generated/cargo-install.html b/src/doc/man/generated/cargo-install.html
index f12e6f205db..5cbd1f384e1 100644
--- a/src/doc/man/generated/cargo-install.html
+++ b/src/doc/man/generated/cargo-install.html
@@ -172,48 +172,18 @@ Compilation Options
- --target TRIPLE
-
-
Install for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Install for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
- --debug
-
-
Build in debug mode instead of release mode.
+Build with the dev
profile instead the release
profile.
diff --git a/src/doc/man/generated/cargo-login.html b/src/doc/man/generated/cargo-login.html
index dd9c6a99a3e..9c2b518328c 100644
--- a/src/doc/man/generated/cargo-login.html
+++ b/src/doc/man/generated/cargo-login.html
@@ -15,7 +15,7 @@ DESCRIPTION
This command will save the API token to disk so that commands that require
-authentication (such as cargo-publish(1)) will be automatically
+authentication, such as cargo-publish(1), will be automatically
authenticated. The token is saved in $CARGO_HOME/credentials
. CARGO_HOME
defaults to .cargo
in your home directory.
@@ -37,11 +37,6 @@
OPTIONS
Login Options
-- --host HOST
--
-
Host to set the token for. This option does not affect the behavior of the
-login command, and only affects the message displayed.
-
- --registry REGISTRY
-
Alternative registry to use.
diff --git a/src/doc/man/generated/cargo-package.html b/src/doc/man/generated/cargo-package.html
index 934207fbe47..fe16e5d8fc6 100644
--- a/src/doc/man/generated/cargo-package.html
+++ b/src/doc/man/generated/cargo-package.html
@@ -99,44 +99,14 @@ Compilation Options
- --target TRIPLE
-
-
Package for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Package for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
- --target-dir DIRECTORY
-
diff --git a/src/doc/man/generated/cargo-publish.html b/src/doc/man/generated/cargo-publish.html
index 94e31365775..2e996d9fecd 100644
--- a/src/doc/man/generated/cargo-publish.html
+++ b/src/doc/man/generated/cargo-publish.html
@@ -98,44 +98,14 @@
Compilation Options
- --target TRIPLE
-
-
Publish for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Publish for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
- --target-dir DIRECTORY
-
diff --git a/src/doc/man/generated/cargo-run.html b/src/doc/man/generated/cargo-run.html
index 6149b8d87b1..b8f21c335cd 100644
--- a/src/doc/man/generated/cargo-run.html
+++ b/src/doc/man/generated/cargo-run.html
@@ -95,48 +95,18 @@
Compilation Options
- --target TRIPLE
-
-
Run for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Run for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
- --release
-
-
Run artifacts in release mode, with optimizations. See the
+
Run optimized artifacts with the release
profile. See the
PROFILES section for details on how this affects profile selection.
@@ -287,11 +257,11 @@ PROFILES
dev
or test
profiles are used. If the --release
flag is given, then the
release
or bench
profiles are used.
-
+
-
-
-
+
+
+
@@ -307,7 +277,8 @@ PROFILES
release
|
-test, bench |
+test, bench, or any target
+ in "test" or "bench" mode |
test
|
bench
|
diff --git a/src/doc/man/generated/cargo-rustc.html b/src/doc/man/generated/cargo-rustc.html
index a7eda076580..1a7a0fceb21 100644
--- a/src/doc/man/generated/cargo-rustc.html
+++ b/src/doc/man/generated/cargo-rustc.html
@@ -95,10 +95,13 @@ Target Selection
- --tests
-
-
Build all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting test = false
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting test = true
in the target settings.
+Build all targets in test mode that have the test = true
manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the test
flag in the
+manifest settings for the target.
- --bench NAME…
-
@@ -106,15 +109,18 @@
Target Selection
- --benches
-
-
Build all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting bench =
-false
in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting bench = true
in the target
-settings.
+Build all targets in benchmark mode that have the bench = true
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the bench
flag in the
+manifest settings for the target.
- --all-targets
-
-
Build all targets.
+Build all targets. This is equivalent to specifying --lib --bins
+--tests --benches --examples
.
@@ -151,48 +157,18 @@ Compilation Options
- --target TRIPLE
-
-
Build for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Build for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
- --release
-
-
Build artifacts in release mode, with optimizations. See the
+
Build optimized artifacts with the release
profile. See the
PROFILES section for details on how this affects profile selection.
@@ -343,11 +319,11 @@ PROFILES
dev
or test
profiles are used. If the --release
flag is given, then the
release
or bench
profiles are used.
-
+
-
-
-
+
+
+
@@ -363,7 +339,8 @@ PROFILES
release
|
-test, bench |
+test, bench, or any target
+ in "test" or "bench" mode |
test
|
bench
|
diff --git a/src/doc/man/generated/cargo-rustdoc.html b/src/doc/man/generated/cargo-rustdoc.html
index fbc44cbd601..22883b32f6e 100644
--- a/src/doc/man/generated/cargo-rustdoc.html
+++ b/src/doc/man/generated/cargo-rustdoc.html
@@ -108,10 +108,13 @@ Target Selection
- --tests
-
-
Document all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting test = false
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting test = true
in the target settings.
+Document all targets in test mode that have the test = true
manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the test
flag in the
+manifest settings for the target.
- --bench NAME…
-
@@ -119,15 +122,18 @@
Target Selection
- --benches
-
-
Document all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting bench =
-false
in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting bench = true
in the target
-settings.
+Document all targets in benchmark mode that have the bench = true
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the bench
flag in the
+manifest settings for the target.
- --all-targets
-
-
Document all targets.
+Document all targets. This is equivalent to specifying --lib --bins
+--tests --benches --examples
.
@@ -164,48 +170,18 @@ Compilation Options
- --target TRIPLE
-
-
Document for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Document for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
- --release
-
-
Document artifacts in release mode, with optimizations. See the
+
Document optimized artifacts with the release
profile. See the
PROFILES section for details on how this affects profile selection.
@@ -356,11 +332,11 @@ PROFILES
dev
or test
profiles are used. If the --release
flag is given, then the
release
or bench
profiles are used.
-
+
-
-
-
+
+
+
@@ -376,7 +352,8 @@ PROFILES
release
|
-test, bench |
+test, bench, or any target
+ in "test" or "bench" mode |
test
|
bench
|
diff --git a/src/doc/man/generated/cargo-test.html b/src/doc/man/generated/cargo-test.html
index 938be5c3df1..360c57158ca 100644
--- a/src/doc/man/generated/cargo-test.html
+++ b/src/doc/man/generated/cargo-test.html
@@ -33,14 +33,20 @@ DESCRIPTION
Tests are built with the --test
option to rustc
which creates an
executable with a main
function that automatically runs all functions
-annotated with the #[test]
attribute in multiple threads. The libtest
-harness may be disabled by setting harness = false
in the target manifest
-settings, in which case your code will need to provide its own main
function
-to handle running tests.
+annotated with the
#[test]
attribute in multiple threads.
#[bench]
+annotated functions will also be run with one iteration to verify that they
+are functional.
+
+
+
The libtest harness may be disabled by setting harness = false
in the target
+manifest settings, in which case your code will need to provide its own main
+function to handle running tests.
Documentation tests are also run by default, which is handled by rustdoc
. It
-extracts code samples from documentation comments and executes them.
+extracts code samples from documentation comments and executes them. See the
+
rustdoc book for more information on
+writing doc tests.
@@ -104,14 +110,14 @@ Target Selection
-
-
lib – used to link with binaries, examples, integration tests, and doc tests
+lib — used to link with binaries, examples, integration tests, and doc tests
-
bins (only if integration tests are built and required features are
available)
-
-
examples – to ensure they compile
+examples — to ensure they compile
-
lib as a unit test
@@ -171,10 +177,13 @@ Target Selection
- --tests
-
-
Test all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting test = false
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting test = true
in the target settings.
+Test all targets in test mode that have the test = true
manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the test
flag in the
+manifest settings for the target.
- --bench NAME…
-
@@ -182,15 +191,18 @@
Target Selection
- --benches
-
-
Test all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting bench =
-false
in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting bench = true
in the target
-settings.
+Test all targets in benchmark mode that have the bench = true
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the bench
flag in the
+manifest settings for the target.
- --all-targets
-
-
Test all targets.
+Test all targets. This is equivalent to specifying --lib --bins
+--tests --benches --examples
.
- --doc
-
@@ -232,48 +244,18 @@
Compilation Options
- --target TRIPLE
-
-
Test for the given architecture. The default is the host architecture.
-
-
The general format of the triple is <arch><sub>-<vendor>-<sys>-<abi>
where:
-
-
-
--
-
arch
= The base CPU architecture, for example x86_64
, i686
, arm
,
-thumb
, mips
, etc.
-
--
-
sub
= The CPU sub-architecture, for example arm
has v7
, v7s
, v5te
,
-etc.
-
--
-
vendor
= The vendor, for example unknown
, apple
, pc
, linux
, etc.
-
--
-
sys
= The system name, for example linux
, windows
, etc. none
is
-typically used for bare-metal without an OS.
-
--
-
abi
= The ABI, for example gnu
, android
, eabi
, etc.
-
-
-
-
-
-
-
Some parameters may be omitted. Run rustc --print target-list
for a list of
-supported targets.
-
+
Test for the given architecture. The default is the host
+architecture. The general format of the triple is
+<arch><sub>-<vendor>-<sys>-<abi>
. Run rustc --print target-list
for a
+list of supported targets.
This may also be specified with the build.target
config value.
-
-
- --release
-
-
Test artifacts in release mode, with optimizations. See the
+
Test optimized artifacts with the release
profile. See the
PROFILES section for details on how this affects profile selection.
@@ -444,11 +426,11 @@ PROFILES
dev
or test
profiles are used. If the --release
flag is given, then the
release
or bench
profiles are used.
-
+
-
-
-
+
+
+
@@ -464,7 +446,8 @@ PROFILES
release
|
-test, bench |
+test, bench, or any target
+ in "test" or "bench" mode |
test
|
bench
|
diff --git a/src/doc/man/generated/cargo-update.html b/src/doc/man/generated/cargo-update.html
index 4db29b76543..4c6be6a8196 100644
--- a/src/doc/man/generated/cargo-update.html
+++ b/src/doc/man/generated/cargo-update.html
@@ -54,6 +54,10 @@ Update Options
set the package to. If the package comes from a git repository, this can
be a git revision (such as a SHA hash or tag).
+- --dry-run
+-
+
Displays what would be updated, but doesn’t actually write the lockfile.
+
diff --git a/src/doc/man/options-release.adoc b/src/doc/man/options-release.adoc
index 211f9ecf2e6..e99539172a3 100644
--- a/src/doc/man/options-release.adoc
+++ b/src/doc/man/options-release.adoc
@@ -1,3 +1,3 @@
*--release*::
- {actionverb} artifacts in release mode, with optimizations. See the
+ {actionverb} optimized artifacts with the `release` profile. See the
<> section for details on how this affects profile selection.
diff --git a/src/doc/man/options-target-triple.adoc b/src/doc/man/options-target-triple.adoc
index 6ecb4401a3f..eac97d88505 100644
--- a/src/doc/man/options-target-triple.adoc
+++ b/src/doc/man/options-target-triple.adoc
@@ -1,22 +1,8 @@
*--target* _TRIPLE_::
- {actionverb} for the given architecture. The default is the host architecture.
+ {actionverb} for the given architecture. The default is the host
+ architecture. The general format of the triple is
+ `---`. Run `rustc --print target-list` for a
+ list of supported targets.
+
-The general format of the triple is `---` where:
-+
-- `arch` = The base CPU architecture, for example `x86_64`, `i686`, `arm`,
- `thumb`, `mips`, etc.
-- `sub` = The CPU sub-architecture, for example `arm` has `v7`, `v7s`, `v5te`,
- etc.
-- `vendor` = The vendor, for example `unknown`, `apple`, `pc`, `linux`, etc.
-- `sys` = The system name, for example `linux`, `windows`, etc. `none` is
- typically used for bare-metal without an OS.
-- `abi` = The ABI, for example `gnu`, `android`, `eabi`, etc.
-
-+
---
-Some parameters may be omitted. Run `rustc --print target-list` for a list of
-supported targets.
-
This may also be specified with the `build.target`
linkcargo:reference/config.html[config value].
---
diff --git a/src/doc/man/options-targets.adoc b/src/doc/man/options-targets.adoc
index 6b68fcd8742..6a8a46cd714 100644
--- a/src/doc/man/options-targets.adoc
+++ b/src/doc/man/options-targets.adoc
@@ -14,20 +14,26 @@ include::options-targets-lib-bin.adoc[]
times.
*--tests*::
- {actionverb} all tests. This includes both unit tests for libraries and binaries
- and integration tests. Targets may be disabled by setting `test = false`
- in the manifest settings for the target. Targets (such as examples) may be
- explicitly included by setting `test = true` in the target settings.
+ {actionverb} all targets in test mode that have the `test = true` manifest
+ flag set. By default this includes the library and binaries built as
+ unittests, and integration tests. Be aware that this will also build any
+ required dependencies, so the lib target may be built twice (once as a
+ unittest, and once as a dependency for binaries, integration tests, etc.).
+ Targets may be enabled or disabled by setting the `test` flag in the
+ manifest settings for the target.
*--bench* _NAME_...::
{actionverb} the specified benchmark. This flag may be specified multiple times.
*--benches*::
- {actionverb} all benchmarks. This includes both unit benchmarks for libraries and
- binaries and bench targets. Targets may be disabled by setting `bench =
- false` in the manifest settings for the target. Targets (such as examples)
- may be explicitly included by setting `bench = true` in the target
- settings.
+ {actionverb} all targets in benchmark mode that have the `bench = true`
+ manifest flag set. By default this includes the library and binaries built
+ as benchmarks, and bench targets. Be aware that this will also build any
+ required dependencies, so the lib target may be built twice (once as a
+ benchmark, and once as a dependency for binaries, benchmarks, etc.).
+ Targets may be enabled or disabled by setting the `bench` flag in the
+ manifest settings for the target.
*--all-targets*::
- {actionverb} all targets.
+ {actionverb} all targets. This is equivalent to specifying `--lib --bins
+ --tests --benches --examples`.
diff --git a/src/doc/man/section-profiles.adoc b/src/doc/man/section-profiles.adoc
index 57b6598e9eb..02cf4acaa0b 100644
--- a/src/doc/man/section-profiles.adoc
+++ b/src/doc/man/section-profiles.adoc
@@ -9,6 +9,7 @@ Profile selection depends on the target and crate being built. By default the
`dev` or `test` profiles are used. If the `--release` flag is given, then the
`release` or `bench` profiles are used.
+[%autowidth]
|===
|Target |Default Profile |`--release` Profile
@@ -16,7 +17,8 @@ Profile selection depends on the target and crate being built. By default the
|`dev`
|`release`
-|test, bench
+|test, bench, or any target +
+ in "test" or "bench" mode
|`test`
|`bench`
|===
diff --git a/src/doc/src/appendix/glossary.md b/src/doc/src/appendix/glossary.md
index 8b9a55915e4..f098bf37f94 100644
--- a/src/doc/src/appendix/glossary.md
+++ b/src/doc/src/appendix/glossary.md
@@ -108,20 +108,33 @@ The meaning of the term *target* depends on the context:
test, and benchmark targets. The [list of targets][targets] are configured
in the `Cargo.toml` manifest, often inferred automatically by the [directory
layout] of the source files.
-- **Target Architecture** — The OS and machine architecture for the built
- artifacts are typically referred to as a *target*.
-- **Target Triple** — A triple is a specific format for specifying a target
- architecture. See the [clang documentation] for details. Triples may be
- referred to as a *target triple* which is the architecture for the artifact
- produced, and the *host triple* which is the architecture that the compiler
- is running on. The target triple can be specified with the `--target`
- command-line option or the `build.target` [config option].
- **Target Directory** — Cargo places all built artifacts and intermediate
files in the *target* directory. By default this is a directory named
`target` at the workspace root, or the package root if not using a
- workspace. The directory be changed with the `--target-dir` command-line option,
- the `CARGO_TARGET_DIR` [environment variable], or the `build.target-dir`
- [config option].
+ workspace. The directory may be changed with the `--target-dir` command-line
+ option, the `CARGO_TARGET_DIR` [environment variable], or the
+ `build.target-dir` [config option].
+- **Target Architecture** — The OS and machine architecture for the built
+ artifacts are typically referred to as a *target*.
+- **Target Triple** — A triple is a specific format for specifying a target
+ architecture. Triples may be referred to as a *target triple* which is the
+ architecture for the artifact produced, and the *host triple* which is the
+ architecture that the compiler is running on. The target triple can be
+ specified with the `--target` command-line option or the `build.target`
+ [config option]. The general format of the triple is
+ `---` where:
+
+ - `arch` = The base CPU architecture, for example `x86_64`, `i686`, `arm`,
+ `thumb`, `mips`, etc.
+ - `sub` = The CPU sub-architecture, for example `arm` has `v7`, `v7s`,
+ `v5te`, etc.
+ - `vendor` = The vendor, for example `unknown`, `apple`, `pc`, `linux`, etc.
+ - `sys` = The system name, for example `linux`, `windows`, etc. `none` is
+ typically used for bare-metal without an OS.
+ - `abi` = The ABI, for example `gnu`, `android`, `eabi`, etc.
+
+ Some parameters may be omitted. Run `rustc --print target-list` for a list of
+ supported targets.
### Test Targets
@@ -157,7 +170,6 @@ manifest is located.
[Local Registry Sources]: reference/source-replacement.html#local-registry-sources
[Source Replacement]: reference/source-replacement.html
[cargo-unstable]: https://doc.rust-lang.org/nightly/cargo/reference/unstable.html
-[clang documentation]: http://clang.llvm.org/docs/CrossCompilation.html#target-triple
[config option]: reference/config.html
[directory layout]: reference/manifest.html#the-project-layout
[edition guide]: https://rust-lang-nursery.github.io/edition-guide/
diff --git a/src/doc/src/reference/config.md b/src/doc/src/reference/config.md
index 538c3a77fa4..da6b3c5d649 100644
--- a/src/doc/src/reference/config.md
+++ b/src/doc/src/reference/config.md
@@ -53,9 +53,9 @@ paths = ["/path/to/override"]
name = "..."
email = "..."
-# By default `cargo new` will initialize a new Git repository. This key can be
-# set to `hg` to create a Mercurial repository, or `none` to disable this
-# behavior.
+# By default `cargo new` will initialize a new Git repository. This key can
+# be set to change the version control system used. Valid values are `git`,
+# `hg` (for Mecurial), `pijul`, `fossil`, or `none` to disable this behavior.
vcs = "none"
# For the following sections, $triple refers to any valid target triple, not the
diff --git a/src/doc/src/reference/environment-variables.md b/src/doc/src/reference/environment-variables.md
index 4062b9fe340..86251494a73 100644
--- a/src/doc/src/reference/environment-variables.md
+++ b/src/doc/src/reference/environment-variables.md
@@ -104,8 +104,8 @@ let out_dir = env::var("OUT_DIR").unwrap();
inside the build directory for the package being built, and it is
unique for the package in question.
* `TARGET` - the target triple that is being compiled for. Native code should be
- compiled for this triple. Some more information about target
- triples can be found in [clang’s own documentation][clang].
+ compiled for this triple. See the [Target Triple] description
+ for more information.
* `HOST` - the host triple of the rust compiler.
* `NUM_JOBS` - the parallelism specified as the top-level parallelism. This can
be useful to pass a `-j` parameter to a system like `make`. Note
@@ -132,9 +132,9 @@ let out_dir = env::var("OUT_DIR").unwrap();
[links]: reference/build-scripts.html#the-links-manifest-key
[configuration]: https://doc.rust-lang.org/reference/attributes.html#conditional-compilation
-[clang]: http://clang.llvm.org/docs/CrossCompilation.html#target-triple
[jobserver]: https://www.gnu.org/software/make/manual/html_node/Job-Slots.html
[cargo-config]: reference/config.html
+[Target Triple]: appendix/glossary.html#target
### Environment variables Cargo sets for 3rd party subcommands
diff --git a/src/etc/man/cargo-bench.1 b/src/etc/man/cargo-bench.1
index 4e32a8a32e9..4fbd8ea066b 100644
--- a/src/etc/man/cargo-bench.1
+++ b/src/etc/man/cargo-bench.1
@@ -2,12 +2,12 @@
.\" Title: cargo-bench
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-23
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-BENCH" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-BENCH" "1" "2018-12-23" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -53,10 +53,12 @@ cargo bench \-\- foo \-\-exact
.sp
Benchmarks are built with the \fB\-\-test\fP option to \fBrustc\fP which creates an
executable with a \fBmain\fP function that automatically runs all functions
-annotated with the \fB#[bench]\fP attribute. The libtest harness may be disabled
-by setting \fBharness = false\fP in the target manifest settings, in which case
-your code will need to provide its own \fBmain\fP function to handle running
-benchmarks.
+annotated with the \fB#[bench]\fP attribute. Cargo passes the \fB\-\-bench\fP flag to
+the test harness to tell it to run only benchmarks.
+.sp
+The libtest harness may be disabled by setting \fBharness = false\fP in the target
+manifest settings, in which case your code will need to provide its own \fBmain\fP
+function to handle running benchmarks.
.SH "OPTIONS"
.SS "Benchmark Options"
.sp
@@ -110,7 +112,7 @@ following targets of the selected packages:
. sp -1
. IP \(bu 2.3
.\}
-lib – used to link with binaries and benchmarks
+lib — used to link with binaries and benchmarks
.RE
.sp
.RS 4
@@ -201,10 +203,13 @@ times.
.sp
\fB\-\-tests\fP
.RS 4
-Benchmark all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting \fBtest = false\fP
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting \fBtest = true\fP in the target settings.
+Benchmark all targets in test mode that have the \fBtest = true\fP manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the \fBtest\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-bench\fP \fINAME\fP...
@@ -214,16 +219,19 @@ Benchmark the specified benchmark. This flag may be specified multiple times.
.sp
\fB\-\-benches\fP
.RS 4
-Benchmark all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting \fBbench =
-false\fP in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting \fBbench = true\fP in the target
-settings.
+Benchmark all targets in benchmark mode that have the \fBbench = true\fP
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the \fBbench\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-all\-targets\fP
.RS 4
-Benchmark all targets.
+Benchmark all targets. This is equivalent to specifying \fB\-\-lib \-\-bins
+\-\-tests \-\-benches \-\-examples\fP.
.RE
.SS "Feature Selection"
.sp
@@ -251,70 +259,10 @@ package.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Benchmark for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Benchmark for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
diff --git a/src/etc/man/cargo-build.1 b/src/etc/man/cargo-build.1
index 71ac31a0bca..bb81bd76e8a 100644
--- a/src/etc/man/cargo-build.1
+++ b/src/etc/man/cargo-build.1
@@ -2,12 +2,12 @@
.\" Title: cargo-build
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-BUILD" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-BUILD" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -103,10 +103,13 @@ times.
.sp
\fB\-\-tests\fP
.RS 4
-Build all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting \fBtest = false\fP
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting \fBtest = true\fP in the target settings.
+Build all targets in test mode that have the \fBtest = true\fP manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the \fBtest\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-bench\fP \fINAME\fP...
@@ -116,16 +119,19 @@ Build the specified benchmark. This flag may be specified multiple times.
.sp
\fB\-\-benches\fP
.RS 4
-Build all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting \fBbench =
-false\fP in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting \fBbench = true\fP in the target
-settings.
+Build all targets in benchmark mode that have the \fBbench = true\fP
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the \fBbench\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-all\-targets\fP
.RS 4
-Build all targets.
+Build all targets. This is equivalent to specifying \fB\-\-lib \-\-bins
+\-\-tests \-\-benches \-\-examples\fP.
.RE
.SS "Feature Selection"
.sp
@@ -153,70 +159,10 @@ package.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Build for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Build for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
@@ -224,7 +170,7 @@ This may also be specified with the \fBbuild.target\fP
.sp
\fB\-\-release\fP
.RS 4
-Build artifacts in release mode, with optimizations. See the
+Build optimized artifacts with the \fBrelease\fP profile. See the
PROFILES section for details on how this affects profile selection.
.RE
.SS "Output Options"
@@ -426,7 +372,9 @@ T}:T{
T}
T{
.sp
-test, bench
+test, bench, or any target
+.br
+in "test" or "bench" mode
T}:T{
.sp
\fBtest\fP
diff --git a/src/etc/man/cargo-check.1 b/src/etc/man/cargo-check.1
index 0d3b69efed2..9a0022b19ec 100644
--- a/src/etc/man/cargo-check.1
+++ b/src/etc/man/cargo-check.1
@@ -2,12 +2,12 @@
.\" Title: cargo-check
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-CHECK" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-CHECK" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -107,10 +107,13 @@ times.
.sp
\fB\-\-tests\fP
.RS 4
-Check all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting \fBtest = false\fP
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting \fBtest = true\fP in the target settings.
+Check all targets in test mode that have the \fBtest = true\fP manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the \fBtest\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-bench\fP \fINAME\fP...
@@ -120,16 +123,19 @@ Check the specified benchmark. This flag may be specified multiple times.
.sp
\fB\-\-benches\fP
.RS 4
-Check all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting \fBbench =
-false\fP in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting \fBbench = true\fP in the target
-settings.
+Check all targets in benchmark mode that have the \fBbench = true\fP
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the \fBbench\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-all\-targets\fP
.RS 4
-Check all targets.
+Check all targets. This is equivalent to specifying \fB\-\-lib \-\-bins
+\-\-tests \-\-benches \-\-examples\fP.
.RE
.SS "Feature Selection"
.sp
@@ -157,70 +163,10 @@ package.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Check for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Check for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
@@ -228,7 +174,7 @@ This may also be specified with the \fBbuild.target\fP
.sp
\fB\-\-release\fP
.RS 4
-Check artifacts in release mode, with optimizations. See the
+Check optimized artifacts with the \fBrelease\fP profile. See the
PROFILES section for details on how this affects profile selection.
.RE
.sp
@@ -422,7 +368,9 @@ T}:T{
T}
T{
.sp
-test, bench
+test, bench, or any target
+.br
+in "test" or "bench" mode
T}:T{
.sp
\fBtest\fP
diff --git a/src/etc/man/cargo-clean.1 b/src/etc/man/cargo-clean.1
index 44b982f2bee..60cabacbe59 100644
--- a/src/etc/man/cargo-clean.1
+++ b/src/etc/man/cargo-clean.1
@@ -2,12 +2,12 @@
.\" Title: cargo-clean
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-CLEAN" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-CLEAN" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -75,70 +75,10 @@ to \fBtarget\fP in the root of the workspace.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Clean for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Clean for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
diff --git a/src/etc/man/cargo-doc.1 b/src/etc/man/cargo-doc.1
index 8a0780bb890..0a06e9904d5 100644
--- a/src/etc/man/cargo-doc.1
+++ b/src/etc/man/cargo-doc.1
@@ -2,12 +2,12 @@
.\" Title: cargo-doc
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-DOC" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-DOC" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -129,70 +129,10 @@ package.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Document for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Document for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
@@ -200,7 +140,7 @@ This may also be specified with the \fBbuild.target\fP
.sp
\fB\-\-release\fP
.RS 4
-Document artifacts in release mode, with optimizations. See the
+Document optimized artifacts with the \fBrelease\fP profile. See the
PROFILES section for details on how this affects profile selection.
.RE
.SS "Output Options"
@@ -385,7 +325,9 @@ T}:T{
T}
T{
.sp
-test, bench
+test, bench, or any target
+.br
+in "test" or "bench" mode
T}:T{
.sp
\fBtest\fP
diff --git a/src/etc/man/cargo-fetch.1 b/src/etc/man/cargo-fetch.1
index f196952610e..86b5f1a2f94 100644
--- a/src/etc/man/cargo-fetch.1
+++ b/src/etc/man/cargo-fetch.1
@@ -2,12 +2,12 @@
.\" Title: cargo-fetch
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-FETCH" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-FETCH" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -48,70 +48,10 @@ If \fB\-\-target\fP is not specified, then all target dependencies are fetched.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Fetch for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Fetch for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
diff --git a/src/etc/man/cargo-fix.1 b/src/etc/man/cargo-fix.1
index 3110e86bf66..61c5da79575 100644
--- a/src/etc/man/cargo-fix.1
+++ b/src/etc/man/cargo-fix.1
@@ -2,12 +2,12 @@
.\" Title: cargo-fix
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-FIX" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-FIX" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -177,10 +177,13 @@ times.
.sp
\fB\-\-tests\fP
.RS 4
-Fix all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting \fBtest = false\fP
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting \fBtest = true\fP in the target settings.
+Fix all targets in test mode that have the \fBtest = true\fP manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the \fBtest\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-bench\fP \fINAME\fP...
@@ -190,16 +193,19 @@ Fix the specified benchmark. This flag may be specified multiple times.
.sp
\fB\-\-benches\fP
.RS 4
-Fix all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting \fBbench =
-false\fP in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting \fBbench = true\fP in the target
-settings.
+Fix all targets in benchmark mode that have the \fBbench = true\fP
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the \fBbench\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-all\-targets\fP
.RS 4
-Fix all targets.
+Fix all targets. This is equivalent to specifying \fB\-\-lib \-\-bins
+\-\-tests \-\-benches \-\-examples\fP.
.RE
.SS "Feature Selection"
.sp
@@ -227,70 +233,10 @@ package.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Fix for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Fix for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
@@ -298,7 +244,7 @@ This may also be specified with the \fBbuild.target\fP
.sp
\fB\-\-release\fP
.RS 4
-Fix artifacts in release mode, with optimizations. See the
+Fix optimized artifacts with the \fBrelease\fP profile. See the
PROFILES section for details on how this affects profile selection.
.RE
.sp
@@ -492,7 +438,9 @@ T}:T{
T}
T{
.sp
-test, bench
+test, bench, or any target
+.br
+in "test" or "bench" mode
T}:T{
.sp
\fBtest\fP
diff --git a/src/etc/man/cargo-generate-lockfile.1 b/src/etc/man/cargo-generate-lockfile.1
index 0e2841bf475..5251c3f8d26 100644
--- a/src/etc/man/cargo-generate-lockfile.1
+++ b/src/etc/man/cargo-generate-lockfile.1
@@ -2,12 +2,12 @@
.\" Title: cargo-generate-lockfile
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-GENERATE\-LOCKFILE" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-GENERATE\-LOCKFILE" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-help.1 b/src/etc/man/cargo-help.1
index b5f9a581332..30e036d5a96 100644
--- a/src/etc/man/cargo-help.1
+++ b/src/etc/man/cargo-help.1
@@ -2,12 +2,12 @@
.\" Title: cargo-help
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-HELP" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-HELP" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-init.1 b/src/etc/man/cargo-init.1
index d7937889333..2d4b87f3fc9 100644
--- a/src/etc/man/cargo-init.1
+++ b/src/etc/man/cargo-init.1
@@ -2,12 +2,12 @@
.\" Title: cargo-init
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-INIT" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-INIT" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-install.1 b/src/etc/man/cargo-install.1
index d0bea54cdd3..23234569b02 100644
--- a/src/etc/man/cargo-install.1
+++ b/src/etc/man/cargo-install.1
@@ -2,12 +2,12 @@
.\" Title: cargo-install
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-23
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-INSTALL" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-INSTALL" "1" "2018-12-23" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -222,70 +222,10 @@ package.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Install for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Install for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
@@ -293,7 +233,7 @@ This may also be specified with the \fBbuild.target\fP
.sp
\fB\-\-debug\fP
.RS 4
-Build in debug mode instead of release mode.
+Build with the \fBdev\fP profile instead the \fBrelease\fP profile.
.RE
.SS "Miscellaneous Options"
.sp
diff --git a/src/etc/man/cargo-locate-project.1 b/src/etc/man/cargo-locate-project.1
index 03c3b2baa7f..9d5dca9f3f7 100644
--- a/src/etc/man/cargo-locate-project.1
+++ b/src/etc/man/cargo-locate-project.1
@@ -2,12 +2,12 @@
.\" Title: cargo-locate-project
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-LOCATE\-PROJECT" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-LOCATE\-PROJECT" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-login.1 b/src/etc/man/cargo-login.1
index 4a03db491fe..83d7f8f2b15 100644
--- a/src/etc/man/cargo-login.1
+++ b/src/etc/man/cargo-login.1
@@ -2,12 +2,12 @@
.\" Title: cargo-login
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-23
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-LOGIN" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-LOGIN" "1" "2018-12-23" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -35,7 +35,7 @@ cargo\-login \- Save an API token from the registry locally
.SH "DESCRIPTION"
.sp
This command will save the API token to disk so that commands that require
-authentication (such as \fBcargo\-publish\fP(1)) will be automatically
+authentication, such as \fBcargo\-publish\fP(1), will be automatically
authenticated. The token is saved in \fB$CARGO_HOME/credentials\fP. \fBCARGO_HOME\fP
defaults to \fB.cargo\fP in your home directory.
.sp
@@ -48,12 +48,6 @@ Take care to keep the token secret, it should not be shared with anyone else.
.SH "OPTIONS"
.SS "Login Options"
.sp
-\fB\-\-host\fP \fIHOST\fP
-.RS 4
-Host to set the token for. This option does not affect the behavior of the
-login command, and only affects the message displayed.
-.RE
-.sp
\fB\-\-registry\fP \fIREGISTRY\fP
.RS 4
Alternative registry to use.
diff --git a/src/etc/man/cargo-metadata.1 b/src/etc/man/cargo-metadata.1
index acc603943d2..3a2bc8f94e8 100644
--- a/src/etc/man/cargo-metadata.1
+++ b/src/etc/man/cargo-metadata.1
@@ -2,12 +2,12 @@
.\" Title: cargo-metadata
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-23
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-METADATA" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-METADATA" "1" "2018-12-23" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-new.1 b/src/etc/man/cargo-new.1
index a859cc44a81..06dc2b1ece2 100644
--- a/src/etc/man/cargo-new.1
+++ b/src/etc/man/cargo-new.1
@@ -2,12 +2,12 @@
.\" Title: cargo-new
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-NEW" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-NEW" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-owner.1 b/src/etc/man/cargo-owner.1
index c02f630558f..6dcebdb7991 100644
--- a/src/etc/man/cargo-owner.1
+++ b/src/etc/man/cargo-owner.1
@@ -2,12 +2,12 @@
.\" Title: cargo-owner
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-OWNER" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-OWNER" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-package.1 b/src/etc/man/cargo-package.1
index 5c65838214e..5752fe2a732 100644
--- a/src/etc/man/cargo-package.1
+++ b/src/etc/man/cargo-package.1
@@ -2,12 +2,12 @@
.\" Title: cargo-package
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-PACKAGE" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-PACKAGE" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -153,70 +153,10 @@ Allow working directories with uncommitted VCS changes to be packaged.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Package for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Package for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
diff --git a/src/etc/man/cargo-pkgid.1 b/src/etc/man/cargo-pkgid.1
index 45458a5f902..74d39a3eadf 100644
--- a/src/etc/man/cargo-pkgid.1
+++ b/src/etc/man/cargo-pkgid.1
@@ -2,12 +2,12 @@
.\" Title: cargo-pkgid
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-PKGID" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-PKGID" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-publish.1 b/src/etc/man/cargo-publish.1
index b6b56faecc5..6ee09ed9bcb 100644
--- a/src/etc/man/cargo-publish.1
+++ b/src/etc/man/cargo-publish.1
@@ -2,12 +2,12 @@
.\" Title: cargo-publish
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-PUBLISH" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-PUBLISH" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -144,70 +144,10 @@ the \fB\-Z unstable\-options\fP flag to enable.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Publish for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Publish for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
diff --git a/src/etc/man/cargo-run.1 b/src/etc/man/cargo-run.1
index 72776cda82f..8362133f43a 100644
--- a/src/etc/man/cargo-run.1
+++ b/src/etc/man/cargo-run.1
@@ -2,12 +2,12 @@
.\" Title: cargo-run
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-RUN" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-RUN" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -91,70 +91,10 @@ package.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Run for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Run for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
@@ -162,7 +102,7 @@ This may also be specified with the \fBbuild.target\fP
.sp
\fB\-\-release\fP
.RS 4
-Run artifacts in release mode, with optimizations. See the
+Run optimized artifacts with the \fBrelease\fP profile. See the
PROFILES section for details on how this affects profile selection.
.RE
.SS "Output Options"
@@ -347,7 +287,9 @@ T}:T{
T}
T{
.sp
-test, bench
+test, bench, or any target
+.br
+in "test" or "bench" mode
T}:T{
.sp
\fBtest\fP
diff --git a/src/etc/man/cargo-rustc.1 b/src/etc/man/cargo-rustc.1
index cae391625e9..f137e677764 100644
--- a/src/etc/man/cargo-rustc.1
+++ b/src/etc/man/cargo-rustc.1
@@ -2,12 +2,12 @@
.\" Title: cargo-rustc
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-RUSTC" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-RUSTC" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -105,10 +105,13 @@ times.
.sp
\fB\-\-tests\fP
.RS 4
-Build all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting \fBtest = false\fP
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting \fBtest = true\fP in the target settings.
+Build all targets in test mode that have the \fBtest = true\fP manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the \fBtest\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-bench\fP \fINAME\fP...
@@ -118,16 +121,19 @@ Build the specified benchmark. This flag may be specified multiple times.
.sp
\fB\-\-benches\fP
.RS 4
-Build all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting \fBbench =
-false\fP in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting \fBbench = true\fP in the target
-settings.
+Build all targets in benchmark mode that have the \fBbench = true\fP
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the \fBbench\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-all\-targets\fP
.RS 4
-Build all targets.
+Build all targets. This is equivalent to specifying \fB\-\-lib \-\-bins
+\-\-tests \-\-benches \-\-examples\fP.
.RE
.SS "Feature Selection"
.sp
@@ -155,70 +161,10 @@ package.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Build for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Build for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
@@ -226,7 +172,7 @@ This may also be specified with the \fBbuild.target\fP
.sp
\fB\-\-release\fP
.RS 4
-Build artifacts in release mode, with optimizations. See the
+Build optimized artifacts with the \fBrelease\fP profile. See the
PROFILES section for details on how this affects profile selection.
.RE
.SS "Output Options"
@@ -411,7 +357,9 @@ T}:T{
T}
T{
.sp
-test, bench
+test, bench, or any target
+.br
+in "test" or "bench" mode
T}:T{
.sp
\fBtest\fP
diff --git a/src/etc/man/cargo-rustdoc.1 b/src/etc/man/cargo-rustdoc.1
index 0888236fa09..9453b10d582 100644
--- a/src/etc/man/cargo-rustdoc.1
+++ b/src/etc/man/cargo-rustdoc.1
@@ -2,12 +2,12 @@
.\" Title: cargo-rustdoc
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-RUSTDOC" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-RUSTDOC" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -113,10 +113,13 @@ times.
.sp
\fB\-\-tests\fP
.RS 4
-Document all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting \fBtest = false\fP
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting \fBtest = true\fP in the target settings.
+Document all targets in test mode that have the \fBtest = true\fP manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the \fBtest\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-bench\fP \fINAME\fP...
@@ -126,16 +129,19 @@ Document the specified benchmark. This flag may be specified multiple times.
.sp
\fB\-\-benches\fP
.RS 4
-Document all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting \fBbench =
-false\fP in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting \fBbench = true\fP in the target
-settings.
+Document all targets in benchmark mode that have the \fBbench = true\fP
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the \fBbench\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-all\-targets\fP
.RS 4
-Document all targets.
+Document all targets. This is equivalent to specifying \fB\-\-lib \-\-bins
+\-\-tests \-\-benches \-\-examples\fP.
.RE
.SS "Feature Selection"
.sp
@@ -163,70 +169,10 @@ package.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Document for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Document for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
@@ -234,7 +180,7 @@ This may also be specified with the \fBbuild.target\fP
.sp
\fB\-\-release\fP
.RS 4
-Document artifacts in release mode, with optimizations. See the
+Document optimized artifacts with the \fBrelease\fP profile. See the
PROFILES section for details on how this affects profile selection.
.RE
.SS "Output Options"
@@ -419,7 +365,9 @@ T}:T{
T}
T{
.sp
-test, bench
+test, bench, or any target
+.br
+in "test" or "bench" mode
T}:T{
.sp
\fBtest\fP
diff --git a/src/etc/man/cargo-search.1 b/src/etc/man/cargo-search.1
index 516ad839d1e..272f71c4878 100644
--- a/src/etc/man/cargo-search.1
+++ b/src/etc/man/cargo-search.1
@@ -2,12 +2,12 @@
.\" Title: cargo-search
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-SEARCH" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-SEARCH" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-test.1 b/src/etc/man/cargo-test.1
index 5d4cdf29360..831221e3666 100644
--- a/src/etc/man/cargo-test.1
+++ b/src/etc/man/cargo-test.1
@@ -2,12 +2,12 @@
.\" Title: cargo-test
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-23
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-TEST" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-TEST" "1" "2018-12-23" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -52,13 +52,19 @@ cargo test foo \-\- \-\-test\-threads 3
.sp
Tests are built with the \fB\-\-test\fP option to \fBrustc\fP which creates an
executable with a \fBmain\fP function that automatically runs all functions
-annotated with the \fB#[test]\fP attribute in multiple threads. The libtest
-harness may be disabled by setting \fBharness = false\fP in the target manifest
-settings, in which case your code will need to provide its own \fBmain\fP function
-to handle running tests.
+annotated with the \fB#[test]\fP attribute in multiple threads. \fB#[bench]\fP
+annotated functions will also be run with one iteration to verify that they
+are functional.
+.sp
+The libtest harness may be disabled by setting \fBharness = false\fP in the target
+manifest settings, in which case your code will need to provide its own \fBmain\fP
+function to handle running tests.
.sp
Documentation tests are also run by default, which is handled by \fBrustdoc\fP. It
-extracts code samples from documentation comments and executes them.
+extracts code samples from documentation comments and executes them. See the
+.URL "https://doc.rust\-lang.org/rustdoc/" "rustdoc book" " "
+for more information on
+writing doc tests.
.SH "OPTIONS"
.SS "Test Options"
.sp
@@ -112,7 +118,7 @@ following targets of the selected packages:
. sp -1
. IP \(bu 2.3
.\}
-lib – used to link with binaries, examples, integration tests, and doc tests
+lib — used to link with binaries, examples, integration tests, and doc tests
.RE
.sp
.RS 4
@@ -135,7 +141,7 @@ available)
. sp -1
. IP \(bu 2.3
.\}
-examples – to ensure they compile
+examples — to ensure they compile
.RE
.sp
.RS 4
@@ -227,10 +233,13 @@ times.
.sp
\fB\-\-tests\fP
.RS 4
-Test all tests. This includes both unit tests for libraries and binaries
-and integration tests. Targets may be disabled by setting \fBtest = false\fP
-in the manifest settings for the target. Targets (such as examples) may be
-explicitly included by setting \fBtest = true\fP in the target settings.
+Test all targets in test mode that have the \fBtest = true\fP manifest
+flag set. By default this includes the library and binaries built as
+unittests, and integration tests. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+unittest, and once as a dependency for binaries, integration tests, etc.).
+Targets may be enabled or disabled by setting the \fBtest\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-bench\fP \fINAME\fP...
@@ -240,16 +249,19 @@ Test the specified benchmark. This flag may be specified multiple times.
.sp
\fB\-\-benches\fP
.RS 4
-Test all benchmarks. This includes both unit benchmarks for libraries and
-binaries and bench targets. Targets may be disabled by setting \fBbench =
-false\fP in the manifest settings for the target. Targets (such as examples)
-may be explicitly included by setting \fBbench = true\fP in the target
-settings.
+Test all targets in benchmark mode that have the \fBbench = true\fP
+manifest flag set. By default this includes the library and binaries built
+as benchmarks, and bench targets. Be aware that this will also build any
+required dependencies, so the lib target may be built twice (once as a
+benchmark, and once as a dependency for binaries, benchmarks, etc.).
+Targets may be enabled or disabled by setting the \fBbench\fP flag in the
+manifest settings for the target.
.RE
.sp
\fB\-\-all\-targets\fP
.RS 4
-Test all targets.
+Test all targets. This is equivalent to specifying \fB\-\-lib \-\-bins
+\-\-tests \-\-benches \-\-examples\fP.
.RE
.sp
\fB\-\-doc\fP
@@ -283,70 +295,10 @@ package.
.sp
\fB\-\-target\fP \fITRIPLE\fP
.RS 4
-Test for the given architecture. The default is the host architecture.
-.sp
-The general format of the triple is \fB\-\-\-\fP where:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBarch\fP = The base CPU architecture, for example \fBx86_64\fP, \fBi686\fP, \fBarm\fP,
-\fBthumb\fP, \fBmips\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsub\fP = The CPU sub\-architecture, for example \fBarm\fP has \fBv7\fP, \fBv7s\fP, \fBv5te\fP,
-etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBvendor\fP = The vendor, for example \fBunknown\fP, \fBapple\fP, \fBpc\fP, \fBlinux\fP, etc.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBsys\fP = The system name, for example \fBlinux\fP, \fBwindows\fP, etc. \fBnone\fP is
-typically used for bare\-metal without an OS.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-. sp -1
-. IP \(bu 2.3
-.\}
-\fBabi\fP = The ABI, for example \fBgnu\fP, \fBandroid\fP, \fBeabi\fP, etc.
-.RE
-.sp
-Some parameters may be omitted. Run \fBrustc \-\-print target\-list\fP for a list of
-supported targets.
+Test for the given architecture. The default is the host
+architecture. The general format of the triple is
+\fB\-\-\-\fP. Run \fBrustc \-\-print target\-list\fP for a
+list of supported targets.
.sp
This may also be specified with the \fBbuild.target\fP
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
@@ -354,7 +306,7 @@ This may also be specified with the \fBbuild.target\fP
.sp
\fB\-\-release\fP
.RS 4
-Test artifacts in release mode, with optimizations. See the
+Test optimized artifacts with the \fBrelease\fP profile. See the
PROFILES section for details on how this affects profile selection.
.RE
.SS "Output Options"
@@ -559,7 +511,9 @@ T}:T{
T}
T{
.sp
-test, bench
+test, bench, or any target
+.br
+in "test" or "bench" mode
T}:T{
.sp
\fBtest\fP
diff --git a/src/etc/man/cargo-uninstall.1 b/src/etc/man/cargo-uninstall.1
index 904097aeae0..36ea8a80656 100644
--- a/src/etc/man/cargo-uninstall.1
+++ b/src/etc/man/cargo-uninstall.1
@@ -2,12 +2,12 @@
.\" Title: cargo-uninstall
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-UNINSTALL" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-UNINSTALL" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-update.1 b/src/etc/man/cargo-update.1
index 9d8768aac74..1997895ae7b 100644
--- a/src/etc/man/cargo-update.1
+++ b/src/etc/man/cargo-update.1
@@ -2,12 +2,12 @@
.\" Title: cargo-update
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-23
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-UPDATE" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-UPDATE" "1" "2018-12-23" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
@@ -66,6 +66,11 @@ When used with \fB\-p\fP, allows you to specify a specific version number to
set the package to. If the package comes from a git repository, this can
be a git revision (such as a SHA hash or tag).
.RE
+.sp
+\fB\-\-dry\-run\fP
+.RS 4
+Displays what would be updated, but doesn\(cqt actually write the lockfile.
+.RE
.SS "Display Options"
.sp
\fB\-v\fP, \fB\-\-verbose\fP
diff --git a/src/etc/man/cargo-verify-project.1 b/src/etc/man/cargo-verify-project.1
index 1721052ee2e..3d4089cec24 100644
--- a/src/etc/man/cargo-verify-project.1
+++ b/src/etc/man/cargo-verify-project.1
@@ -2,12 +2,12 @@
.\" Title: cargo-verify-project
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-VERIFY\-PROJECT" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-VERIFY\-PROJECT" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-version.1 b/src/etc/man/cargo-version.1
index ded20e27f3b..4527d14900f 100644
--- a/src/etc/man/cargo-version.1
+++ b/src/etc/man/cargo-version.1
@@ -2,12 +2,12 @@
.\" Title: cargo-version
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-VERSION" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-VERSION" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo-yank.1 b/src/etc/man/cargo-yank.1
index 878484bc094..c5ad056edc8 100644
--- a/src/etc/man/cargo-yank.1
+++ b/src/etc/man/cargo-yank.1
@@ -2,12 +2,12 @@
.\" Title: cargo-yank
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-18
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO\-YANK" "1" "2018-12-18" "\ \&" "\ \&"
+.TH "CARGO\-YANK" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0
diff --git a/src/etc/man/cargo.1 b/src/etc/man/cargo.1
index e36f89393fb..a1a5be5bc73 100644
--- a/src/etc/man/cargo.1
+++ b/src/etc/man/cargo.1
@@ -2,12 +2,12 @@
.\" Title: cargo
.\" Author: [see the "AUTHOR(S)" section]
.\" Generator: Asciidoctor 1.5.8
-.\" Date: 2018-12-08
+.\" Date: 2018-12-20
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "CARGO" "1" "2018-12-08" "\ \&" "\ \&"
+.TH "CARGO" "1" "2018-12-20" "\ \&" "\ \&"
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.ss \n[.ss] 0