From e549bc809b7a6dc70a947d33b3adf76b012c0936 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Wed, 27 Mar 2024 22:04:46 -0400 Subject: [PATCH 1/2] fix(cli): resolve confusion between `--frozen` and `--locked` --- src/bin/cargo/cli.rs | 6 +++--- src/doc/man/generated_txt/cargo-add.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-bench.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-build.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-check.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-clean.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-doc.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-fetch.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-fix.txt | 19 +++++++++--------- .../generated_txt/cargo-generate-lockfile.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-install.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-metadata.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-package.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-pkgid.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-publish.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-remove.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-run.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-rustc.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-rustdoc.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-test.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-tree.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-update.txt | 19 +++++++++--------- src/doc/man/generated_txt/cargo-vendor.txt | 19 +++++++++--------- .../generated_txt/cargo-verify-project.txt | 19 +++++++++--------- src/doc/man/includes/options-locked.md | 20 ++++++++++--------- src/doc/src/commands/cargo-add.md | 17 ++++++++-------- src/doc/src/commands/cargo-bench.md | 17 ++++++++-------- src/doc/src/commands/cargo-build.md | 17 ++++++++-------- src/doc/src/commands/cargo-check.md | 17 ++++++++-------- src/doc/src/commands/cargo-clean.md | 17 ++++++++-------- src/doc/src/commands/cargo-doc.md | 17 ++++++++-------- src/doc/src/commands/cargo-fetch.md | 17 ++++++++-------- src/doc/src/commands/cargo-fix.md | 17 ++++++++-------- .../src/commands/cargo-generate-lockfile.md | 17 ++++++++-------- src/doc/src/commands/cargo-install.md | 17 ++++++++-------- src/doc/src/commands/cargo-metadata.md | 17 ++++++++-------- src/doc/src/commands/cargo-package.md | 17 ++++++++-------- src/doc/src/commands/cargo-pkgid.md | 17 ++++++++-------- src/doc/src/commands/cargo-publish.md | 17 ++++++++-------- src/doc/src/commands/cargo-remove.md | 17 ++++++++-------- src/doc/src/commands/cargo-run.md | 17 ++++++++-------- src/doc/src/commands/cargo-rustc.md | 17 ++++++++-------- src/doc/src/commands/cargo-rustdoc.md | 17 ++++++++-------- src/doc/src/commands/cargo-test.md | 17 ++++++++-------- src/doc/src/commands/cargo-tree.md | 17 ++++++++-------- src/doc/src/commands/cargo-update.md | 17 ++++++++-------- src/doc/src/commands/cargo-vendor.md | 17 ++++++++-------- src/doc/src/commands/cargo-verify-project.md | 17 ++++++++-------- src/etc/man/cargo-add.1 | 18 +++++++++-------- src/etc/man/cargo-bench.1 | 18 +++++++++-------- src/etc/man/cargo-build.1 | 18 +++++++++-------- src/etc/man/cargo-check.1 | 18 +++++++++-------- src/etc/man/cargo-clean.1 | 18 +++++++++-------- src/etc/man/cargo-doc.1 | 18 +++++++++-------- src/etc/man/cargo-fetch.1 | 18 +++++++++-------- src/etc/man/cargo-fix.1 | 18 +++++++++-------- src/etc/man/cargo-generate-lockfile.1 | 18 +++++++++-------- src/etc/man/cargo-install.1 | 18 +++++++++-------- src/etc/man/cargo-metadata.1 | 20 ++++++++++--------- src/etc/man/cargo-package.1 | 18 +++++++++-------- src/etc/man/cargo-pkgid.1 | 18 +++++++++-------- src/etc/man/cargo-publish.1 | 18 +++++++++-------- src/etc/man/cargo-remove.1 | 18 +++++++++-------- src/etc/man/cargo-run.1 | 18 +++++++++-------- src/etc/man/cargo-rustc.1 | 18 +++++++++-------- src/etc/man/cargo-rustdoc.1 | 18 +++++++++-------- src/etc/man/cargo-test.1 | 18 +++++++++-------- src/etc/man/cargo-tree.1 | 18 +++++++++-------- src/etc/man/cargo-update.1 | 18 +++++++++-------- src/etc/man/cargo-vendor.1 | 18 +++++++++-------- src/etc/man/cargo-verify-project.1 | 18 +++++++++-------- tests/testsuite/cargo/help/stdout.term.svg | 6 +++--- .../testsuite/cargo_add/help/stdout.term.svg | 12 +++++------ .../cargo_bench/help/stdout.term.svg | 6 +++--- .../cargo_build/help/stdout.term.svg | 6 +++--- .../cargo_check/help/stdout.term.svg | 6 +++--- .../cargo_clean/help/stdout.term.svg | 6 +++--- .../cargo_config/help/stdout.term.svg | 6 +++--- .../testsuite/cargo_doc/help/stdout.term.svg | 6 +++--- .../cargo_fetch/help/stdout.term.svg | 6 +++--- .../testsuite/cargo_fix/help/stdout.term.svg | 6 +++--- .../help/stdout.term.svg | 6 +++--- .../testsuite/cargo_help/help/stdout.term.svg | 6 +++--- .../testsuite/cargo_init/help/stdout.term.svg | 6 +++--- .../cargo_install/help/stdout.term.svg | 6 +++--- .../cargo_locate_project/help/stdout.term.svg | 6 +++--- .../cargo_login/help/stdout.term.svg | 6 +++--- .../cargo_logout/help/stdout.term.svg | 6 +++--- .../cargo_metadata/help/stdout.term.svg | 6 +++--- .../testsuite/cargo_new/help/stdout.term.svg | 6 +++--- .../cargo_owner/help/stdout.term.svg | 6 +++--- .../cargo_package/help/stdout.term.svg | 6 +++--- .../cargo_pkgid/help/stdout.term.svg | 6 +++--- .../cargo_publish/help/stdout.term.svg | 6 +++--- .../cargo_read_manifest/help/stdout.term.svg | 6 +++--- .../cargo_remove/help/stdout.term.svg | 6 +++--- .../cargo_report/help/stdout.term.svg | 6 +++--- .../testsuite/cargo_run/help/stdout.term.svg | 6 +++--- .../cargo_rustc/help/stdout.term.svg | 6 +++--- .../cargo_rustdoc/help/stdout.term.svg | 6 +++--- .../cargo_search/help/stdout.term.svg | 6 +++--- .../testsuite/cargo_test/help/stdout.term.svg | 6 +++--- .../testsuite/cargo_tree/help/stdout.term.svg | 6 +++--- .../cargo_uninstall/help/stdout.term.svg | 6 +++--- .../cargo_update/help/stdout.term.svg | 6 +++--- .../cargo_vendor/help/stdout.term.svg | 6 +++--- .../cargo_verify_project/help/stdout.term.svg | 6 +++--- .../cargo_version/help/stdout.term.svg | 6 +++--- .../testsuite/cargo_yank/help/stdout.term.svg | 6 +++--- 109 files changed, 799 insertions(+), 705 deletions(-) diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs index 40a8ae706e9..95e5c0e8a67 100644 --- a/src/bin/cargo/cli.rs +++ b/src/bin/cargo/cli.rs @@ -640,17 +640,17 @@ See 'cargo help <>' for more information on a sp .value_parser(clap::builder::ValueParser::path_buf()), ) .arg( - flag("frozen", "Require Cargo.lock and cache to be up-to-date") + flag("locked", "Require Cargo.lock to be up-to-date") .help_heading(heading::MANIFEST_OPTIONS) .global(true), ) .arg( - flag("locked", "Require Cargo.lock to be up-to-date") + flag("offline", "Run without accessing the network") .help_heading(heading::MANIFEST_OPTIONS) .global(true), ) .arg( - flag("offline", "Run without accessing the network") + flag("frozen", "Equivalent to specifying both --locked and --offline") .help_heading(heading::MANIFEST_OPTIONS) .global(true), ) diff --git a/src/doc/man/generated_txt/cargo-add.txt b/src/doc/man/generated_txt/cargo-add.txt index a7246e38a29..b8981fd2087 100644 --- a/src/doc/man/generated_txt/cargo-add.txt +++ b/src/doc/man/generated_txt/cargo-add.txt @@ -171,16 +171,14 @@ OPTIONS -p spec, --package spec Add dependencies to only the specified package. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -197,6 +195,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-bench.txt b/src/doc/man/generated_txt/cargo-bench.txt index 03448ee5048..f75e8ac8264 100644 --- a/src/doc/man/generated_txt/cargo-bench.txt +++ b/src/doc/man/generated_txt/cargo-bench.txt @@ -338,16 +338,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -364,6 +362,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-build.txt b/src/doc/man/generated_txt/cargo-build.txt index dd404a3edc7..e6fc2616a25 100644 --- a/src/doc/man/generated_txt/cargo-build.txt +++ b/src/doc/man/generated_txt/cargo-build.txt @@ -272,16 +272,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -298,6 +296,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-check.txt b/src/doc/man/generated_txt/cargo-check.txt index 6135fdc21d5..0cbb36a1aea 100644 --- a/src/doc/man/generated_txt/cargo-check.txt +++ b/src/doc/man/generated_txt/cargo-check.txt @@ -257,16 +257,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -283,6 +281,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-clean.txt b/src/doc/man/generated_txt/cargo-clean.txt index 38e48cb52c0..fb50ba7ece4 100644 --- a/src/doc/man/generated_txt/cargo-clean.txt +++ b/src/doc/man/generated_txt/cargo-clean.txt @@ -91,16 +91,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -117,6 +115,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-doc.txt b/src/doc/man/generated_txt/cargo-doc.txt index d5e6ddf49c4..f4b93a9985a 100644 --- a/src/doc/man/generated_txt/cargo-doc.txt +++ b/src/doc/man/generated_txt/cargo-doc.txt @@ -228,16 +228,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -254,6 +252,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-fetch.txt b/src/doc/man/generated_txt/cargo-fetch.txt index bf9c3c21598..37ecd928bec 100644 --- a/src/doc/man/generated_txt/cargo-fetch.txt +++ b/src/doc/man/generated_txt/cargo-fetch.txt @@ -71,16 +71,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -96,6 +94,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-fix.txt b/src/doc/man/generated_txt/cargo-fix.txt index 25014ab086e..81830bf1c13 100644 --- a/src/doc/man/generated_txt/cargo-fix.txt +++ b/src/doc/man/generated_txt/cargo-fix.txt @@ -330,16 +330,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -356,6 +354,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-generate-lockfile.txt b/src/doc/man/generated_txt/cargo-generate-lockfile.txt index 9ec3af709b1..7e5dae0627d 100644 --- a/src/doc/man/generated_txt/cargo-generate-lockfile.txt +++ b/src/doc/man/generated_txt/cargo-generate-lockfile.txt @@ -46,16 +46,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -72,6 +70,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-install.txt b/src/doc/man/generated_txt/cargo-install.txt index e9cd80b4248..2ba85c59632 100644 --- a/src/doc/man/generated_txt/cargo-install.txt +++ b/src/doc/man/generated_txt/cargo-install.txt @@ -242,16 +242,14 @@ OPTIONS machine-readable JSON information about timing information. Manifest Options - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -268,6 +266,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Miscellaneous Options -j N, --jobs N Number of parallel jobs to run. May also be specified with the diff --git a/src/doc/man/generated_txt/cargo-metadata.txt b/src/doc/man/generated_txt/cargo-metadata.txt index 7643a021d67..dd670191add 100644 --- a/src/doc/man/generated_txt/cargo-metadata.txt +++ b/src/doc/man/generated_txt/cargo-metadata.txt @@ -404,16 +404,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -430,6 +428,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-package.txt b/src/doc/man/generated_txt/cargo-package.txt index 1cdf31f496b..1dbed569220 100644 --- a/src/doc/man/generated_txt/cargo-package.txt +++ b/src/doc/man/generated_txt/cargo-package.txt @@ -158,16 +158,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -184,6 +182,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Miscellaneous Options -j N, --jobs N Number of parallel jobs to run. May also be specified with the diff --git a/src/doc/man/generated_txt/cargo-pkgid.txt b/src/doc/man/generated_txt/cargo-pkgid.txt index e1c889b3771..00bcd4f3e72 100644 --- a/src/doc/man/generated_txt/cargo-pkgid.txt +++ b/src/doc/man/generated_txt/cargo-pkgid.txt @@ -84,16 +84,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -110,6 +108,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-publish.txt b/src/doc/man/generated_txt/cargo-publish.txt index fbffc706c8f..16c4010655c 100644 --- a/src/doc/man/generated_txt/cargo-publish.txt +++ b/src/doc/man/generated_txt/cargo-publish.txt @@ -128,16 +128,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -154,6 +152,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Miscellaneous Options -j N, --jobs N Number of parallel jobs to run. May also be specified with the diff --git a/src/doc/man/generated_txt/cargo-remove.txt b/src/doc/man/generated_txt/cargo-remove.txt index 21a0ec2759a..5092dd94e50 100644 --- a/src/doc/man/generated_txt/cargo-remove.txt +++ b/src/doc/man/generated_txt/cargo-remove.txt @@ -61,16 +61,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -87,6 +85,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Package Selection -p spec…, --package spec… Package to remove from. diff --git a/src/doc/man/generated_txt/cargo-run.txt b/src/doc/man/generated_txt/cargo-run.txt index dc9b28229eb..e977975cb20 100644 --- a/src/doc/man/generated_txt/cargo-run.txt +++ b/src/doc/man/generated_txt/cargo-run.txt @@ -176,16 +176,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -202,6 +200,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-rustc.txt b/src/doc/man/generated_txt/cargo-rustc.txt index 4e0abc0fd7d..878889cc188 100644 --- a/src/doc/man/generated_txt/cargo-rustc.txt +++ b/src/doc/man/generated_txt/cargo-rustc.txt @@ -274,16 +274,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -300,6 +298,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-rustdoc.txt b/src/doc/man/generated_txt/cargo-rustdoc.txt index 3319eb838be..92c32864f54 100644 --- a/src/doc/man/generated_txt/cargo-rustdoc.txt +++ b/src/doc/man/generated_txt/cargo-rustdoc.txt @@ -244,16 +244,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -270,6 +268,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-test.txt b/src/doc/man/generated_txt/cargo-test.txt index f9d1cb3431d..a0b4c43fd1a 100644 --- a/src/doc/man/generated_txt/cargo-test.txt +++ b/src/doc/man/generated_txt/cargo-test.txt @@ -364,16 +364,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -390,6 +388,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-tree.txt b/src/doc/man/generated_txt/cargo-tree.txt index 57e74b11848..0bd39986c62 100644 --- a/src/doc/man/generated_txt/cargo-tree.txt +++ b/src/doc/man/generated_txt/cargo-tree.txt @@ -211,16 +211,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -237,6 +235,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Feature Selection The feature flags allow you to control which features are enabled. When no feature options are given, the default feature is activated for every diff --git a/src/doc/man/generated_txt/cargo-update.txt b/src/doc/man/generated_txt/cargo-update.txt index 0f00fa04395..a4b9c24f6bb 100644 --- a/src/doc/man/generated_txt/cargo-update.txt +++ b/src/doc/man/generated_txt/cargo-update.txt @@ -81,16 +81,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -107,6 +105,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/generated_txt/cargo-vendor.txt b/src/doc/man/generated_txt/cargo-vendor.txt index 1904971329c..a46c2afe96e 100644 --- a/src/doc/man/generated_txt/cargo-vendor.txt +++ b/src/doc/man/generated_txt/cargo-vendor.txt @@ -53,16 +53,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -79,6 +77,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Display Options -v, --verbose Use verbose output. May be specified twice for “very verbose” diff --git a/src/doc/man/generated_txt/cargo-verify-project.txt b/src/doc/man/generated_txt/cargo-verify-project.txt index c790d23aaa0..86736043b25 100644 --- a/src/doc/man/generated_txt/cargo-verify-project.txt +++ b/src/doc/man/generated_txt/cargo-verify-project.txt @@ -49,16 +49,14 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. - --frozen, --locked - Either of these flags requires that the Cargo.lock file be - up-to-date. If the lock file is missing, or it needs to be updated, - Cargo will exit with an error. The --frozen flag also prevents Cargo - from attempting to access the network to determine if it is - out-of-date. + --locked + Requires the Cargo.lock file be up-to-date. If the lock file is + missing, or it needs to be updated due to changes in the Cargo.toml + file, for example a new dependency is added, Cargo will exit with an + error. - These may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build) or want to avoid - network access. + It may be used in environments where you want to assert that the + Cargo.lock file is up-to-date (such as a CI build). --offline Prevents Cargo from accessing the network for any reason. Without @@ -75,6 +73,9 @@ OPTIONS May also be specified with the net.offline config value . + --frozen + Equivalent to specifying both --locked and --offline. + Common Options +toolchain If Cargo has been installed with rustup, and the first argument to diff --git a/src/doc/man/includes/options-locked.md b/src/doc/man/includes/options-locked.md index deb86bce031..34fa96bef9c 100644 --- a/src/doc/man/includes/options-locked.md +++ b/src/doc/man/includes/options-locked.md @@ -1,12 +1,10 @@ -{{#option "`--frozen`" "`--locked`"}} -Either of these flags requires that the `Cargo.lock` file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The `--frozen` flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date. +{{#option "`--locked`"}} +Requires the `Cargo.lock` file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the `Cargo.toml` file, for example +a new dependency is added, Cargo will exit with an error. -These may be used in environments where you want to assert that the -`Cargo.lock` file is up-to-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the `Cargo.lock` +file is up-to-date (such as a CI build). {{/option}} {{#option "`--offline`"}} @@ -24,4 +22,8 @@ offline. {{/if}} May also be specified with the `net.offline` [config value](../reference/config.html). -{{/option}} \ No newline at end of file +{{/option}} + +{{#option "`--frozen`"}} +Equivalent to specifying both `--locked` and `--offline`. +{{/option}} diff --git a/src/doc/src/commands/cargo-add.md b/src/doc/src/commands/cargo-add.md index 9f599d37cad..15b461ab1eb 100644 --- a/src/doc/src/commands/cargo-add.md +++ b/src/doc/src/commands/cargo-add.md @@ -191,15 +191,12 @@ terminal.
Add dependencies to only the specified package.
-
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -214,6 +211,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Common Options diff --git a/src/doc/src/commands/cargo-bench.md b/src/doc/src/commands/cargo-bench.md index 8b26e76f1df..40ee4fd1b99 100644 --- a/src/doc/src/commands/cargo-bench.md +++ b/src/doc/src/commands/cargo-bench.md @@ -377,15 +377,12 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -400,6 +397,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Common Options diff --git a/src/doc/src/commands/cargo-build.md b/src/doc/src/commands/cargo-build.md index fb91f7d2d2b..85cc12a18b0 100644 --- a/src/doc/src/commands/cargo-build.md +++ b/src/doc/src/commands/cargo-build.md @@ -308,15 +308,12 @@ See https://github.com/ Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -331,6 +328,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Common Options diff --git a/src/doc/src/commands/cargo-check.md b/src/doc/src/commands/cargo-check.md index f011e5539fe..8ef1a28df15 100644 --- a/src/doc/src/commands/cargo-check.md +++ b/src/doc/src/commands/cargo-check.md @@ -290,15 +290,12 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -313,6 +310,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Common Options diff --git a/src/doc/src/commands/cargo-clean.md b/src/doc/src/commands/cargo-clean.md index dc9f05e8b18..fbcc783a06c 100644 --- a/src/doc/src/commands/cargo-clean.md +++ b/src/doc/src/commands/cargo-clean.md @@ -110,15 +110,12 @@ terminal. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -133,6 +130,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Common Options diff --git a/src/doc/src/commands/cargo-doc.md b/src/doc/src/commands/cargo-doc.md index da56c768c0e..a15c5a2cadb 100644 --- a/src/doc/src/commands/cargo-doc.md +++ b/src/doc/src/commands/cargo-doc.md @@ -265,15 +265,12 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -288,6 +285,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Common Options diff --git a/src/doc/src/commands/cargo-fetch.md b/src/doc/src/commands/cargo-fetch.md index 04e2de50ef0..07a2b27dee8 100644 --- a/src/doc/src/commands/cargo-fetch.md +++ b/src/doc/src/commands/cargo-fetch.md @@ -79,15 +79,12 @@ terminal. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -100,6 +97,10 @@ mode. Cargo will restrict itself to crates that are downloaded locally, even if there might be a newer version as indicated in the local copy of the index.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Common Options diff --git a/src/doc/src/commands/cargo-fix.md b/src/doc/src/commands/cargo-fix.md index 5dcc36f07d5..3ea28ff05eb 100644 --- a/src/doc/src/commands/cargo-fix.md +++ b/src/doc/src/commands/cargo-fix.md @@ -370,15 +370,12 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -393,6 +390,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Common Options diff --git a/src/doc/src/commands/cargo-generate-lockfile.md b/src/doc/src/commands/cargo-generate-lockfile.md index dfa4c6996da..df20604f012 100644 --- a/src/doc/src/commands/cargo-generate-lockfile.md +++ b/src/doc/src/commands/cargo-generate-lockfile.md @@ -58,15 +58,12 @@ terminal. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -81,6 +78,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Common Options diff --git a/src/doc/src/commands/cargo-install.md b/src/doc/src/commands/cargo-install.md index 423b9f117a5..2629c8df9b4 100644 --- a/src/doc/src/commands/cargo-install.md +++ b/src/doc/src/commands/cargo-install.md @@ -266,15 +266,12 @@ information about timing information. ### Manifest Options
-
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -289,6 +286,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+
### Miscellaneous Options diff --git a/src/doc/src/commands/cargo-metadata.md b/src/doc/src/commands/cargo-metadata.md index 7cbf03daf42..ebe3f990e27 100644 --- a/src/doc/src/commands/cargo-metadata.md +++ b/src/doc/src/commands/cargo-metadata.md @@ -428,15 +428,12 @@ terminal. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -451,6 +448,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Common Options diff --git a/src/doc/src/commands/cargo-package.md b/src/doc/src/commands/cargo-package.md index 2158d202f3d..ee36ff32971 100644 --- a/src/doc/src/commands/cargo-package.md +++ b/src/doc/src/commands/cargo-package.md @@ -182,15 +182,12 @@ be specified multiple times, which enables all specified features. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -206,6 +203,10 @@ offline.

May also be specified with the net.offline config value. +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ + ### Miscellaneous Options diff --git a/src/doc/src/commands/cargo-pkgid.md b/src/doc/src/commands/cargo-pkgid.md index 523cc3c6e96..04fbbb2a5b1 100644 --- a/src/doc/src/commands/cargo-pkgid.md +++ b/src/doc/src/commands/cargo-pkgid.md @@ -90,15 +90,12 @@ terminal. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -114,6 +111,10 @@ offline.

May also be specified with the net.offline config value. +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ + ### Common Options diff --git a/src/doc/src/commands/cargo-publish.md b/src/doc/src/commands/cargo-publish.md index d0bbbc07472..8aecf270ce8 100644 --- a/src/doc/src/commands/cargo-publish.md +++ b/src/doc/src/commands/cargo-publish.md @@ -151,15 +151,12 @@ be specified multiple times, which enables all specified features. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -175,6 +172,10 @@ offline.

May also be specified with the net.offline config value. +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ + ### Miscellaneous Options diff --git a/src/doc/src/commands/cargo-remove.md b/src/doc/src/commands/cargo-remove.md index a59e0232e4e..fd000e22ac4 100644 --- a/src/doc/src/commands/cargo-remove.md +++ b/src/doc/src/commands/cargo-remove.md @@ -81,15 +81,12 @@ terminal. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -104,6 +101,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Package Selection diff --git a/src/doc/src/commands/cargo-run.md b/src/doc/src/commands/cargo-run.md index b79913194de..57b36519194 100644 --- a/src/doc/src/commands/cargo-run.md +++ b/src/doc/src/commands/cargo-run.md @@ -210,15 +210,12 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -234,6 +231,10 @@ offline.

May also be specified with the net.offline config value. +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ + ### Common Options diff --git a/src/doc/src/commands/cargo-rustc.md b/src/doc/src/commands/cargo-rustc.md index 7ad9bff168b..772632c46c3 100644 --- a/src/doc/src/commands/cargo-rustc.md +++ b/src/doc/src/commands/cargo-rustc.md @@ -304,15 +304,12 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -328,6 +325,10 @@ offline.

May also be specified with the net.offline config value. +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ + ### Common Options diff --git a/src/doc/src/commands/cargo-rustdoc.md b/src/doc/src/commands/cargo-rustdoc.md index 0ebb62efb78..574787b3cc7 100644 --- a/src/doc/src/commands/cargo-rustdoc.md +++ b/src/doc/src/commands/cargo-rustdoc.md @@ -285,15 +285,12 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -308,6 +305,10 @@ See the cargo-fetch(1) command to download depend offline.

May also be specified with the net.offline config value. + +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ ### Common Options diff --git a/src/doc/src/commands/cargo-test.md b/src/doc/src/commands/cargo-test.md index 127311cc58d..6815b2f43fe 100644 --- a/src/doc/src/commands/cargo-test.md +++ b/src/doc/src/commands/cargo-test.md @@ -406,15 +406,12 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -430,6 +427,10 @@ offline.

May also be specified with the net.offline config value. +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ + ### Common Options diff --git a/src/doc/src/commands/cargo-tree.md b/src/doc/src/commands/cargo-tree.md index 5997c9d20f8..78c6a9d4dc6 100644 --- a/src/doc/src/commands/cargo-tree.md +++ b/src/doc/src/commands/cargo-tree.md @@ -222,15 +222,12 @@ single quotes or double quotes around each pattern. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -246,6 +243,10 @@ offline.

May also be specified with the net.offline config value. +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ + ### Feature Selection diff --git a/src/doc/src/commands/cargo-update.md b/src/doc/src/commands/cargo-update.md index f8d90903faf..f20a48df46d 100644 --- a/src/doc/src/commands/cargo-update.md +++ b/src/doc/src/commands/cargo-update.md @@ -99,15 +99,12 @@ terminal. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -123,6 +120,10 @@ offline.

May also be specified with the net.offline config value. +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ + ### Common Options diff --git a/src/doc/src/commands/cargo-vendor.md b/src/doc/src/commands/cargo-vendor.md index 542333afb89..d3e029e8f71 100644 --- a/src/doc/src/commands/cargo-vendor.md +++ b/src/doc/src/commands/cargo-vendor.md @@ -68,15 +68,12 @@ only a subset of the packages have changed. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -92,6 +89,10 @@ offline.

May also be specified with the net.offline config value. +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ + ### Display Options diff --git a/src/doc/src/commands/cargo-verify-project.md b/src/doc/src/commands/cargo-verify-project.md index a62ee2aaa9b..f9f135dfb70 100644 --- a/src/doc/src/commands/cargo-verify-project.md +++ b/src/doc/src/commands/cargo-verify-project.md @@ -63,15 +63,12 @@ terminal. Cargo.toml file in the current directory or any parent directory. -
--frozen
--locked
-
Either of these flags requires that the Cargo.lock file be -up-to-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The --frozen flag also prevents Cargo from -attempting to access the network to determine if it is out-of-date.

-

These may be used in environments where you want to assert that the -Cargo.lock file is up-to-date (such as a CI build) or want to avoid network -access.

+
Requires the Cargo.lock file be up-to-date. If the lock file is missing, +or it needs to be updated due to changes in the Cargo.toml file, for example +a new dependency is added, Cargo will exit with an error.

+

It may be used in environments where you want to assert that the Cargo.lock +file is up-to-date (such as a CI build).

--offline
@@ -87,6 +84,10 @@ offline.

May also be specified with the net.offline config value. +

--frozen
+
Equivalent to specifying both --locked and --offline.
+ + ### Common Options diff --git a/src/etc/man/cargo-add.1 b/src/etc/man/cargo-add.1 index c44a4834686..7632b295d85 100644 --- a/src/etc/man/cargo-add.1 +++ b/src/etc/man/cargo-add.1 @@ -221,17 +221,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the Add dependencies to only the specified package. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -249,6 +246,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-bench.1 b/src/etc/man/cargo-bench.1 index 4f1ff291a7e..b43e8f74140 100644 --- a/src/etc/man/cargo-bench.1 +++ b/src/etc/man/cargo-bench.1 @@ -417,17 +417,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -445,6 +442,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-build.1 b/src/etc/man/cargo-build.1 index b0f04738ab0..6e51d3320c1 100644 --- a/src/etc/man/cargo-build.1 +++ b/src/etc/man/cargo-build.1 @@ -335,17 +335,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -363,6 +360,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-check.1 b/src/etc/man/cargo-check.1 index 2e2d8a6b08b..be0adf1630d 100644 --- a/src/etc/man/cargo-check.1 +++ b/src/etc/man/cargo-check.1 @@ -316,17 +316,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -344,6 +341,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-clean.1 b/src/etc/man/cargo-clean.1 index 621804d1b97..ddb1e7253da 100644 --- a/src/etc/man/cargo-clean.1 +++ b/src/etc/man/cargo-clean.1 @@ -115,17 +115,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -143,6 +140,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-doc.1 b/src/etc/man/cargo-doc.1 index 3832e7282c6..e449a6ba8d4 100644 --- a/src/etc/man/cargo-doc.1 +++ b/src/etc/man/cargo-doc.1 @@ -283,17 +283,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -311,6 +308,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-fetch.1 b/src/etc/man/cargo-fetch.1 index b63b9090cf3..323130c4d18 100644 --- a/src/etc/man/cargo-fetch.1 +++ b/src/etc/man/cargo-fetch.1 @@ -83,17 +83,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -109,6 +106,11 @@ if there might be a newer version as indicated in the local copy of the index. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-fix.1 b/src/etc/man/cargo-fix.1 index 22ac0b7edbc..0e3436d50fd 100644 --- a/src/etc/man/cargo-fix.1 +++ b/src/etc/man/cargo-fix.1 @@ -411,17 +411,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -439,6 +436,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-generate-lockfile.1 b/src/etc/man/cargo-generate-lockfile.1 index c98366c57a7..066357ea31e 100644 --- a/src/etc/man/cargo-generate-lockfile.1 +++ b/src/etc/man/cargo-generate-lockfile.1 @@ -62,17 +62,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -90,6 +87,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-install.1 b/src/etc/man/cargo-install.1 index 8ab35749a93..e14be11a584 100644 --- a/src/etc/man/cargo-install.1 +++ b/src/etc/man/cargo-install.1 @@ -302,17 +302,14 @@ information about timing information. .RE .SS "Manifest Options" .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -330,6 +327,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Miscellaneous Options" .sp \fB\-j\fR \fIN\fR, diff --git a/src/etc/man/cargo-metadata.1 b/src/etc/man/cargo-metadata.1 index a020153d2ed..60e99f9dfdb 100644 --- a/src/etc/man/cargo-metadata.1 +++ b/src/etc/man/cargo-metadata.1 @@ -436,17 +436,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. -.sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. +.sp +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -464,6 +461,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-package.1 b/src/etc/man/cargo-package.1 index b88b7a6a401..81ed84da828 100644 --- a/src/etc/man/cargo-package.1 +++ b/src/etc/man/cargo-package.1 @@ -198,17 +198,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -226,6 +223,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Miscellaneous Options" .sp \fB\-j\fR \fIN\fR, diff --git a/src/etc/man/cargo-pkgid.1 b/src/etc/man/cargo-pkgid.1 index bc5e99d4fa1..6ac6a480b82 100644 --- a/src/etc/man/cargo-pkgid.1 +++ b/src/etc/man/cargo-pkgid.1 @@ -121,17 +121,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -149,6 +146,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-publish.1 b/src/etc/man/cargo-publish.1 index bf4cea1c25d..57919c8dc83 100644 --- a/src/etc/man/cargo-publish.1 +++ b/src/etc/man/cargo-publish.1 @@ -154,17 +154,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -182,6 +179,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Miscellaneous Options" .sp \fB\-j\fR \fIN\fR, diff --git a/src/etc/man/cargo-remove.1 b/src/etc/man/cargo-remove.1 index 0c632083c2d..1296a8bedd9 100644 --- a/src/etc/man/cargo-remove.1 +++ b/src/etc/man/cargo-remove.1 @@ -81,17 +81,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -109,6 +106,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Package Selection" .sp \fB\-p\fR \fIspec\fR\[u2026], diff --git a/src/etc/man/cargo-run.1 b/src/etc/man/cargo-run.1 index 58569d77ec4..451489c4c81 100644 --- a/src/etc/man/cargo-run.1 +++ b/src/etc/man/cargo-run.1 @@ -220,17 +220,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -248,6 +245,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-rustc.1 b/src/etc/man/cargo-rustc.1 index e5f963f797e..fb1b78adefc 100644 --- a/src/etc/man/cargo-rustc.1 +++ b/src/etc/man/cargo-rustc.1 @@ -334,17 +334,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -362,6 +359,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-rustdoc.1 b/src/etc/man/cargo-rustdoc.1 index 4e7216c67b5..cec32b0e690 100644 --- a/src/etc/man/cargo-rustdoc.1 +++ b/src/etc/man/cargo-rustdoc.1 @@ -302,17 +302,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -330,6 +327,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-test.1 b/src/etc/man/cargo-test.1 index d760c8556f4..e1b93f994ea 100644 --- a/src/etc/man/cargo-test.1 +++ b/src/etc/man/cargo-test.1 @@ -444,17 +444,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -472,6 +469,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-tree.1 b/src/etc/man/cargo-tree.1 index 280aec23547..1cdf3397b70 100644 --- a/src/etc/man/cargo-tree.1 +++ b/src/etc/man/cargo-tree.1 @@ -266,17 +266,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -294,6 +291,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Feature Selection" The feature flags allow you to control which features are enabled. When no feature options are given, the \fBdefault\fR feature is activated for every diff --git a/src/etc/man/cargo-update.1 b/src/etc/man/cargo-update.1 index ac1e5a7a16a..78550378c60 100644 --- a/src/etc/man/cargo-update.1 +++ b/src/etc/man/cargo-update.1 @@ -105,17 +105,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -133,6 +130,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/src/etc/man/cargo-vendor.1 b/src/etc/man/cargo-vendor.1 index 92bd9f34c03..bc1de2f71e6 100644 --- a/src/etc/man/cargo-vendor.1 +++ b/src/etc/man/cargo-vendor.1 @@ -62,17 +62,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -90,6 +87,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Display Options" .sp \fB\-v\fR, diff --git a/src/etc/man/cargo-verify-project.1 b/src/etc/man/cargo-verify-project.1 index 1e36a66b6f2..657ca5f2b45 100644 --- a/src/etc/man/cargo-verify-project.1 +++ b/src/etc/man/cargo-verify-project.1 @@ -72,17 +72,14 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the \fBCargo.toml\fR file in the current directory or any parent directory. .RE .sp -\fB\-\-frozen\fR, \fB\-\-locked\fR .RS 4 -Either of these flags requires that the \fBCargo.lock\fR file be -up\-to\-date. If the lock file is missing, or it needs to be updated, Cargo will -exit with an error. The \fB\-\-frozen\fR flag also prevents Cargo from -attempting to access the network to determine if it is out\-of\-date. +Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, +or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example +a new dependency is added, Cargo will exit with an error. .sp -These may be used in environments where you want to assert that the -\fBCargo.lock\fR file is up\-to\-date (such as a CI build) or want to avoid network -access. +It may be used in environments where you want to assert that the \fBCargo.lock\fR +file is up\-to\-date (such as a CI build). .RE .sp \fB\-\-offline\fR @@ -100,6 +97,11 @@ offline. .sp May also be specified with the \fBnet.offline\fR \fIconfig value\fR \&. .RE +.sp +\fB\-\-frozen\fR +.RS 4 +Equivalent to specifying both \fB\-\-locked\fR and \fB\-\-offline\fR\&. +.RE .SS "Common Options" .sp \fB+\fR\fItoolchain\fR diff --git a/tests/testsuite/cargo/help/stdout.term.svg b/tests/testsuite/cargo/help/stdout.term.svg index e29e2acff25..0b087a57455 100644 --- a/tests/testsuite/cargo/help/stdout.term.svg +++ b/tests/testsuite/cargo/help/stdout.term.svg @@ -45,11 +45,11 @@ -C <DIRECTORY> Change to DIRECTORY before doing anything (nightly-only) - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline --config <KEY=VALUE> Override a configuration value diff --git a/tests/testsuite/cargo_add/help/stdout.term.svg b/tests/testsuite/cargo_add/help/stdout.term.svg index b6a4a476ea1..0d86a19d86f 100644 --- a/tests/testsuite/cargo_add/help/stdout.term.svg +++ b/tests/testsuite/cargo_add/help/stdout.term.svg @@ -179,21 +179,21 @@ - --frozen + --locked - Require Cargo.lock and cache to be up-to-date + Require Cargo.lock to be up-to-date - --locked + --offline - Require Cargo.lock to be up-to-date + Run without accessing the network - --offline + --frozen - Run without accessing the network + Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_bench/help/stdout.term.svg b/tests/testsuite/cargo_bench/help/stdout.term.svg index 1ea535a0bfe..029db745a77 100644 --- a/tests/testsuite/cargo_bench/help/stdout.term.svg +++ b/tests/testsuite/cargo_bench/help/stdout.term.svg @@ -127,11 +127,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_build/help/stdout.term.svg b/tests/testsuite/cargo_build/help/stdout.term.svg index 92095ae1521..6cc51e692ee 100644 --- a/tests/testsuite/cargo_build/help/stdout.term.svg +++ b/tests/testsuite/cargo_build/help/stdout.term.svg @@ -125,11 +125,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_check/help/stdout.term.svg b/tests/testsuite/cargo_check/help/stdout.term.svg index 8ef0b9b3209..df573a98762 100644 --- a/tests/testsuite/cargo_check/help/stdout.term.svg +++ b/tests/testsuite/cargo_check/help/stdout.term.svg @@ -121,11 +121,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_clean/help/stdout.term.svg b/tests/testsuite/cargo_clean/help/stdout.term.svg index 9af234f7b1b..f2c6ef2efc5 100644 --- a/tests/testsuite/cargo_clean/help/stdout.term.svg +++ b/tests/testsuite/cargo_clean/help/stdout.term.svg @@ -69,11 +69,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_config/help/stdout.term.svg b/tests/testsuite/cargo_config/help/stdout.term.svg index a1b954e07f2..e57c40e2724 100644 --- a/tests/testsuite/cargo_config/help/stdout.term.svg +++ b/tests/testsuite/cargo_config/help/stdout.term.svg @@ -51,11 +51,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_doc/help/stdout.term.svg b/tests/testsuite/cargo_doc/help/stdout.term.svg index 8c7bc637f3c..625889afff7 100644 --- a/tests/testsuite/cargo_doc/help/stdout.term.svg +++ b/tests/testsuite/cargo_doc/help/stdout.term.svg @@ -115,11 +115,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_fetch/help/stdout.term.svg b/tests/testsuite/cargo_fetch/help/stdout.term.svg index ea89e7e3430..26e762e8f49 100644 --- a/tests/testsuite/cargo_fetch/help/stdout.term.svg +++ b/tests/testsuite/cargo_fetch/help/stdout.term.svg @@ -53,11 +53,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_fix/help/stdout.term.svg b/tests/testsuite/cargo_fix/help/stdout.term.svg index 658ad3dfe59..7a2286fc66f 100644 --- a/tests/testsuite/cargo_fix/help/stdout.term.svg +++ b/tests/testsuite/cargo_fix/help/stdout.term.svg @@ -129,11 +129,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg b/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg index fbada69b833..98f5fae89a7 100644 --- a/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg +++ b/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg @@ -47,11 +47,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_help/help/stdout.term.svg b/tests/testsuite/cargo_help/help/stdout.term.svg index b63e33f0d8e..251fcef43be 100644 --- a/tests/testsuite/cargo_help/help/stdout.term.svg +++ b/tests/testsuite/cargo_help/help/stdout.term.svg @@ -51,11 +51,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_init/help/stdout.term.svg b/tests/testsuite/cargo_init/help/stdout.term.svg index e832172a0b1..7080cf488f2 100644 --- a/tests/testsuite/cargo_init/help/stdout.term.svg +++ b/tests/testsuite/cargo_init/help/stdout.term.svg @@ -69,11 +69,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_install/help/stdout.term.svg b/tests/testsuite/cargo_install/help/stdout.term.svg index 9b0579cbff0..d226bdc3bfc 100644 --- a/tests/testsuite/cargo_install/help/stdout.term.svg +++ b/tests/testsuite/cargo_install/help/stdout.term.svg @@ -121,11 +121,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_locate_project/help/stdout.term.svg b/tests/testsuite/cargo_locate_project/help/stdout.term.svg index b21df68c71a..70b305a8476 100644 --- a/tests/testsuite/cargo_locate_project/help/stdout.term.svg +++ b/tests/testsuite/cargo_locate_project/help/stdout.term.svg @@ -53,11 +53,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_login/help/stdout.term.svg b/tests/testsuite/cargo_login/help/stdout.term.svg index bab300ed682..51be04e8247 100644 --- a/tests/testsuite/cargo_login/help/stdout.term.svg +++ b/tests/testsuite/cargo_login/help/stdout.term.svg @@ -55,11 +55,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_logout/help/stdout.term.svg b/tests/testsuite/cargo_logout/help/stdout.term.svg index 34d28d8b600..f8750437ed7 100644 --- a/tests/testsuite/cargo_logout/help/stdout.term.svg +++ b/tests/testsuite/cargo_logout/help/stdout.term.svg @@ -47,11 +47,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_metadata/help/stdout.term.svg b/tests/testsuite/cargo_metadata/help/stdout.term.svg index 494a95c1895..43a082c29ba 100644 --- a/tests/testsuite/cargo_metadata/help/stdout.term.svg +++ b/tests/testsuite/cargo_metadata/help/stdout.term.svg @@ -69,11 +69,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_new/help/stdout.term.svg b/tests/testsuite/cargo_new/help/stdout.term.svg index bd7a3c59cd5..d6f12aafaa1 100644 --- a/tests/testsuite/cargo_new/help/stdout.term.svg +++ b/tests/testsuite/cargo_new/help/stdout.term.svg @@ -69,11 +69,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_owner/help/stdout.term.svg b/tests/testsuite/cargo_owner/help/stdout.term.svg index ade9c448f25..4d040bcadbf 100644 --- a/tests/testsuite/cargo_owner/help/stdout.term.svg +++ b/tests/testsuite/cargo_owner/help/stdout.term.svg @@ -63,11 +63,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_package/help/stdout.term.svg b/tests/testsuite/cargo_package/help/stdout.term.svg index 8a0767191f7..5d0a0decf4b 100644 --- a/tests/testsuite/cargo_package/help/stdout.term.svg +++ b/tests/testsuite/cargo_package/help/stdout.term.svg @@ -87,11 +87,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_pkgid/help/stdout.term.svg b/tests/testsuite/cargo_pkgid/help/stdout.term.svg index beee2c2f90a..3e7d985cf99 100644 --- a/tests/testsuite/cargo_pkgid/help/stdout.term.svg +++ b/tests/testsuite/cargo_pkgid/help/stdout.term.svg @@ -59,11 +59,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_publish/help/stdout.term.svg b/tests/testsuite/cargo_publish/help/stdout.term.svg index 29ba1e1a571..240bb9ee1e2 100644 --- a/tests/testsuite/cargo_publish/help/stdout.term.svg +++ b/tests/testsuite/cargo_publish/help/stdout.term.svg @@ -87,11 +87,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_read_manifest/help/stdout.term.svg b/tests/testsuite/cargo_read_manifest/help/stdout.term.svg index 06cb56201d4..f81c9a26829 100644 --- a/tests/testsuite/cargo_read_manifest/help/stdout.term.svg +++ b/tests/testsuite/cargo_read_manifest/help/stdout.term.svg @@ -51,11 +51,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_remove/help/stdout.term.svg b/tests/testsuite/cargo_remove/help/stdout.term.svg index 7e427d870eb..cbaab26ce4c 100644 --- a/tests/testsuite/cargo_remove/help/stdout.term.svg +++ b/tests/testsuite/cargo_remove/help/stdout.term.svg @@ -71,11 +71,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_report/help/stdout.term.svg b/tests/testsuite/cargo_report/help/stdout.term.svg index d1db5427fa3..2df6b7d3320 100644 --- a/tests/testsuite/cargo_report/help/stdout.term.svg +++ b/tests/testsuite/cargo_report/help/stdout.term.svg @@ -51,11 +51,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_run/help/stdout.term.svg b/tests/testsuite/cargo_run/help/stdout.term.svg index c4bfa6bb33c..916e047c301 100644 --- a/tests/testsuite/cargo_run/help/stdout.term.svg +++ b/tests/testsuite/cargo_run/help/stdout.term.svg @@ -103,11 +103,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_rustc/help/stdout.term.svg b/tests/testsuite/cargo_rustc/help/stdout.term.svg index d43d6b3bd29..0c8f491797b 100644 --- a/tests/testsuite/cargo_rustc/help/stdout.term.svg +++ b/tests/testsuite/cargo_rustc/help/stdout.term.svg @@ -125,11 +125,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_rustdoc/help/stdout.term.svg b/tests/testsuite/cargo_rustdoc/help/stdout.term.svg index 6564f7e7f94..9b31646bf0a 100644 --- a/tests/testsuite/cargo_rustdoc/help/stdout.term.svg +++ b/tests/testsuite/cargo_rustdoc/help/stdout.term.svg @@ -123,11 +123,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_search/help/stdout.term.svg b/tests/testsuite/cargo_search/help/stdout.term.svg index 00ca8c7f6e2..9884ffa31d8 100644 --- a/tests/testsuite/cargo_search/help/stdout.term.svg +++ b/tests/testsuite/cargo_search/help/stdout.term.svg @@ -57,11 +57,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_test/help/stdout.term.svg b/tests/testsuite/cargo_test/help/stdout.term.svg index 026a47189a9..994387fc08c 100644 --- a/tests/testsuite/cargo_test/help/stdout.term.svg +++ b/tests/testsuite/cargo_test/help/stdout.term.svg @@ -133,11 +133,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_tree/help/stdout.term.svg b/tests/testsuite/cargo_tree/help/stdout.term.svg index 1e3a4ac86c3..57568a0bda2 100644 --- a/tests/testsuite/cargo_tree/help/stdout.term.svg +++ b/tests/testsuite/cargo_tree/help/stdout.term.svg @@ -97,11 +97,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_uninstall/help/stdout.term.svg b/tests/testsuite/cargo_uninstall/help/stdout.term.svg index 0f051f912b0..4eb4f3a9ac2 100644 --- a/tests/testsuite/cargo_uninstall/help/stdout.term.svg +++ b/tests/testsuite/cargo_uninstall/help/stdout.term.svg @@ -65,11 +65,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_update/help/stdout.term.svg b/tests/testsuite/cargo_update/help/stdout.term.svg index 5f1b8dbd4e2..46285c95d0c 100644 --- a/tests/testsuite/cargo_update/help/stdout.term.svg +++ b/tests/testsuite/cargo_update/help/stdout.term.svg @@ -61,11 +61,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_vendor/help/stdout.term.svg b/tests/testsuite/cargo_vendor/help/stdout.term.svg index fe7512192f3..9b1fe4aea5a 100644 --- a/tests/testsuite/cargo_vendor/help/stdout.term.svg +++ b/tests/testsuite/cargo_vendor/help/stdout.term.svg @@ -63,11 +63,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_verify_project/help/stdout.term.svg b/tests/testsuite/cargo_verify_project/help/stdout.term.svg index b988450983a..d36c7403085 100644 --- a/tests/testsuite/cargo_verify_project/help/stdout.term.svg +++ b/tests/testsuite/cargo_verify_project/help/stdout.term.svg @@ -47,11 +47,11 @@ --manifest-path <PATH> Path to Cargo.toml - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_version/help/stdout.term.svg b/tests/testsuite/cargo_version/help/stdout.term.svg index dcecb04144b..ee3ffa43f13 100644 --- a/tests/testsuite/cargo_version/help/stdout.term.svg +++ b/tests/testsuite/cargo_version/help/stdout.term.svg @@ -45,11 +45,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline diff --git a/tests/testsuite/cargo_yank/help/stdout.term.svg b/tests/testsuite/cargo_yank/help/stdout.term.svg index fc5b6e6da95..c378d4d009a 100644 --- a/tests/testsuite/cargo_yank/help/stdout.term.svg +++ b/tests/testsuite/cargo_yank/help/stdout.term.svg @@ -61,11 +61,11 @@ Manifest Options: - --frozen Require Cargo.lock and cache to be up-to-date + --locked Require Cargo.lock to be up-to-date - --locked Require Cargo.lock to be up-to-date + --offline Run without accessing the network - --offline Run without accessing the network + --frozen Equivalent to specifying both --locked and --offline From 26b2e74e555f85e69ec711dfd526598aaac2ba78 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Wed, 27 Mar 2024 22:24:06 -0400 Subject: [PATCH 2/2] docs: clarify `--locked` disallows changes in `Cargo.lock` --- src/bin/cargo/cli.rs | 2 +- src/doc/man/generated_txt/cargo-add.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-bench.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-build.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-check.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-clean.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-doc.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-fetch.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-fix.txt | 17 +++++++++++------ .../generated_txt/cargo-generate-lockfile.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-install.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-metadata.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-package.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-pkgid.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-publish.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-remove.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-run.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-rustc.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-rustdoc.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-test.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-tree.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-update.txt | 17 +++++++++++------ src/doc/man/generated_txt/cargo-vendor.txt | 17 +++++++++++------ .../man/generated_txt/cargo-verify-project.txt | 17 +++++++++++------ src/doc/man/includes/options-locked.md | 13 ++++++++----- src/doc/src/commands/cargo-add.md | 14 +++++++++----- src/doc/src/commands/cargo-bench.md | 14 +++++++++----- src/doc/src/commands/cargo-build.md | 14 +++++++++----- src/doc/src/commands/cargo-check.md | 14 +++++++++----- src/doc/src/commands/cargo-clean.md | 14 +++++++++----- src/doc/src/commands/cargo-doc.md | 14 +++++++++----- src/doc/src/commands/cargo-fetch.md | 14 +++++++++----- src/doc/src/commands/cargo-fix.md | 14 +++++++++----- .../src/commands/cargo-generate-lockfile.md | 14 +++++++++----- src/doc/src/commands/cargo-install.md | 14 +++++++++----- src/doc/src/commands/cargo-metadata.md | 14 +++++++++----- src/doc/src/commands/cargo-package.md | 14 +++++++++----- src/doc/src/commands/cargo-pkgid.md | 14 +++++++++----- src/doc/src/commands/cargo-publish.md | 14 +++++++++----- src/doc/src/commands/cargo-remove.md | 14 +++++++++----- src/doc/src/commands/cargo-run.md | 14 +++++++++----- src/doc/src/commands/cargo-rustc.md | 14 +++++++++----- src/doc/src/commands/cargo-rustdoc.md | 14 +++++++++----- src/doc/src/commands/cargo-test.md | 14 +++++++++----- src/doc/src/commands/cargo-tree.md | 14 +++++++++----- src/doc/src/commands/cargo-update.md | 14 +++++++++----- src/doc/src/commands/cargo-vendor.md | 14 +++++++++----- src/doc/src/commands/cargo-verify-project.md | 14 +++++++++----- src/etc/man/cargo-add.1 | 18 +++++++++++++----- src/etc/man/cargo-bench.1 | 18 +++++++++++++----- src/etc/man/cargo-build.1 | 18 +++++++++++++----- src/etc/man/cargo-check.1 | 18 +++++++++++++----- src/etc/man/cargo-clean.1 | 18 +++++++++++++----- src/etc/man/cargo-doc.1 | 18 +++++++++++++----- src/etc/man/cargo-fetch.1 | 18 +++++++++++++----- src/etc/man/cargo-fix.1 | 18 +++++++++++++----- src/etc/man/cargo-generate-lockfile.1 | 18 +++++++++++++----- src/etc/man/cargo-install.1 | 18 +++++++++++++----- src/etc/man/cargo-metadata.1 | 18 +++++++++++++----- src/etc/man/cargo-package.1 | 18 +++++++++++++----- src/etc/man/cargo-pkgid.1 | 18 +++++++++++++----- src/etc/man/cargo-publish.1 | 18 +++++++++++++----- src/etc/man/cargo-remove.1 | 18 +++++++++++++----- src/etc/man/cargo-run.1 | 18 +++++++++++++----- src/etc/man/cargo-rustc.1 | 18 +++++++++++++----- src/etc/man/cargo-rustdoc.1 | 18 +++++++++++++----- src/etc/man/cargo-test.1 | 18 +++++++++++++----- src/etc/man/cargo-tree.1 | 18 +++++++++++++----- src/etc/man/cargo-update.1 | 18 +++++++++++++----- src/etc/man/cargo-vendor.1 | 18 +++++++++++++----- src/etc/man/cargo-verify-project.1 | 18 +++++++++++++----- tests/testsuite/cargo/help/stdout.term.svg | 2 +- tests/testsuite/cargo_add/help/stdout.term.svg | 2 +- .../testsuite/cargo_bench/help/stdout.term.svg | 2 +- .../testsuite/cargo_build/help/stdout.term.svg | 2 +- .../testsuite/cargo_check/help/stdout.term.svg | 2 +- .../testsuite/cargo_clean/help/stdout.term.svg | 2 +- .../cargo_config/help/stdout.term.svg | 2 +- tests/testsuite/cargo_doc/help/stdout.term.svg | 2 +- .../testsuite/cargo_fetch/help/stdout.term.svg | 2 +- tests/testsuite/cargo_fix/help/stdout.term.svg | 2 +- .../help/stdout.term.svg | 2 +- .../testsuite/cargo_help/help/stdout.term.svg | 2 +- .../testsuite/cargo_init/help/stdout.term.svg | 2 +- .../cargo_install/help/stdout.term.svg | 2 +- .../cargo_locate_project/help/stdout.term.svg | 2 +- .../testsuite/cargo_login/help/stdout.term.svg | 2 +- .../cargo_logout/help/stdout.term.svg | 2 +- .../cargo_metadata/help/stdout.term.svg | 2 +- tests/testsuite/cargo_new/help/stdout.term.svg | 2 +- .../testsuite/cargo_owner/help/stdout.term.svg | 2 +- .../cargo_package/help/stdout.term.svg | 2 +- .../testsuite/cargo_pkgid/help/stdout.term.svg | 2 +- .../cargo_publish/help/stdout.term.svg | 2 +- .../cargo_read_manifest/help/stdout.term.svg | 2 +- .../cargo_remove/help/stdout.term.svg | 2 +- .../cargo_report/help/stdout.term.svg | 2 +- tests/testsuite/cargo_run/help/stdout.term.svg | 2 +- .../testsuite/cargo_rustc/help/stdout.term.svg | 2 +- .../cargo_rustdoc/help/stdout.term.svg | 2 +- .../cargo_search/help/stdout.term.svg | 2 +- .../testsuite/cargo_test/help/stdout.term.svg | 2 +- .../testsuite/cargo_tree/help/stdout.term.svg | 2 +- .../cargo_uninstall/help/stdout.term.svg | 2 +- .../cargo_update/help/stdout.term.svg | 2 +- .../cargo_vendor/help/stdout.term.svg | 2 +- .../cargo_verify_project/help/stdout.term.svg | 2 +- .../cargo_version/help/stdout.term.svg | 2 +- .../testsuite/cargo_yank/help/stdout.term.svg | 2 +- 109 files changed, 806 insertions(+), 412 deletions(-) diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs index 95e5c0e8a67..f4f04bb4f5e 100644 --- a/src/bin/cargo/cli.rs +++ b/src/bin/cargo/cli.rs @@ -640,7 +640,7 @@ See 'cargo help <>' for more information on a sp .value_parser(clap::builder::ValueParser::path_buf()), ) .arg( - flag("locked", "Require Cargo.lock to be up-to-date") + flag("locked", "Assert that `Cargo.lock` will remain unchanged") .help_heading(heading::MANIFEST_OPTIONS) .global(true), ) diff --git a/src/doc/man/generated_txt/cargo-add.txt b/src/doc/man/generated_txt/cargo-add.txt index b8981fd2087..83e1dda7de2 100644 --- a/src/doc/man/generated_txt/cargo-add.txt +++ b/src/doc/man/generated_txt/cargo-add.txt @@ -172,13 +172,18 @@ OPTIONS Add dependencies to only the specified package. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-bench.txt b/src/doc/man/generated_txt/cargo-bench.txt index f75e8ac8264..7984879acdb 100644 --- a/src/doc/man/generated_txt/cargo-bench.txt +++ b/src/doc/man/generated_txt/cargo-bench.txt @@ -339,13 +339,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-build.txt b/src/doc/man/generated_txt/cargo-build.txt index e6fc2616a25..7d652e8eb0c 100644 --- a/src/doc/man/generated_txt/cargo-build.txt +++ b/src/doc/man/generated_txt/cargo-build.txt @@ -273,13 +273,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-check.txt b/src/doc/man/generated_txt/cargo-check.txt index 0cbb36a1aea..bfc300360f9 100644 --- a/src/doc/man/generated_txt/cargo-check.txt +++ b/src/doc/man/generated_txt/cargo-check.txt @@ -258,13 +258,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-clean.txt b/src/doc/man/generated_txt/cargo-clean.txt index fb50ba7ece4..066a70352a3 100644 --- a/src/doc/man/generated_txt/cargo-clean.txt +++ b/src/doc/man/generated_txt/cargo-clean.txt @@ -92,13 +92,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-doc.txt b/src/doc/man/generated_txt/cargo-doc.txt index f4b93a9985a..d6b0eb2afdc 100644 --- a/src/doc/man/generated_txt/cargo-doc.txt +++ b/src/doc/man/generated_txt/cargo-doc.txt @@ -229,13 +229,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-fetch.txt b/src/doc/man/generated_txt/cargo-fetch.txt index 37ecd928bec..63fa205a3c5 100644 --- a/src/doc/man/generated_txt/cargo-fetch.txt +++ b/src/doc/man/generated_txt/cargo-fetch.txt @@ -72,13 +72,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-fix.txt b/src/doc/man/generated_txt/cargo-fix.txt index 81830bf1c13..92b2d9d0881 100644 --- a/src/doc/man/generated_txt/cargo-fix.txt +++ b/src/doc/man/generated_txt/cargo-fix.txt @@ -331,13 +331,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-generate-lockfile.txt b/src/doc/man/generated_txt/cargo-generate-lockfile.txt index 7e5dae0627d..d1951275e3b 100644 --- a/src/doc/man/generated_txt/cargo-generate-lockfile.txt +++ b/src/doc/man/generated_txt/cargo-generate-lockfile.txt @@ -47,13 +47,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-install.txt b/src/doc/man/generated_txt/cargo-install.txt index 2ba85c59632..1e362195250 100644 --- a/src/doc/man/generated_txt/cargo-install.txt +++ b/src/doc/man/generated_txt/cargo-install.txt @@ -243,13 +243,18 @@ OPTIONS Manifest Options --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-metadata.txt b/src/doc/man/generated_txt/cargo-metadata.txt index dd670191add..f1f5b1fc275 100644 --- a/src/doc/man/generated_txt/cargo-metadata.txt +++ b/src/doc/man/generated_txt/cargo-metadata.txt @@ -405,13 +405,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-package.txt b/src/doc/man/generated_txt/cargo-package.txt index 1dbed569220..f24d09b75c9 100644 --- a/src/doc/man/generated_txt/cargo-package.txt +++ b/src/doc/man/generated_txt/cargo-package.txt @@ -159,13 +159,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-pkgid.txt b/src/doc/man/generated_txt/cargo-pkgid.txt index 00bcd4f3e72..3123dcad20b 100644 --- a/src/doc/man/generated_txt/cargo-pkgid.txt +++ b/src/doc/man/generated_txt/cargo-pkgid.txt @@ -85,13 +85,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-publish.txt b/src/doc/man/generated_txt/cargo-publish.txt index 16c4010655c..d0b32a1582d 100644 --- a/src/doc/man/generated_txt/cargo-publish.txt +++ b/src/doc/man/generated_txt/cargo-publish.txt @@ -129,13 +129,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-remove.txt b/src/doc/man/generated_txt/cargo-remove.txt index 5092dd94e50..9d8c14afcc9 100644 --- a/src/doc/man/generated_txt/cargo-remove.txt +++ b/src/doc/man/generated_txt/cargo-remove.txt @@ -62,13 +62,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-run.txt b/src/doc/man/generated_txt/cargo-run.txt index e977975cb20..0a86eaba12d 100644 --- a/src/doc/man/generated_txt/cargo-run.txt +++ b/src/doc/man/generated_txt/cargo-run.txt @@ -177,13 +177,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-rustc.txt b/src/doc/man/generated_txt/cargo-rustc.txt index 878889cc188..e16633b7dde 100644 --- a/src/doc/man/generated_txt/cargo-rustc.txt +++ b/src/doc/man/generated_txt/cargo-rustc.txt @@ -275,13 +275,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-rustdoc.txt b/src/doc/man/generated_txt/cargo-rustdoc.txt index 92c32864f54..024796e2ed3 100644 --- a/src/doc/man/generated_txt/cargo-rustdoc.txt +++ b/src/doc/man/generated_txt/cargo-rustdoc.txt @@ -245,13 +245,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-test.txt b/src/doc/man/generated_txt/cargo-test.txt index a0b4c43fd1a..690fb31ddba 100644 --- a/src/doc/man/generated_txt/cargo-test.txt +++ b/src/doc/man/generated_txt/cargo-test.txt @@ -365,13 +365,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-tree.txt b/src/doc/man/generated_txt/cargo-tree.txt index 0bd39986c62..4037e7f0c5c 100644 --- a/src/doc/man/generated_txt/cargo-tree.txt +++ b/src/doc/man/generated_txt/cargo-tree.txt @@ -212,13 +212,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-update.txt b/src/doc/man/generated_txt/cargo-update.txt index a4b9c24f6bb..a1be485b987 100644 --- a/src/doc/man/generated_txt/cargo-update.txt +++ b/src/doc/man/generated_txt/cargo-update.txt @@ -82,13 +82,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-vendor.txt b/src/doc/man/generated_txt/cargo-vendor.txt index a46c2afe96e..ab1e9a0f09b 100644 --- a/src/doc/man/generated_txt/cargo-vendor.txt +++ b/src/doc/man/generated_txt/cargo-vendor.txt @@ -54,13 +54,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/generated_txt/cargo-verify-project.txt b/src/doc/man/generated_txt/cargo-verify-project.txt index 86736043b25..aca632b5c6f 100644 --- a/src/doc/man/generated_txt/cargo-verify-project.txt +++ b/src/doc/man/generated_txt/cargo-verify-project.txt @@ -50,13 +50,18 @@ OPTIONS Cargo.toml file in the current directory or any parent directory. --locked - Requires the Cargo.lock file be up-to-date. If the lock file is - missing, or it needs to be updated due to changes in the Cargo.toml - file, for example a new dependency is added, Cargo will exit with an - error. + Asserts that the exact same dependencies and versions are used as + when the existing Cargo.lock file was originally generated. Cargo + will exit with an error when either of the following scenarios + arises: - It may be used in environments where you want to assert that the - Cargo.lock file is up-to-date (such as a CI build). + o The lock file is missing. + + o Cargo attempted to change the lock file due to a different + dependency resolution. + + It may be used in environments where deterministic builds are + desired, such as in CI pipelines. --offline Prevents Cargo from accessing the network for any reason. Without diff --git a/src/doc/man/includes/options-locked.md b/src/doc/man/includes/options-locked.md index 34fa96bef9c..31c8d1e006d 100644 --- a/src/doc/man/includes/options-locked.md +++ b/src/doc/man/includes/options-locked.md @@ -1,10 +1,13 @@ {{#option "`--locked`"}} -Requires the `Cargo.lock` file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the `Cargo.toml` file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing `Cargo.lock` file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: -It may be used in environments where you want to assert that the `Cargo.lock` -file is up-to-date (such as a CI build). +* The lock file is missing. +* Cargo attempted to change the lock file due to a different dependency resolution. + +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. {{/option}} {{#option "`--offline`"}} diff --git a/src/doc/src/commands/cargo-add.md b/src/doc/src/commands/cargo-add.md index 15b461ab1eb..80fb05615ac 100644 --- a/src/doc/src/commands/cargo-add.md +++ b/src/doc/src/commands/cargo-add.md @@ -192,11 +192,15 @@ terminal.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-bench.md b/src/doc/src/commands/cargo-bench.md index 40ee4fd1b99..45b26f2aa75 100644 --- a/src/doc/src/commands/cargo-bench.md +++ b/src/doc/src/commands/cargo-bench.md @@ -378,11 +378,15 @@ coming from rustc are still emitted. Cannot be used with human or <
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-build.md b/src/doc/src/commands/cargo-build.md index 85cc12a18b0..83296999f84 100644 --- a/src/doc/src/commands/cargo-build.md +++ b/src/doc/src/commands/cargo-build.md @@ -309,11 +309,15 @@ See https://github.com/
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-check.md b/src/doc/src/commands/cargo-check.md index 8ef1a28df15..b8c991d57c1 100644 --- a/src/doc/src/commands/cargo-check.md +++ b/src/doc/src/commands/cargo-check.md @@ -291,11 +291,15 @@ coming from rustc are still emitted. Cannot be used with human or <
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-clean.md b/src/doc/src/commands/cargo-clean.md index fbcc783a06c..aa4e0eb46e3 100644 --- a/src/doc/src/commands/cargo-clean.md +++ b/src/doc/src/commands/cargo-clean.md @@ -111,11 +111,15 @@ terminal.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-doc.md b/src/doc/src/commands/cargo-doc.md index a15c5a2cadb..0c49b9e7a79 100644 --- a/src/doc/src/commands/cargo-doc.md +++ b/src/doc/src/commands/cargo-doc.md @@ -266,11 +266,15 @@ coming from rustc are still emitted. Cannot be used with human or <
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-fetch.md b/src/doc/src/commands/cargo-fetch.md index 07a2b27dee8..694a4a2f0ca 100644 --- a/src/doc/src/commands/cargo-fetch.md +++ b/src/doc/src/commands/cargo-fetch.md @@ -80,11 +80,15 @@ terminal.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-fix.md b/src/doc/src/commands/cargo-fix.md index 3ea28ff05eb..7c78b6b89da 100644 --- a/src/doc/src/commands/cargo-fix.md +++ b/src/doc/src/commands/cargo-fix.md @@ -371,11 +371,15 @@ coming from rustc are still emitted. Cannot be used with human or <
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-generate-lockfile.md b/src/doc/src/commands/cargo-generate-lockfile.md index df20604f012..ee52d544c2c 100644 --- a/src/doc/src/commands/cargo-generate-lockfile.md +++ b/src/doc/src/commands/cargo-generate-lockfile.md @@ -59,11 +59,15 @@ terminal.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-install.md b/src/doc/src/commands/cargo-install.md index 2629c8df9b4..d664bc7ed42 100644 --- a/src/doc/src/commands/cargo-install.md +++ b/src/doc/src/commands/cargo-install.md @@ -267,11 +267,15 @@ information about timing information.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-metadata.md b/src/doc/src/commands/cargo-metadata.md index ebe3f990e27..31c01df85b7 100644 --- a/src/doc/src/commands/cargo-metadata.md +++ b/src/doc/src/commands/cargo-metadata.md @@ -429,11 +429,15 @@ terminal.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-package.md b/src/doc/src/commands/cargo-package.md index ee36ff32971..94fd89bd670 100644 --- a/src/doc/src/commands/cargo-package.md +++ b/src/doc/src/commands/cargo-package.md @@ -183,11 +183,15 @@ be specified multiple times, which enables all specified features.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-pkgid.md b/src/doc/src/commands/cargo-pkgid.md index 04fbbb2a5b1..e392985f1f5 100644 --- a/src/doc/src/commands/cargo-pkgid.md +++ b/src/doc/src/commands/cargo-pkgid.md @@ -91,11 +91,15 @@ terminal.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-publish.md b/src/doc/src/commands/cargo-publish.md index 8aecf270ce8..17d917b7ca5 100644 --- a/src/doc/src/commands/cargo-publish.md +++ b/src/doc/src/commands/cargo-publish.md @@ -152,11 +152,15 @@ be specified multiple times, which enables all specified features.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-remove.md b/src/doc/src/commands/cargo-remove.md index fd000e22ac4..afbcbf590eb 100644 --- a/src/doc/src/commands/cargo-remove.md +++ b/src/doc/src/commands/cargo-remove.md @@ -82,11 +82,15 @@ terminal.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-run.md b/src/doc/src/commands/cargo-run.md index 57b36519194..cebd0edb2a5 100644 --- a/src/doc/src/commands/cargo-run.md +++ b/src/doc/src/commands/cargo-run.md @@ -211,11 +211,15 @@ coming from rustc are still emitted. Cannot be used with human or <
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-rustc.md b/src/doc/src/commands/cargo-rustc.md index 772632c46c3..3d72c5b2b4a 100644 --- a/src/doc/src/commands/cargo-rustc.md +++ b/src/doc/src/commands/cargo-rustc.md @@ -305,11 +305,15 @@ coming from rustc are still emitted. Cannot be used with human or <
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-rustdoc.md b/src/doc/src/commands/cargo-rustdoc.md index 574787b3cc7..d6faf986e5e 100644 --- a/src/doc/src/commands/cargo-rustdoc.md +++ b/src/doc/src/commands/cargo-rustdoc.md @@ -286,11 +286,15 @@ coming from rustc are still emitted. Cannot be used with human or <
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-test.md b/src/doc/src/commands/cargo-test.md index 6815b2f43fe..f631e9d454d 100644 --- a/src/doc/src/commands/cargo-test.md +++ b/src/doc/src/commands/cargo-test.md @@ -407,11 +407,15 @@ coming from rustc are still emitted. Cannot be used with human or <
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-tree.md b/src/doc/src/commands/cargo-tree.md index 78c6a9d4dc6..a596a9b9882 100644 --- a/src/doc/src/commands/cargo-tree.md +++ b/src/doc/src/commands/cargo-tree.md @@ -223,11 +223,15 @@ single quotes or double quotes around each pattern.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-update.md b/src/doc/src/commands/cargo-update.md index f20a48df46d..6416c8149ca 100644 --- a/src/doc/src/commands/cargo-update.md +++ b/src/doc/src/commands/cargo-update.md @@ -100,11 +100,15 @@ terminal.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-vendor.md b/src/doc/src/commands/cargo-vendor.md index d3e029e8f71..12269570bb0 100644 --- a/src/doc/src/commands/cargo-vendor.md +++ b/src/doc/src/commands/cargo-vendor.md @@ -69,11 +69,15 @@ only a subset of the packages have changed.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/doc/src/commands/cargo-verify-project.md b/src/doc/src/commands/cargo-verify-project.md index f9f135dfb70..68bd00344ef 100644 --- a/src/doc/src/commands/cargo-verify-project.md +++ b/src/doc/src/commands/cargo-verify-project.md @@ -64,11 +64,15 @@ terminal.
--locked
-
Requires the Cargo.lock file be up-to-date. If the lock file is missing, -or it needs to be updated due to changes in the Cargo.toml file, for example -a new dependency is added, Cargo will exit with an error.

-

It may be used in environments where you want to assert that the Cargo.lock -file is up-to-date (such as a CI build).

+
Asserts that the exact same dependencies and versions are used as when the +existing Cargo.lock file was originally generated. Cargo will exit with an +error when either of the following scenarios arises:

+
    +
  • The lock file is missing.
    • +
  • Cargo attempted to change the lock file due to a different dependency resolution.
    • +
+

It may be used in environments where deterministic builds are desired, +such as in CI pipelines.

--offline
diff --git a/src/etc/man/cargo-add.1 b/src/etc/man/cargo-add.1 index 7632b295d85..49cd2fba9b5 100644 --- a/src/etc/man/cargo-add.1 +++ b/src/etc/man/cargo-add.1 @@ -223,12 +223,20 @@ Add dependencies to only the specified package. .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-bench.1 b/src/etc/man/cargo-bench.1 index b43e8f74140..a307f8c8c74 100644 --- a/src/etc/man/cargo-bench.1 +++ b/src/etc/man/cargo-bench.1 @@ -419,12 +419,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-build.1 b/src/etc/man/cargo-build.1 index 6e51d3320c1..7046b7f3fdf 100644 --- a/src/etc/man/cargo-build.1 +++ b/src/etc/man/cargo-build.1 @@ -337,12 +337,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-check.1 b/src/etc/man/cargo-check.1 index be0adf1630d..40207103b21 100644 --- a/src/etc/man/cargo-check.1 +++ b/src/etc/man/cargo-check.1 @@ -318,12 +318,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-clean.1 b/src/etc/man/cargo-clean.1 index ddb1e7253da..00f47ad91f5 100644 --- a/src/etc/man/cargo-clean.1 +++ b/src/etc/man/cargo-clean.1 @@ -117,12 +117,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-doc.1 b/src/etc/man/cargo-doc.1 index e449a6ba8d4..52ade6daed9 100644 --- a/src/etc/man/cargo-doc.1 +++ b/src/etc/man/cargo-doc.1 @@ -285,12 +285,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-fetch.1 b/src/etc/man/cargo-fetch.1 index 323130c4d18..6687506f46a 100644 --- a/src/etc/man/cargo-fetch.1 +++ b/src/etc/man/cargo-fetch.1 @@ -85,12 +85,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-fix.1 b/src/etc/man/cargo-fix.1 index 0e3436d50fd..fbf933fd3f1 100644 --- a/src/etc/man/cargo-fix.1 +++ b/src/etc/man/cargo-fix.1 @@ -413,12 +413,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-generate-lockfile.1 b/src/etc/man/cargo-generate-lockfile.1 index 066357ea31e..a436909f8d3 100644 --- a/src/etc/man/cargo-generate-lockfile.1 +++ b/src/etc/man/cargo-generate-lockfile.1 @@ -64,12 +64,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-install.1 b/src/etc/man/cargo-install.1 index e14be11a584..c59d54b01f6 100644 --- a/src/etc/man/cargo-install.1 +++ b/src/etc/man/cargo-install.1 @@ -304,12 +304,20 @@ information about timing information. .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-metadata.1 b/src/etc/man/cargo-metadata.1 index 60e99f9dfdb..e3cc27732e6 100644 --- a/src/etc/man/cargo-metadata.1 +++ b/src/etc/man/cargo-metadata.1 @@ -438,12 +438,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-package.1 b/src/etc/man/cargo-package.1 index 81ed84da828..a6ab96cb634 100644 --- a/src/etc/man/cargo-package.1 +++ b/src/etc/man/cargo-package.1 @@ -200,12 +200,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-pkgid.1 b/src/etc/man/cargo-pkgid.1 index 6ac6a480b82..f8b7724bd58 100644 --- a/src/etc/man/cargo-pkgid.1 +++ b/src/etc/man/cargo-pkgid.1 @@ -123,12 +123,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-publish.1 b/src/etc/man/cargo-publish.1 index 57919c8dc83..8a65416f7dd 100644 --- a/src/etc/man/cargo-publish.1 +++ b/src/etc/man/cargo-publish.1 @@ -156,12 +156,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-remove.1 b/src/etc/man/cargo-remove.1 index 1296a8bedd9..12f1dcfe808 100644 --- a/src/etc/man/cargo-remove.1 +++ b/src/etc/man/cargo-remove.1 @@ -83,12 +83,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-run.1 b/src/etc/man/cargo-run.1 index 451489c4c81..8b356404925 100644 --- a/src/etc/man/cargo-run.1 +++ b/src/etc/man/cargo-run.1 @@ -222,12 +222,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-rustc.1 b/src/etc/man/cargo-rustc.1 index fb1b78adefc..621db1e6eb8 100644 --- a/src/etc/man/cargo-rustc.1 +++ b/src/etc/man/cargo-rustc.1 @@ -336,12 +336,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-rustdoc.1 b/src/etc/man/cargo-rustdoc.1 index cec32b0e690..32bdb57d179 100644 --- a/src/etc/man/cargo-rustdoc.1 +++ b/src/etc/man/cargo-rustdoc.1 @@ -304,12 +304,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-test.1 b/src/etc/man/cargo-test.1 index e1b93f994ea..09a47068dd6 100644 --- a/src/etc/man/cargo-test.1 +++ b/src/etc/man/cargo-test.1 @@ -446,12 +446,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-tree.1 b/src/etc/man/cargo-tree.1 index 1cdf3397b70..9c08491c8b9 100644 --- a/src/etc/man/cargo-tree.1 +++ b/src/etc/man/cargo-tree.1 @@ -268,12 +268,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-update.1 b/src/etc/man/cargo-update.1 index 78550378c60..daad6db8aac 100644 --- a/src/etc/man/cargo-update.1 +++ b/src/etc/man/cargo-update.1 @@ -107,12 +107,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-vendor.1 b/src/etc/man/cargo-vendor.1 index bc1de2f71e6..b739f2c8f88 100644 --- a/src/etc/man/cargo-vendor.1 +++ b/src/etc/man/cargo-vendor.1 @@ -64,12 +64,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/src/etc/man/cargo-verify-project.1 b/src/etc/man/cargo-verify-project.1 index 657ca5f2b45..b0e6d8c7cae 100644 --- a/src/etc/man/cargo-verify-project.1 +++ b/src/etc/man/cargo-verify-project.1 @@ -74,12 +74,20 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the .sp \fB\-\-locked\fR .RS 4 -Requires the \fBCargo.lock\fR file be up\-to\-date. If the lock file is missing, -or it needs to be updated due to changes in the \fBCargo.toml\fR file, for example -a new dependency is added, Cargo will exit with an error. +Asserts that the exact same dependencies and versions are used as when the +existing \fBCargo.lock\fR file was originally generated. Cargo will exit with an +error when either of the following scenarios arises: .sp -It may be used in environments where you want to assert that the \fBCargo.lock\fR -file is up\-to\-date (such as a CI build). +.RS 4 +\h'-04'\(bu\h'+02'The lock file is missing. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+02'Cargo attempted to change the lock file due to a different dependency resolution. +.RE +.sp +It may be used in environments where deterministic builds are desired, +such as in CI pipelines. .RE .sp \fB\-\-offline\fR diff --git a/tests/testsuite/cargo/help/stdout.term.svg b/tests/testsuite/cargo/help/stdout.term.svg index 0b087a57455..19d2cee5410 100644 --- a/tests/testsuite/cargo/help/stdout.term.svg +++ b/tests/testsuite/cargo/help/stdout.term.svg @@ -45,7 +45,7 @@ -C <DIRECTORY> Change to DIRECTORY before doing anything (nightly-only) - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_add/help/stdout.term.svg b/tests/testsuite/cargo_add/help/stdout.term.svg index 0d86a19d86f..729a83c6c52 100644 --- a/tests/testsuite/cargo_add/help/stdout.term.svg +++ b/tests/testsuite/cargo_add/help/stdout.term.svg @@ -181,7 +181,7 @@ --locked - Require Cargo.lock to be up-to-date + Assert that `Cargo.lock` will remain unchanged diff --git a/tests/testsuite/cargo_bench/help/stdout.term.svg b/tests/testsuite/cargo_bench/help/stdout.term.svg index 029db745a77..2fe6694e8f8 100644 --- a/tests/testsuite/cargo_bench/help/stdout.term.svg +++ b/tests/testsuite/cargo_bench/help/stdout.term.svg @@ -127,7 +127,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_build/help/stdout.term.svg b/tests/testsuite/cargo_build/help/stdout.term.svg index 6cc51e692ee..8487003574e 100644 --- a/tests/testsuite/cargo_build/help/stdout.term.svg +++ b/tests/testsuite/cargo_build/help/stdout.term.svg @@ -125,7 +125,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_check/help/stdout.term.svg b/tests/testsuite/cargo_check/help/stdout.term.svg index df573a98762..7f145892b41 100644 --- a/tests/testsuite/cargo_check/help/stdout.term.svg +++ b/tests/testsuite/cargo_check/help/stdout.term.svg @@ -121,7 +121,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_clean/help/stdout.term.svg b/tests/testsuite/cargo_clean/help/stdout.term.svg index f2c6ef2efc5..125fdd4c784 100644 --- a/tests/testsuite/cargo_clean/help/stdout.term.svg +++ b/tests/testsuite/cargo_clean/help/stdout.term.svg @@ -69,7 +69,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_config/help/stdout.term.svg b/tests/testsuite/cargo_config/help/stdout.term.svg index e57c40e2724..184a739c724 100644 --- a/tests/testsuite/cargo_config/help/stdout.term.svg +++ b/tests/testsuite/cargo_config/help/stdout.term.svg @@ -51,7 +51,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_doc/help/stdout.term.svg b/tests/testsuite/cargo_doc/help/stdout.term.svg index 625889afff7..7c3433c9e39 100644 --- a/tests/testsuite/cargo_doc/help/stdout.term.svg +++ b/tests/testsuite/cargo_doc/help/stdout.term.svg @@ -115,7 +115,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_fetch/help/stdout.term.svg b/tests/testsuite/cargo_fetch/help/stdout.term.svg index 26e762e8f49..78c9dcc69fc 100644 --- a/tests/testsuite/cargo_fetch/help/stdout.term.svg +++ b/tests/testsuite/cargo_fetch/help/stdout.term.svg @@ -53,7 +53,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_fix/help/stdout.term.svg b/tests/testsuite/cargo_fix/help/stdout.term.svg index 7a2286fc66f..f4b05252fe9 100644 --- a/tests/testsuite/cargo_fix/help/stdout.term.svg +++ b/tests/testsuite/cargo_fix/help/stdout.term.svg @@ -129,7 +129,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg b/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg index 98f5fae89a7..80de855faee 100644 --- a/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg +++ b/tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg @@ -47,7 +47,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_help/help/stdout.term.svg b/tests/testsuite/cargo_help/help/stdout.term.svg index 251fcef43be..e63595e209a 100644 --- a/tests/testsuite/cargo_help/help/stdout.term.svg +++ b/tests/testsuite/cargo_help/help/stdout.term.svg @@ -51,7 +51,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_init/help/stdout.term.svg b/tests/testsuite/cargo_init/help/stdout.term.svg index 7080cf488f2..fdfabe6e7f3 100644 --- a/tests/testsuite/cargo_init/help/stdout.term.svg +++ b/tests/testsuite/cargo_init/help/stdout.term.svg @@ -69,7 +69,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_install/help/stdout.term.svg b/tests/testsuite/cargo_install/help/stdout.term.svg index d226bdc3bfc..0e1a81c75a5 100644 --- a/tests/testsuite/cargo_install/help/stdout.term.svg +++ b/tests/testsuite/cargo_install/help/stdout.term.svg @@ -121,7 +121,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_locate_project/help/stdout.term.svg b/tests/testsuite/cargo_locate_project/help/stdout.term.svg index 70b305a8476..2282c274eeb 100644 --- a/tests/testsuite/cargo_locate_project/help/stdout.term.svg +++ b/tests/testsuite/cargo_locate_project/help/stdout.term.svg @@ -53,7 +53,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_login/help/stdout.term.svg b/tests/testsuite/cargo_login/help/stdout.term.svg index 51be04e8247..d6b62219b02 100644 --- a/tests/testsuite/cargo_login/help/stdout.term.svg +++ b/tests/testsuite/cargo_login/help/stdout.term.svg @@ -55,7 +55,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_logout/help/stdout.term.svg b/tests/testsuite/cargo_logout/help/stdout.term.svg index f8750437ed7..2b390fe9972 100644 --- a/tests/testsuite/cargo_logout/help/stdout.term.svg +++ b/tests/testsuite/cargo_logout/help/stdout.term.svg @@ -47,7 +47,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_metadata/help/stdout.term.svg b/tests/testsuite/cargo_metadata/help/stdout.term.svg index 43a082c29ba..6c6196be44f 100644 --- a/tests/testsuite/cargo_metadata/help/stdout.term.svg +++ b/tests/testsuite/cargo_metadata/help/stdout.term.svg @@ -69,7 +69,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_new/help/stdout.term.svg b/tests/testsuite/cargo_new/help/stdout.term.svg index d6f12aafaa1..c7819a1c717 100644 --- a/tests/testsuite/cargo_new/help/stdout.term.svg +++ b/tests/testsuite/cargo_new/help/stdout.term.svg @@ -69,7 +69,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_owner/help/stdout.term.svg b/tests/testsuite/cargo_owner/help/stdout.term.svg index 4d040bcadbf..ed0adcc6cf2 100644 --- a/tests/testsuite/cargo_owner/help/stdout.term.svg +++ b/tests/testsuite/cargo_owner/help/stdout.term.svg @@ -63,7 +63,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_package/help/stdout.term.svg b/tests/testsuite/cargo_package/help/stdout.term.svg index 5d0a0decf4b..0b341bc2243 100644 --- a/tests/testsuite/cargo_package/help/stdout.term.svg +++ b/tests/testsuite/cargo_package/help/stdout.term.svg @@ -87,7 +87,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_pkgid/help/stdout.term.svg b/tests/testsuite/cargo_pkgid/help/stdout.term.svg index 3e7d985cf99..3efa36f6fbe 100644 --- a/tests/testsuite/cargo_pkgid/help/stdout.term.svg +++ b/tests/testsuite/cargo_pkgid/help/stdout.term.svg @@ -59,7 +59,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_publish/help/stdout.term.svg b/tests/testsuite/cargo_publish/help/stdout.term.svg index 240bb9ee1e2..671bd5c96a0 100644 --- a/tests/testsuite/cargo_publish/help/stdout.term.svg +++ b/tests/testsuite/cargo_publish/help/stdout.term.svg @@ -87,7 +87,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_read_manifest/help/stdout.term.svg b/tests/testsuite/cargo_read_manifest/help/stdout.term.svg index f81c9a26829..b636b69f630 100644 --- a/tests/testsuite/cargo_read_manifest/help/stdout.term.svg +++ b/tests/testsuite/cargo_read_manifest/help/stdout.term.svg @@ -51,7 +51,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_remove/help/stdout.term.svg b/tests/testsuite/cargo_remove/help/stdout.term.svg index cbaab26ce4c..7e6ee2832cf 100644 --- a/tests/testsuite/cargo_remove/help/stdout.term.svg +++ b/tests/testsuite/cargo_remove/help/stdout.term.svg @@ -71,7 +71,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_report/help/stdout.term.svg b/tests/testsuite/cargo_report/help/stdout.term.svg index 2df6b7d3320..477a51a7cf7 100644 --- a/tests/testsuite/cargo_report/help/stdout.term.svg +++ b/tests/testsuite/cargo_report/help/stdout.term.svg @@ -51,7 +51,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_run/help/stdout.term.svg b/tests/testsuite/cargo_run/help/stdout.term.svg index 916e047c301..e459231d756 100644 --- a/tests/testsuite/cargo_run/help/stdout.term.svg +++ b/tests/testsuite/cargo_run/help/stdout.term.svg @@ -103,7 +103,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_rustc/help/stdout.term.svg b/tests/testsuite/cargo_rustc/help/stdout.term.svg index 0c8f491797b..e6e97c39988 100644 --- a/tests/testsuite/cargo_rustc/help/stdout.term.svg +++ b/tests/testsuite/cargo_rustc/help/stdout.term.svg @@ -125,7 +125,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_rustdoc/help/stdout.term.svg b/tests/testsuite/cargo_rustdoc/help/stdout.term.svg index 9b31646bf0a..3d5bbbbfae7 100644 --- a/tests/testsuite/cargo_rustdoc/help/stdout.term.svg +++ b/tests/testsuite/cargo_rustdoc/help/stdout.term.svg @@ -123,7 +123,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_search/help/stdout.term.svg b/tests/testsuite/cargo_search/help/stdout.term.svg index 9884ffa31d8..2824777d159 100644 --- a/tests/testsuite/cargo_search/help/stdout.term.svg +++ b/tests/testsuite/cargo_search/help/stdout.term.svg @@ -57,7 +57,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_test/help/stdout.term.svg b/tests/testsuite/cargo_test/help/stdout.term.svg index 994387fc08c..0ec4686cda6 100644 --- a/tests/testsuite/cargo_test/help/stdout.term.svg +++ b/tests/testsuite/cargo_test/help/stdout.term.svg @@ -133,7 +133,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_tree/help/stdout.term.svg b/tests/testsuite/cargo_tree/help/stdout.term.svg index 57568a0bda2..7e87db4d536 100644 --- a/tests/testsuite/cargo_tree/help/stdout.term.svg +++ b/tests/testsuite/cargo_tree/help/stdout.term.svg @@ -97,7 +97,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_uninstall/help/stdout.term.svg b/tests/testsuite/cargo_uninstall/help/stdout.term.svg index 4eb4f3a9ac2..be47dba3627 100644 --- a/tests/testsuite/cargo_uninstall/help/stdout.term.svg +++ b/tests/testsuite/cargo_uninstall/help/stdout.term.svg @@ -65,7 +65,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_update/help/stdout.term.svg b/tests/testsuite/cargo_update/help/stdout.term.svg index 46285c95d0c..f069ae4dec0 100644 --- a/tests/testsuite/cargo_update/help/stdout.term.svg +++ b/tests/testsuite/cargo_update/help/stdout.term.svg @@ -61,7 +61,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_vendor/help/stdout.term.svg b/tests/testsuite/cargo_vendor/help/stdout.term.svg index 9b1fe4aea5a..3481541c7ff 100644 --- a/tests/testsuite/cargo_vendor/help/stdout.term.svg +++ b/tests/testsuite/cargo_vendor/help/stdout.term.svg @@ -63,7 +63,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_verify_project/help/stdout.term.svg b/tests/testsuite/cargo_verify_project/help/stdout.term.svg index d36c7403085..8d537a83d96 100644 --- a/tests/testsuite/cargo_verify_project/help/stdout.term.svg +++ b/tests/testsuite/cargo_verify_project/help/stdout.term.svg @@ -47,7 +47,7 @@ --manifest-path <PATH> Path to Cargo.toml - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_version/help/stdout.term.svg b/tests/testsuite/cargo_version/help/stdout.term.svg index ee3ffa43f13..5482147256d 100644 --- a/tests/testsuite/cargo_version/help/stdout.term.svg +++ b/tests/testsuite/cargo_version/help/stdout.term.svg @@ -45,7 +45,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network diff --git a/tests/testsuite/cargo_yank/help/stdout.term.svg b/tests/testsuite/cargo_yank/help/stdout.term.svg index c378d4d009a..7a71b49e122 100644 --- a/tests/testsuite/cargo_yank/help/stdout.term.svg +++ b/tests/testsuite/cargo_yank/help/stdout.term.svg @@ -61,7 +61,7 @@ Manifest Options: - --locked Require Cargo.lock to be up-to-date + --locked Assert that `Cargo.lock` will remain unchanged --offline Run without accessing the network