From a0ba72918a63e706c46625889d6fd91279cf9719 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 11 Apr 2024 13:40:57 -0500 Subject: [PATCH] fix(help): Generalize --ignore-rust-version --- src/bin/cargo/commands/add.rs | 5 +- src/bin/cargo/commands/bench.rs | 2 +- src/bin/cargo/commands/build.rs | 2 +- src/bin/cargo/commands/check.rs | 2 +- src/bin/cargo/commands/doc.rs | 2 +- src/bin/cargo/commands/fix.rs | 2 +- src/bin/cargo/commands/run.rs | 2 +- src/bin/cargo/commands/rustc.rs | 2 +- src/bin/cargo/commands/rustdoc.rs | 2 +- src/bin/cargo/commands/test.rs | 2 +- src/cargo/util/command_prelude.rs | 11 ++- src/doc/man/cargo-add.md | 6 +- src/doc/man/cargo-bench.md | 4 +- src/doc/man/cargo-build.md | 4 +- src/doc/man/cargo-check.md | 4 +- src/doc/man/cargo-doc.md | 4 +- src/doc/man/cargo-fix.md | 4 +- src/doc/man/cargo-install.md | 4 +- src/doc/man/cargo-run.md | 4 +- src/doc/man/cargo-rustc.md | 4 +- src/doc/man/cargo-rustdoc.md | 4 +- src/doc/man/cargo-test.md | 4 +- src/doc/man/generated_txt/cargo-add.txt | 6 +- src/doc/man/generated_txt/cargo-bench.txt | 8 +- src/doc/man/generated_txt/cargo-build.txt | 8 +- src/doc/man/generated_txt/cargo-check.txt | 8 +- src/doc/man/generated_txt/cargo-doc.txt | 8 +- src/doc/man/generated_txt/cargo-fix.txt | 8 +- src/doc/man/generated_txt/cargo-install.txt | 8 +- src/doc/man/generated_txt/cargo-run.txt | 8 +- src/doc/man/generated_txt/cargo-rustc.txt | 8 +- src/doc/man/generated_txt/cargo-rustdoc.txt | 8 +- src/doc/man/generated_txt/cargo-test.txt | 8 +- .../includes/options-ignore-rust-version.md | 3 +- src/doc/src/commands/cargo-add.md | 8 +- src/doc/src/commands/cargo-bench.md | 9 +- src/doc/src/commands/cargo-build.md | 9 +- src/doc/src/commands/cargo-check.md | 9 +- src/doc/src/commands/cargo-doc.md | 9 +- src/doc/src/commands/cargo-fix.md | 9 +- src/doc/src/commands/cargo-install.md | 9 +- src/doc/src/commands/cargo-run.md | 9 +- src/doc/src/commands/cargo-rustc.md | 9 +- src/doc/src/commands/cargo-rustdoc.md | 9 +- src/doc/src/commands/cargo-test.md | 9 +- src/etc/man/cargo-add.1 | 10 +- src/etc/man/cargo-bench.1 | 11 +-- src/etc/man/cargo-build.1 | 11 +-- src/etc/man/cargo-check.1 | 11 +-- src/etc/man/cargo-doc.1 | 11 +-- src/etc/man/cargo-fix.1 | 11 +-- src/etc/man/cargo-install.1 | 11 +-- src/etc/man/cargo-run.1 | 11 +-- src/etc/man/cargo-rustc.1 | 11 +-- src/etc/man/cargo-rustdoc.1 | 11 +-- src/etc/man/cargo-test.1 | 11 +-- .../testsuite/cargo_add/help/stdout.term.svg | 40 ++++---- .../cargo_bench/help/stdout.term.svg | 86 ++++++++--------- .../cargo_build/help/stdout.term.svg | 96 +++++++++---------- .../cargo_check/help/stdout.term.svg | 92 +++++++++--------- .../testsuite/cargo_doc/help/stdout.term.svg | 80 ++++++++-------- .../testsuite/cargo_fix/help/stdout.term.svg | 88 ++++++++--------- .../cargo_install/help/stdout.term.svg | 66 ++++++------- .../testsuite/cargo_run/help/stdout.term.svg | 68 ++++++------- .../cargo_rustc/help/stdout.term.svg | 84 ++++++++-------- .../cargo_rustdoc/help/stdout.term.svg | 86 ++++++++--------- .../testsuite/cargo_test/help/stdout.term.svg | 90 ++++++++--------- 67 files changed, 610 insertions(+), 653 deletions(-) diff --git a/src/bin/cargo/commands/add.rs b/src/bin/cargo/commands/add.rs index 2355507d1b8..9c67eb8343c 100644 --- a/src/bin/cargo/commands/add.rs +++ b/src/bin/cargo/commands/add.rs @@ -85,13 +85,10 @@ While you can use the crate in your implementation, it cannot be referenced in y Example uses: - Depending on multiple versions of a crate - Depend on crates with the same name from different registries"), - flag( - "ignore-rust-version", - "Ignore `rust-version` specification in packages" - ), ]) .arg_manifest_path_without_unsupported_path_tip() .arg_package("Package to modify") + .arg_ignore_rust_version() .arg_dry_run("Don't actually write the manifest") .arg_silent_suggestion() .next_help_heading("Source") diff --git a/src/bin/cargo/commands/bench.rs b/src/bin/cargo/commands/bench.rs index 9006ee18d86..f6d8766570d 100644 --- a/src/bin/cargo/commands/bench.rs +++ b/src/bin/cargo/commands/bench.rs @@ -22,7 +22,6 @@ pub fn cli() -> Command { "no-fail-fast", "Run all benchmarks regardless of failure", )) - .arg_ignore_rust_version() .arg_message_format() .arg_silent_suggestion() .arg_package_spec( @@ -51,6 +50,7 @@ pub fn cli() -> Command { .arg_unit_graph() .arg_timings() .arg_manifest_path() + .arg_ignore_rust_version() .after_help(color_print::cstr!( "Run `cargo help bench` for more detailed information.\n" )) diff --git a/src/bin/cargo/commands/build.rs b/src/bin/cargo/commands/build.rs index 8aba68b225a..308ce2ce6a7 100644 --- a/src/bin/cargo/commands/build.rs +++ b/src/bin/cargo/commands/build.rs @@ -7,7 +7,6 @@ pub fn cli() -> Command { // subcommand aliases are handled in aliased_command() // .alias("b") .about("Compile a local package and all of its dependencies") - .arg_ignore_rust_version() .arg_future_incompat_report() .arg_message_format() .arg_silent_suggestion() @@ -40,6 +39,7 @@ pub fn cli() -> Command { .arg_unit_graph() .arg_timings() .arg_manifest_path() + .arg_ignore_rust_version() .after_help(color_print::cstr!( "Run `cargo help build` for more detailed information.\n" )) diff --git a/src/bin/cargo/commands/check.rs b/src/bin/cargo/commands/check.rs index f72110165a9..56f274effba 100644 --- a/src/bin/cargo/commands/check.rs +++ b/src/bin/cargo/commands/check.rs @@ -7,7 +7,6 @@ pub fn cli() -> Command { // subcommand aliases are handled in aliased_command() // .alias("c") .about("Check a local package and all of its dependencies for errors") - .arg_ignore_rust_version() .arg_future_incompat_report() .arg_message_format() .arg_silent_suggestion() @@ -37,6 +36,7 @@ pub fn cli() -> Command { .arg_unit_graph() .arg_timings() .arg_manifest_path() + .arg_ignore_rust_version() .after_help(color_print::cstr!( "Run `cargo help check` for more detailed information.\n" )) diff --git a/src/bin/cargo/commands/doc.rs b/src/bin/cargo/commands/doc.rs index 2b087e2dbb3..2603b3cb777 100644 --- a/src/bin/cargo/commands/doc.rs +++ b/src/bin/cargo/commands/doc.rs @@ -16,7 +16,6 @@ pub fn cli() -> Command { "Don't build documentation for dependencies", )) .arg(flag("document-private-items", "Document private items")) - .arg_ignore_rust_version() .arg_message_format() .arg_silent_suggestion() .arg_package_spec( @@ -40,6 +39,7 @@ pub fn cli() -> Command { .arg_unit_graph() .arg_timings() .arg_manifest_path() + .arg_ignore_rust_version() .after_help(color_print::cstr!( "Run `cargo help doc` for more detailed information.\n" )) diff --git a/src/bin/cargo/commands/fix.rs b/src/bin/cargo/commands/fix.rs index 174df5fa3d9..30d07cf1944 100644 --- a/src/bin/cargo/commands/fix.rs +++ b/src/bin/cargo/commands/fix.rs @@ -26,7 +26,6 @@ pub fn cli() -> Command { "allow-staged", "Fix code even if the working directory has staged changes", )) - .arg_ignore_rust_version() .arg_message_format() .arg_silent_suggestion() .arg_package_spec( @@ -54,6 +53,7 @@ pub fn cli() -> Command { .arg_target_dir() .arg_timings() .arg_manifest_path() + .arg_ignore_rust_version() .after_help(color_print::cstr!( "Run `cargo help fix` for more detailed information.\n" )) diff --git a/src/bin/cargo/commands/run.rs b/src/bin/cargo/commands/run.rs index 981eac9d2de..74eb1450bd0 100644 --- a/src/bin/cargo/commands/run.rs +++ b/src/bin/cargo/commands/run.rs @@ -24,7 +24,6 @@ pub fn cli() -> Command { .num_args(0..) .trailing_var_arg(true), ) - .arg_ignore_rust_version() .arg_message_format() .arg_silent_suggestion() .arg_package("Package with the target to run") @@ -39,6 +38,7 @@ pub fn cli() -> Command { .arg_target_triple("Build for the target triple") .arg_target_dir() .arg_manifest_path() + .arg_ignore_rust_version() .arg_unit_graph() .arg_timings() .after_help(color_print::cstr!( diff --git a/src/bin/cargo/commands/rustc.rs b/src/bin/cargo/commands/rustc.rs index e4dd308c092..2f52c6b5926 100644 --- a/src/bin/cargo/commands/rustc.rs +++ b/src/bin/cargo/commands/rustc.rs @@ -28,7 +28,6 @@ pub fn cli() -> Command { "Comma separated list of types of crates for the compiler to emit", )) .arg_future_incompat_report() - .arg_ignore_rust_version() .arg_message_format() .arg_silent_suggestion() .arg_package("Package to build") @@ -53,6 +52,7 @@ pub fn cli() -> Command { .arg_unit_graph() .arg_timings() .arg_manifest_path() + .arg_ignore_rust_version() .after_help(color_print::cstr!( "Run `cargo help rustc` for more detailed information.\n" )) diff --git a/src/bin/cargo/commands/rustdoc.rs b/src/bin/cargo/commands/rustdoc.rs index bc9fa000e60..6535ca405c6 100644 --- a/src/bin/cargo/commands/rustdoc.rs +++ b/src/bin/cargo/commands/rustdoc.rs @@ -16,7 +16,6 @@ pub fn cli() -> Command { "open", "Opens the docs in a browser after the operation", )) - .arg_ignore_rust_version() .arg_message_format() .arg_silent_suggestion() .arg_package("Package to document") @@ -46,6 +45,7 @@ pub fn cli() -> Command { .arg_unit_graph() .arg_timings() .arg_manifest_path() + .arg_ignore_rust_version() .after_help(color_print::cstr!( "Run `cargo help rustdoc` for more detailed information.\n" )) diff --git a/src/bin/cargo/commands/test.rs b/src/bin/cargo/commands/test.rs index 4b70d42b5ca..b0aaae51bc9 100644 --- a/src/bin/cargo/commands/test.rs +++ b/src/bin/cargo/commands/test.rs @@ -21,7 +21,6 @@ pub fn cli() -> Command { .arg(flag("doc", "Test only this library's documentation")) .arg(flag("no-run", "Compile, but don't run tests")) .arg(flag("no-fail-fast", "Run all tests regardless of failure")) - .arg_ignore_rust_version() .arg_future_incompat_report() .arg_message_format() .arg( @@ -58,6 +57,7 @@ pub fn cli() -> Command { .arg_unit_graph() .arg_timings() .arg_manifest_path() + .arg_ignore_rust_version() .after_help(color_print::cstr!( "Run `cargo help test` for more detailed information.\n\ Run `cargo test -- --help` for test binary options.\n", diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs index 6dfa3512b2c..c269e65ba8e 100644 --- a/src/cargo/util/command_prelude.rs +++ b/src/cargo/util/command_prelude.rs @@ -352,10 +352,13 @@ pub trait CommandExt: Sized { } fn arg_ignore_rust_version(self) -> Self { - self._arg(flag( - "ignore-rust-version", - "Ignore `rust-version` specification in packages", - )) + self._arg( + flag( + "ignore-rust-version", + "Ignore `rust-version` specification in packages", + ) + .help_heading(heading::MANIFEST_OPTIONS), + ) } fn arg_future_incompat_report(self) -> Self { diff --git a/src/doc/man/cargo-add.md b/src/doc/man/cargo-add.md index d773004a7d2..6d388cb5417 100644 --- a/src/doc/man/cargo-add.md +++ b/src/doc/man/cargo-add.md @@ -139,10 +139,6 @@ crates, the features for a specific crate may be enabled with which enables all specified features. {{/option}} -{{#option "`--ignore-rust-version`" }} -Ignore `rust-version` specification in packages. -{{/option}} - {{/options}} @@ -161,6 +157,8 @@ Ignore `rust-version` specification in packages. Add dependencies to only the specified package. {{/option}} +{{> options-ignore-rust-version }} + {{> options-locked }} {{/options}} diff --git a/src/doc/man/cargo-bench.md b/src/doc/man/cargo-bench.md index 5b1c6ba7851..51e4ac10bd5 100644 --- a/src/doc/man/cargo-bench.md +++ b/src/doc/man/cargo-bench.md @@ -112,8 +112,6 @@ for more information on per-target settings. {{> options-profile }} -{{> options-ignore-rust-version }} - {{> options-timings }} {{/options}} @@ -145,6 +143,8 @@ passing `--nocapture` to the benchmark binaries: {{#options}} {{> options-manifest-path }} +{{> options-ignore-rust-version }} + {{> options-locked }} {{/options}} diff --git a/src/doc/man/cargo-build.md b/src/doc/man/cargo-build.md index 18d6eeae8d4..7eb8c7938dc 100644 --- a/src/doc/man/cargo-build.md +++ b/src/doc/man/cargo-build.md @@ -41,8 +41,6 @@ they have `required-features` that are missing. {{> options-profile }} -{{> options-ignore-rust-version }} - {{> options-timings }} {{/options}} @@ -86,6 +84,8 @@ See for more information. {{#options}} {{> options-manifest-path }} +{{> options-ignore-rust-version }} + {{> options-locked }} {{/options}} diff --git a/src/doc/man/cargo-check.md b/src/doc/man/cargo-check.md index 92c8a5d0799..9af606fda3d 100644 --- a/src/doc/man/cargo-check.md +++ b/src/doc/man/cargo-check.md @@ -44,8 +44,6 @@ they have `required-features` that are missing. {{> options-profile-legacy-check }} -{{> options-ignore-rust-version }} - {{> options-timings }} {{/options}} @@ -69,6 +67,8 @@ they have `required-features` that are missing. {{#options}} {{> options-manifest-path }} +{{> options-ignore-rust-version }} + {{> options-locked }} {{/options}} diff --git a/src/doc/man/cargo-doc.md b/src/doc/man/cargo-doc.md index b2e273ee5ca..3d036024d42 100644 --- a/src/doc/man/cargo-doc.md +++ b/src/doc/man/cargo-doc.md @@ -78,8 +78,6 @@ and supports common Unix glob patterns. {{> options-profile }} -{{> options-ignore-rust-version }} - {{> options-timings }} {{/options}} @@ -103,6 +101,8 @@ and supports common Unix glob patterns. {{#options}} {{> options-manifest-path }} +{{> options-ignore-rust-version }} + {{> options-locked }} {{/options}} diff --git a/src/doc/man/cargo-fix.md b/src/doc/man/cargo-fix.md index 89fb81cef79..af0dc3f214a 100644 --- a/src/doc/man/cargo-fix.md +++ b/src/doc/man/cargo-fix.md @@ -124,8 +124,6 @@ When no target selection options are given, `cargo fix` will fix all targets {{> options-profile-legacy-check }} -{{> options-ignore-rust-version }} - {{> options-timings }} {{/options}} @@ -149,6 +147,8 @@ When no target selection options are given, `cargo fix` will fix all targets {{#options}} {{> options-manifest-path }} +{{> options-ignore-rust-version }} + {{> options-locked }} {{/options}} diff --git a/src/doc/man/cargo-install.md b/src/doc/man/cargo-install.md index ff149271a41..fa593206612 100644 --- a/src/doc/man/cargo-install.md +++ b/src/doc/man/cargo-install.md @@ -180,8 +180,6 @@ See also the `--profile` option for choosing a specific profile by name. {{> options-profile }} -{{> options-ignore-rust-version }} - {{> options-timings }} {{/options}} @@ -189,6 +187,8 @@ See also the `--profile` option for choosing a specific profile by name. ### Manifest Options {{#options}} +{{> options-ignore-rust-version }} + {{> options-locked }} {{/options}} diff --git a/src/doc/man/cargo-run.md b/src/doc/man/cargo-run.md index 8a8ddb309fd..d32236c1efe 100644 --- a/src/doc/man/cargo-run.md +++ b/src/doc/man/cargo-run.md @@ -57,8 +57,6 @@ Run the specified example. {{> options-profile }} -{{> options-ignore-rust-version }} - {{> options-timings }} {{/options}} @@ -85,6 +83,8 @@ Run the specified example. {{> options-manifest-path }} +{{> options-ignore-rust-version }} + {{> options-locked }} {{/options}} diff --git a/src/doc/man/cargo-rustc.md b/src/doc/man/cargo-rustc.md index a59278297dd..7a3f5760834 100644 --- a/src/doc/man/cargo-rustc.md +++ b/src/doc/man/cargo-rustc.md @@ -69,8 +69,6 @@ The `rustc` subcommand will treat the following named profiles with special beha See [the reference](../reference/profiles.html) for more details on profiles. {{/option}} -{{> options-ignore-rust-version }} - {{> options-timings }} {{#option "`--crate-type` _crate-type_"}} @@ -110,6 +108,8 @@ This flag only works when building a `lib` or `example` library target. {{> options-manifest-path }} +{{> options-ignore-rust-version }} + {{> options-locked }} {{/options}} diff --git a/src/doc/man/cargo-rustdoc.md b/src/doc/man/cargo-rustdoc.md index 915391a218c..393f7c8b491 100644 --- a/src/doc/man/cargo-rustdoc.md +++ b/src/doc/man/cargo-rustdoc.md @@ -67,8 +67,6 @@ if its name is the same as the lib target. Binaries are skipped if they have {{> options-profile }} -{{> options-ignore-rust-version }} - {{> options-timings }} {{/options}} @@ -92,6 +90,8 @@ if its name is the same as the lib target. Binaries are skipped if they have {{#options}} {{> options-manifest-path }} +{{> options-ignore-rust-version }} + {{> options-locked }} {{/options}} diff --git a/src/doc/man/cargo-test.md b/src/doc/man/cargo-test.md index 1755ab7ded3..fa4c998e927 100644 --- a/src/doc/man/cargo-test.md +++ b/src/doc/man/cargo-test.md @@ -136,8 +136,6 @@ target options. {{> options-profile }} -{{> options-ignore-rust-version }} - {{> options-timings }} {{/options}} @@ -170,6 +168,8 @@ results readable. Test output can be recovered (e.g., for debugging) by passing {{> options-manifest-path }} +{{> options-ignore-rust-version }} + {{> options-locked }} {{/options}} diff --git a/src/doc/man/generated_txt/cargo-add.txt b/src/doc/man/generated_txt/cargo-add.txt index b3ea38207f3..b4f006b9e17 100644 --- a/src/doc/man/generated_txt/cargo-add.txt +++ b/src/doc/man/generated_txt/cargo-add.txt @@ -128,9 +128,6 @@ OPTIONS be enabled with package-name/feature-name syntax. This flag may be specified multiple times, which enables all specified features. - --ignore-rust-version - Ignore rust-version specification in packages. - Display Options -v, --verbose Use verbose output. May be specified twice for “very verbose” @@ -165,6 +162,9 @@ OPTIONS -p spec, --package spec Add dependencies to only the specified package. + --ignore-rust-version + Ignore rust-version specification in packages. + --locked Asserts that the exact same dependencies and versions are used as when the existing Cargo.lock file was originally generated. Cargo diff --git a/src/doc/man/generated_txt/cargo-bench.txt b/src/doc/man/generated_txt/cargo-bench.txt index 7984879acdb..aa0c4111428 100644 --- a/src/doc/man/generated_txt/cargo-bench.txt +++ b/src/doc/man/generated_txt/cargo-bench.txt @@ -240,11 +240,6 @@ OPTIONS for more details on profiles. - --ignore-rust-version - Benchmark the target even if the selected Rust compiler is older - than the required Rust version as configured in the project’s - rust-version field. - --timings=fmts Output information how long each compilation takes, and track concurrency information over time. Accepts an optional @@ -338,6 +333,9 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. + --ignore-rust-version + Ignore rust-version specification in packages. + --locked Asserts that the exact same dependencies and versions are used as when the existing Cargo.lock file was originally generated. Cargo diff --git a/src/doc/man/generated_txt/cargo-build.txt b/src/doc/man/generated_txt/cargo-build.txt index 7d652e8eb0c..1b9a5cae00b 100644 --- a/src/doc/man/generated_txt/cargo-build.txt +++ b/src/doc/man/generated_txt/cargo-build.txt @@ -161,11 +161,6 @@ OPTIONS for more details on profiles. - --ignore-rust-version - Build the target even if the selected Rust compiler is older than - the required Rust version as configured in the project’s - rust-version field. - --timings=fmts Output information how long each compilation takes, and track concurrency information over time. Accepts an optional @@ -272,6 +267,9 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. + --ignore-rust-version + Ignore rust-version specification in packages. + --locked Asserts that the exact same dependencies and versions are used as when the existing Cargo.lock file was originally generated. Cargo diff --git a/src/doc/man/generated_txt/cargo-check.txt b/src/doc/man/generated_txt/cargo-check.txt index bfc300360f9..844f101784d 100644 --- a/src/doc/man/generated_txt/cargo-check.txt +++ b/src/doc/man/generated_txt/cargo-check.txt @@ -165,11 +165,6 @@ OPTIONS for more details on profiles. - --ignore-rust-version - Check the target even if the selected Rust compiler is older than - the required Rust version as configured in the project’s - rust-version field. - --timings=fmts Output information how long each compilation takes, and track concurrency information over time. Accepts an optional @@ -257,6 +252,9 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. + --ignore-rust-version + Ignore rust-version specification in packages. + --locked Asserts that the exact same dependencies and versions are used as when the existing Cargo.lock file was originally generated. Cargo diff --git a/src/doc/man/generated_txt/cargo-doc.txt b/src/doc/man/generated_txt/cargo-doc.txt index d6b0eb2afdc..2f90b945852 100644 --- a/src/doc/man/generated_txt/cargo-doc.txt +++ b/src/doc/man/generated_txt/cargo-doc.txt @@ -136,11 +136,6 @@ OPTIONS for more details on profiles. - --ignore-rust-version - Document the target even if the selected Rust compiler is older than - the required Rust version as configured in the project’s - rust-version field. - --timings=fmts Output information how long each compilation takes, and track concurrency information over time. Accepts an optional @@ -228,6 +223,9 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. + --ignore-rust-version + Ignore rust-version specification in packages. + --locked Asserts that the exact same dependencies and versions are used as when the existing Cargo.lock file was originally generated. Cargo diff --git a/src/doc/man/generated_txt/cargo-fix.txt b/src/doc/man/generated_txt/cargo-fix.txt index 92b2d9d0881..c458ce5a277 100644 --- a/src/doc/man/generated_txt/cargo-fix.txt +++ b/src/doc/man/generated_txt/cargo-fix.txt @@ -238,11 +238,6 @@ OPTIONS for more details on profiles. - --ignore-rust-version - Fix the target even if the selected Rust compiler is older than the - required Rust version as configured in the project’s rust-version - field. - --timings=fmts Output information how long each compilation takes, and track concurrency information over time. Accepts an optional @@ -330,6 +325,9 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. + --ignore-rust-version + Ignore rust-version specification in packages. + --locked Asserts that the exact same dependencies and versions are used as when the existing Cargo.lock file was originally generated. Cargo diff --git a/src/doc/man/generated_txt/cargo-install.txt b/src/doc/man/generated_txt/cargo-install.txt index 1e362195250..e5d1182ff05 100644 --- a/src/doc/man/generated_txt/cargo-install.txt +++ b/src/doc/man/generated_txt/cargo-install.txt @@ -217,11 +217,6 @@ OPTIONS for more details on profiles. - --ignore-rust-version - Install the target even if the selected Rust compiler is older than - the required Rust version as configured in the project’s - rust-version field. - --timings=fmts Output information how long each compilation takes, and track concurrency information over time. Accepts an optional @@ -242,6 +237,9 @@ OPTIONS machine-readable JSON information about timing information. Manifest Options + --ignore-rust-version + Ignore rust-version specification in packages. + --locked Asserts that the exact same dependencies and versions are used as when the existing Cargo.lock file was originally generated. Cargo diff --git a/src/doc/man/generated_txt/cargo-run.txt b/src/doc/man/generated_txt/cargo-run.txt index 0a86eaba12d..6cea9d3a661 100644 --- a/src/doc/man/generated_txt/cargo-run.txt +++ b/src/doc/man/generated_txt/cargo-run.txt @@ -84,11 +84,6 @@ OPTIONS for more details on profiles. - --ignore-rust-version - Run the target even if the selected Rust compiler is older than the - required Rust version as configured in the project’s rust-version - field. - --timings=fmts Output information how long each compilation takes, and track concurrency information over time. Accepts an optional @@ -176,6 +171,9 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. + --ignore-rust-version + Ignore rust-version specification in packages. + --locked Asserts that the exact same dependencies and versions are used as when the existing Cargo.lock file was originally generated. Cargo diff --git a/src/doc/man/generated_txt/cargo-rustc.txt b/src/doc/man/generated_txt/cargo-rustc.txt index e16633b7dde..86ef3114013 100644 --- a/src/doc/man/generated_txt/cargo-rustc.txt +++ b/src/doc/man/generated_txt/cargo-rustc.txt @@ -169,11 +169,6 @@ OPTIONS for more details on profiles. - --ignore-rust-version - Build the target even if the selected Rust compiler is older than - the required Rust version as configured in the project’s - rust-version field. - --timings=fmts Output information how long each compilation takes, and track concurrency information over time. Accepts an optional @@ -274,6 +269,9 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. + --ignore-rust-version + Ignore rust-version specification in packages. + --locked Asserts that the exact same dependencies and versions are used as when the existing Cargo.lock file was originally generated. Cargo diff --git a/src/doc/man/generated_txt/cargo-rustdoc.txt b/src/doc/man/generated_txt/cargo-rustdoc.txt index 024796e2ed3..f93a59c79e9 100644 --- a/src/doc/man/generated_txt/cargo-rustdoc.txt +++ b/src/doc/man/generated_txt/cargo-rustdoc.txt @@ -152,11 +152,6 @@ OPTIONS for more details on profiles. - --ignore-rust-version - Document the target even if the selected Rust compiler is older than - the required Rust version as configured in the project’s - rust-version field. - --timings=fmts Output information how long each compilation takes, and track concurrency information over time. Accepts an optional @@ -244,6 +239,9 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. + --ignore-rust-version + Ignore rust-version specification in packages. + --locked Asserts that the exact same dependencies and versions are used as when the existing Cargo.lock file was originally generated. Cargo diff --git a/src/doc/man/generated_txt/cargo-test.txt b/src/doc/man/generated_txt/cargo-test.txt index 690fb31ddba..1b97d3d7dff 100644 --- a/src/doc/man/generated_txt/cargo-test.txt +++ b/src/doc/man/generated_txt/cargo-test.txt @@ -266,11 +266,6 @@ OPTIONS for more details on profiles. - --ignore-rust-version - Test the target even if the selected Rust compiler is older than the - required Rust version as configured in the project’s rust-version - field. - --timings=fmts Output information how long each compilation takes, and track concurrency information over time. Accepts an optional @@ -364,6 +359,9 @@ OPTIONS Path to the Cargo.toml file. By default, Cargo searches for the Cargo.toml file in the current directory or any parent directory. + --ignore-rust-version + Ignore rust-version specification in packages. + --locked Asserts that the exact same dependencies and versions are used as when the existing Cargo.lock file was originally generated. Cargo diff --git a/src/doc/man/includes/options-ignore-rust-version.md b/src/doc/man/includes/options-ignore-rust-version.md index a151534e944..f96daa63ff7 100644 --- a/src/doc/man/includes/options-ignore-rust-version.md +++ b/src/doc/man/includes/options-ignore-rust-version.md @@ -1,4 +1,3 @@ {{#option "`--ignore-rust-version`"}} -{{actionverb}} the target even if the selected Rust compiler is older than the -required Rust version as configured in the project's `rust-version` field. +Ignore `rust-version` specification in packages. {{/option}} diff --git a/src/doc/src/commands/cargo-add.md b/src/doc/src/commands/cargo-add.md index 43b7998723d..0411bdd5c30 100644 --- a/src/doc/src/commands/cargo-add.md +++ b/src/doc/src/commands/cargo-add.md @@ -136,10 +136,6 @@ crates, the features for a specific crate may be enabled with which enables all specified features. -
--ignore-rust-version
-
Ignore rust-version specification in packages.
- - @@ -187,6 +183,10 @@ terminal.
Add dependencies to only the specified package.
+
--ignore-rust-version
+
Ignore rust-version specification in packages.
+ +
--locked
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 diff --git a/src/doc/src/commands/cargo-bench.md b/src/doc/src/commands/cargo-bench.md index 45b26f2aa75..1605a15a319 100644 --- a/src/doc/src/commands/cargo-bench.md +++ b/src/doc/src/commands/cargo-bench.md @@ -271,11 +271,6 @@ target artifacts are placed in a separate directory. See the See the reference for more details on profiles.
-
--ignore-rust-version
-
Benchmark the target even if the selected Rust compiler is older than the -required Rust version as configured in the project’s rust-version field.
- -
--timings=fmts
Output information how long each compilation takes, and track concurrency information over time. Accepts an optional comma-separated list of output @@ -377,6 +372,10 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory.
+
--ignore-rust-version
+
Ignore rust-version specification in packages.
+ +
--locked
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 diff --git a/src/doc/src/commands/cargo-build.md b/src/doc/src/commands/cargo-build.md index 83296999f84..7156829c406 100644 --- a/src/doc/src/commands/cargo-build.md +++ b/src/doc/src/commands/cargo-build.md @@ -192,11 +192,6 @@ See also the --profile option for choosing a specific profile by na See the reference for more details on profiles.
-
--ignore-rust-version
-
Build the target even if the selected Rust compiler is older than the -required Rust version as configured in the project’s rust-version field.
- -
--timings=fmts
Output information how long each compilation takes, and track concurrency information over time. Accepts an optional comma-separated list of output @@ -308,6 +303,10 @@ See https://github.com/ Cargo.toml file in the current directory or any parent directory.
+
--ignore-rust-version
+
Ignore rust-version specification in packages.
+ +
--locked
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 diff --git a/src/doc/src/commands/cargo-check.md b/src/doc/src/commands/cargo-check.md index b8c991d57c1..2db53d9dcd4 100644 --- a/src/doc/src/commands/cargo-check.md +++ b/src/doc/src/commands/cargo-check.md @@ -192,11 +192,6 @@ detail.

See the reference for more details on profiles.

-
--ignore-rust-version
-
Check the target even if the selected Rust compiler is older than the -required Rust version as configured in the project’s rust-version field.
- -
--timings=fmts
Output information how long each compilation takes, and track concurrency information over time. Accepts an optional comma-separated list of output @@ -290,6 +285,10 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory.
+
--ignore-rust-version
+
Ignore rust-version specification in packages.
+ +
--locked
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 diff --git a/src/doc/src/commands/cargo-doc.md b/src/doc/src/commands/cargo-doc.md index 0c49b9e7a79..a57389e8a2b 100644 --- a/src/doc/src/commands/cargo-doc.md +++ b/src/doc/src/commands/cargo-doc.md @@ -167,11 +167,6 @@ See also the --profile option for choosing a specific profile by na See the reference for more details on profiles.
-
--ignore-rust-version
-
Document the target even if the selected Rust compiler is older than the -required Rust version as configured in the project’s rust-version field.
- -
--timings=fmts
Output information how long each compilation takes, and track concurrency information over time. Accepts an optional comma-separated list of output @@ -265,6 +260,10 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory.
+
--ignore-rust-version
+
Ignore rust-version specification in packages.
+ +
--locked
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 diff --git a/src/doc/src/commands/cargo-fix.md b/src/doc/src/commands/cargo-fix.md index 7c78b6b89da..6e3faa01b29 100644 --- a/src/doc/src/commands/cargo-fix.md +++ b/src/doc/src/commands/cargo-fix.md @@ -272,11 +272,6 @@ detail.

See the reference for more details on profiles.

-
--ignore-rust-version
-
Fix the target even if the selected Rust compiler is older than the -required Rust version as configured in the project’s rust-version field.
- -
--timings=fmts
Output information how long each compilation takes, and track concurrency information over time. Accepts an optional comma-separated list of output @@ -370,6 +365,10 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory.
+
--ignore-rust-version
+
Ignore rust-version specification in packages.
+ +
--locked
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 diff --git a/src/doc/src/commands/cargo-install.md b/src/doc/src/commands/cargo-install.md index d664bc7ed42..78efb92e8c0 100644 --- a/src/doc/src/commands/cargo-install.md +++ b/src/doc/src/commands/cargo-install.md @@ -238,11 +238,6 @@ See also the --profile option for choosing a specific profile by na See the reference for more details on profiles.
-
--ignore-rust-version
-
Install the target even if the selected Rust compiler is older than the -required Rust version as configured in the project’s rust-version field.
- -
--timings=fmts
Output information how long each compilation takes, and track concurrency information over time. Accepts an optional comma-separated list of output @@ -266,6 +261,10 @@ information about timing information. ### Manifest Options
+
--ignore-rust-version
+
Ignore rust-version specification in packages.
+ +
--locked
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 diff --git a/src/doc/src/commands/cargo-run.md b/src/doc/src/commands/cargo-run.md index cebd0edb2a5..4ea9ef2f8af 100644 --- a/src/doc/src/commands/cargo-run.md +++ b/src/doc/src/commands/cargo-run.md @@ -109,11 +109,6 @@ See also the --profile option for choosing a specific profile by na See the reference for more details on profiles.
-
--ignore-rust-version
-
Run the target even if the selected Rust compiler is older than the -required Rust version as configured in the project’s rust-version field.
- -
--timings=fmts
Output information how long each compilation takes, and track concurrency information over time. Accepts an optional comma-separated list of output @@ -210,6 +205,10 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory.
+
--ignore-rust-version
+
Ignore rust-version specification in packages.
+ +
--locked
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 diff --git a/src/doc/src/commands/cargo-rustc.md b/src/doc/src/commands/cargo-rustc.md index 3d72c5b2b4a..08d2479e3da 100644 --- a/src/doc/src/commands/cargo-rustc.md +++ b/src/doc/src/commands/cargo-rustc.md @@ -192,11 +192,6 @@ similar to the test profile.

See the reference for more details on profiles.

-
--ignore-rust-version
-
Build the target even if the selected Rust compiler is older than the -required Rust version as configured in the project’s rust-version field.
- -
--timings=fmts
Output information how long each compilation takes, and track concurrency information over time. Accepts an optional comma-separated list of output @@ -304,6 +299,10 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory.
+
--ignore-rust-version
+
Ignore rust-version specification in packages.
+ +
--locked
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 diff --git a/src/doc/src/commands/cargo-rustdoc.md b/src/doc/src/commands/cargo-rustdoc.md index d6faf986e5e..f6c2ac4ce3c 100644 --- a/src/doc/src/commands/cargo-rustdoc.md +++ b/src/doc/src/commands/cargo-rustdoc.md @@ -187,11 +187,6 @@ See also the --profile option for choosing a specific profile by na See the reference for more details on profiles.
-
--ignore-rust-version
-
Document the target even if the selected Rust compiler is older than the -required Rust version as configured in the project’s rust-version field.
- -
--timings=fmts
Output information how long each compilation takes, and track concurrency information over time. Accepts an optional comma-separated list of output @@ -285,6 +280,10 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory.
+
--ignore-rust-version
+
Ignore rust-version specification in packages.
+ +
--locked
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 diff --git a/src/doc/src/commands/cargo-test.md b/src/doc/src/commands/cargo-test.md index f631e9d454d..0ea9255f9ce 100644 --- a/src/doc/src/commands/cargo-test.md +++ b/src/doc/src/commands/cargo-test.md @@ -299,11 +299,6 @@ See also the --profile option for choosing a specific profile by na See the reference for more details on profiles.
-
--ignore-rust-version
-
Test the target even if the selected Rust compiler is older than the -required Rust version as configured in the project’s rust-version field.
- -
--timings=fmts
Output information how long each compilation takes, and track concurrency information over time. Accepts an optional comma-separated list of output @@ -406,6 +401,10 @@ coming from rustc are still emitted. Cannot be used with human or < Cargo.toml file in the current directory or any parent directory.
+
--ignore-rust-version
+
Ignore rust-version specification in packages.
+ +
--locked
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 diff --git a/src/etc/man/cargo-add.1 b/src/etc/man/cargo-add.1 index 0cd2ebda278..ed8859da37f 100644 --- a/src/etc/man/cargo-add.1 +++ b/src/etc/man/cargo-add.1 @@ -158,11 +158,6 @@ crates, the features for a specific crate may be enabled with \fBpackage\-name/feature\-name\fR syntax. This flag may be specified multiple times, which enables all specified features. .RE -.sp -\fB\-\-ignore\-rust\-version\fR -.RS 4 -Ignore \fBrust\-version\fR specification in packages. -.RE .SS "Display Options" .sp \fB\-v\fR, @@ -216,6 +211,11 @@ Path to the \fBCargo.toml\fR file. By default, Cargo searches for the Add dependencies to only the specified package. .RE .sp +\fB\-\-ignore\-rust\-version\fR +.RS 4 +Ignore \fBrust\-version\fR specification in packages. +.RE +.sp \fB\-\-locked\fR .RS 4 Asserts that the exact same dependencies and versions are used as when the diff --git a/src/etc/man/cargo-bench.1 b/src/etc/man/cargo-bench.1 index a307f8c8c74..5a39a16db2f 100644 --- a/src/etc/man/cargo-bench.1 +++ b/src/etc/man/cargo-bench.1 @@ -285,12 +285,6 @@ Benchmark with the given profile. See \fIthe reference\fR for more details on profiles. .RE .sp -\fB\-\-ignore\-rust\-version\fR -.RS 4 -Benchmark the target even if the selected Rust compiler is older than the -required Rust version as configured in the project\[cq]s \fBrust\-version\fR field. -.RE -.sp \fB\-\-timings=\fR\fIfmts\fR .RS 4 Output information how long each compilation takes, and track concurrency @@ -417,6 +411,11 @@ 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\-\-ignore\-rust\-version\fR +.RS 4 +Ignore \fBrust\-version\fR specification in packages. +.RE +.sp \fB\-\-locked\fR .RS 4 Asserts that the exact same dependencies and versions are used as when the diff --git a/src/etc/man/cargo-build.1 b/src/etc/man/cargo-build.1 index 7046b7f3fdf..9b7a08e4ed1 100644 --- a/src/etc/man/cargo-build.1 +++ b/src/etc/man/cargo-build.1 @@ -191,12 +191,6 @@ Build with the given profile. See \fIthe reference\fR for more details on profiles. .RE .sp -\fB\-\-ignore\-rust\-version\fR -.RS 4 -Build the target even if the selected Rust compiler is older than the -required Rust version as configured in the project\[cq]s \fBrust\-version\fR field. -.RE -.sp \fB\-\-timings=\fR\fIfmts\fR .RS 4 Output information how long each compilation takes, and track concurrency @@ -335,6 +329,11 @@ 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\-\-ignore\-rust\-version\fR +.RS 4 +Ignore \fBrust\-version\fR specification in packages. +.RE +.sp \fB\-\-locked\fR .RS 4 Asserts that the exact same dependencies and versions are used as when the diff --git a/src/etc/man/cargo-check.1 b/src/etc/man/cargo-check.1 index 40207103b21..50dd9e37f09 100644 --- a/src/etc/man/cargo-check.1 +++ b/src/etc/man/cargo-check.1 @@ -193,12 +193,6 @@ detail. See \fIthe reference\fR for more details on profiles. .RE .sp -\fB\-\-ignore\-rust\-version\fR -.RS 4 -Check the target even if the selected Rust compiler is older than the -required Rust version as configured in the project\[cq]s \fBrust\-version\fR field. -.RE -.sp \fB\-\-timings=\fR\fIfmts\fR .RS 4 Output information how long each compilation takes, and track concurrency @@ -316,6 +310,11 @@ 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\-\-ignore\-rust\-version\fR +.RS 4 +Ignore \fBrust\-version\fR specification in packages. +.RE +.sp \fB\-\-locked\fR .RS 4 Asserts that the exact same dependencies and versions are used as when the diff --git a/src/etc/man/cargo-doc.1 b/src/etc/man/cargo-doc.1 index 52ade6daed9..789a736f27b 100644 --- a/src/etc/man/cargo-doc.1 +++ b/src/etc/man/cargo-doc.1 @@ -160,12 +160,6 @@ Document with the given profile. See \fIthe reference\fR for more details on profiles. .RE .sp -\fB\-\-ignore\-rust\-version\fR -.RS 4 -Document the target even if the selected Rust compiler is older than the -required Rust version as configured in the project\[cq]s \fBrust\-version\fR field. -.RE -.sp \fB\-\-timings=\fR\fIfmts\fR .RS 4 Output information how long each compilation takes, and track concurrency @@ -283,6 +277,11 @@ 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\-\-ignore\-rust\-version\fR +.RS 4 +Ignore \fBrust\-version\fR specification in packages. +.RE +.sp \fB\-\-locked\fR .RS 4 Asserts that the exact same dependencies and versions are used as when the diff --git a/src/etc/man/cargo-fix.1 b/src/etc/man/cargo-fix.1 index fbf933fd3f1..0b94291bb3e 100644 --- a/src/etc/man/cargo-fix.1 +++ b/src/etc/man/cargo-fix.1 @@ -288,12 +288,6 @@ detail. See \fIthe reference\fR for more details on profiles. .RE .sp -\fB\-\-ignore\-rust\-version\fR -.RS 4 -Fix the target even if the selected Rust compiler is older than the -required Rust version as configured in the project\[cq]s \fBrust\-version\fR field. -.RE -.sp \fB\-\-timings=\fR\fIfmts\fR .RS 4 Output information how long each compilation takes, and track concurrency @@ -411,6 +405,11 @@ 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\-\-ignore\-rust\-version\fR +.RS 4 +Ignore \fBrust\-version\fR specification in packages. +.RE +.sp \fB\-\-locked\fR .RS 4 Asserts that the exact same dependencies and versions are used as when the diff --git a/src/etc/man/cargo-install.1 b/src/etc/man/cargo-install.1 index c59d54b01f6..8f524bc7cea 100644 --- a/src/etc/man/cargo-install.1 +++ b/src/etc/man/cargo-install.1 @@ -273,12 +273,6 @@ Install with the given profile. See \fIthe reference\fR for more details on profiles. .RE .sp -\fB\-\-ignore\-rust\-version\fR -.RS 4 -Install the target even if the selected Rust compiler is older than the -required Rust version as configured in the project\[cq]s \fBrust\-version\fR field. -.RE -.sp \fB\-\-timings=\fR\fIfmts\fR .RS 4 Output information how long each compilation takes, and track concurrency @@ -302,6 +296,11 @@ information about timing information. .RE .SS "Manifest Options" .sp +\fB\-\-ignore\-rust\-version\fR +.RS 4 +Ignore \fBrust\-version\fR specification in packages. +.RE +.sp \fB\-\-locked\fR .RS 4 Asserts that the exact same dependencies and versions are used as when the diff --git a/src/etc/man/cargo-run.1 b/src/etc/man/cargo-run.1 index 8b356404925..654322fb971 100644 --- a/src/etc/man/cargo-run.1 +++ b/src/etc/man/cargo-run.1 @@ -97,12 +97,6 @@ Run with the given profile. See \fIthe reference\fR for more details on profiles. .RE .sp -\fB\-\-ignore\-rust\-version\fR -.RS 4 -Run the target even if the selected Rust compiler is older than the -required Rust version as configured in the project\[cq]s \fBrust\-version\fR field. -.RE -.sp \fB\-\-timings=\fR\fIfmts\fR .RS 4 Output information how long each compilation takes, and track concurrency @@ -220,6 +214,11 @@ 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\-\-ignore\-rust\-version\fR +.RS 4 +Ignore \fBrust\-version\fR specification in packages. +.RE +.sp \fB\-\-locked\fR .RS 4 Asserts that the exact same dependencies and versions are used as when the diff --git a/src/etc/man/cargo-rustc.1 b/src/etc/man/cargo-rustc.1 index 621db1e6eb8..cd07c6a32d9 100644 --- a/src/etc/man/cargo-rustc.1 +++ b/src/etc/man/cargo-rustc.1 @@ -197,12 +197,6 @@ similar to the \fBtest\fR profile. See \fIthe reference\fR for more details on profiles. .RE .sp -\fB\-\-ignore\-rust\-version\fR -.RS 4 -Build the target even if the selected Rust compiler is older than the -required Rust version as configured in the project\[cq]s \fBrust\-version\fR field. -.RE -.sp \fB\-\-timings=\fR\fIfmts\fR .RS 4 Output information how long each compilation takes, and track concurrency @@ -334,6 +328,11 @@ 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\-\-ignore\-rust\-version\fR +.RS 4 +Ignore \fBrust\-version\fR specification in packages. +.RE +.sp \fB\-\-locked\fR .RS 4 Asserts that the exact same dependencies and versions are used as when the diff --git a/src/etc/man/cargo-rustdoc.1 b/src/etc/man/cargo-rustdoc.1 index 32bdb57d179..f89a6f7de82 100644 --- a/src/etc/man/cargo-rustdoc.1 +++ b/src/etc/man/cargo-rustdoc.1 @@ -179,12 +179,6 @@ Document with the given profile. See \fIthe reference\fR for more details on profiles. .RE .sp -\fB\-\-ignore\-rust\-version\fR -.RS 4 -Document the target even if the selected Rust compiler is older than the -required Rust version as configured in the project\[cq]s \fBrust\-version\fR field. -.RE -.sp \fB\-\-timings=\fR\fIfmts\fR .RS 4 Output information how long each compilation takes, and track concurrency @@ -302,6 +296,11 @@ 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\-\-ignore\-rust\-version\fR +.RS 4 +Ignore \fBrust\-version\fR specification in packages. +.RE +.sp \fB\-\-locked\fR .RS 4 Asserts that the exact same dependencies and versions are used as when the diff --git a/src/etc/man/cargo-test.1 b/src/etc/man/cargo-test.1 index 09a47068dd6..84b7ef1927e 100644 --- a/src/etc/man/cargo-test.1 +++ b/src/etc/man/cargo-test.1 @@ -312,12 +312,6 @@ Test with the given profile. See \fIthe reference\fR for more details on profiles. .RE .sp -\fB\-\-ignore\-rust\-version\fR -.RS 4 -Test the target even if the selected Rust compiler is older than the -required Rust version as configured in the project\[cq]s \fBrust\-version\fR field. -.RE -.sp \fB\-\-timings=\fR\fIfmts\fR .RS 4 Output information how long each compilation takes, and track concurrency @@ -444,6 +438,11 @@ 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\-\-ignore\-rust\-version\fR +.RS 4 +Ignore \fBrust\-version\fR specification in packages. +.RE +.sp \fB\-\-locked\fR .RS 4 Asserts that the exact same dependencies and versions are used as when the diff --git a/tests/testsuite/cargo_add/help/stdout.term.svg b/tests/testsuite/cargo_add/help/stdout.term.svg index 59cc01542aa..2e1cacd322a 100644 --- a/tests/testsuite/cargo_add/help/stdout.term.svg +++ b/tests/testsuite/cargo_add/help/stdout.term.svg @@ -123,59 +123,59 @@ - --ignore-rust-version + -n, --dry-run - Ignore `rust-version` specification in packages + Don't actually write the manifest - -n, --dry-run + -v, --verbose... - Don't actually write the manifest + Use verbose output (-vv very verbose/build.rs output) - -v, --verbose... + -q, --quiet - Use verbose output (-vv very verbose/build.rs output) + Do not print cargo log messages - -q, --quiet + --color <WHEN> - Do not print cargo log messages + Coloring: auto, always, never - --color <WHEN> + --config <KEY=VALUE> - Coloring: auto, always, never + Override a configuration value - --config <KEY=VALUE> + -Z <FLAG> - Override a configuration value + Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details - -Z <FLAG> + -h, --help - Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details + Print help (see a summary with '-h') - -h, --help + Manifest Options: - Print help (see a summary with '-h') + --manifest-path <PATH> - + Path to Cargo.toml - Manifest Options: + - --manifest-path <PATH> + --ignore-rust-version - Path to Cargo.toml + Ignore `rust-version` specification in packages diff --git a/tests/testsuite/cargo_bench/help/stdout.term.svg b/tests/testsuite/cargo_bench/help/stdout.term.svg index 2fe6694e8f8..8f2172ef132 100644 --- a/tests/testsuite/cargo_bench/help/stdout.term.svg +++ b/tests/testsuite/cargo_bench/help/stdout.term.svg @@ -41,91 +41,91 @@ --no-fail-fast Run all benchmarks regardless of failure - --ignore-rust-version Ignore `rust-version` specification in packages + --message-format <FMT> Error format - --message-format <FMT> Error format + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + -q, --quiet Do not print cargo log messages - -q, --quiet Do not print cargo log messages + --color <WHEN> Coloring: auto, always, never - --color <WHEN> Coloring: auto, always, never + --config <KEY=VALUE> Override a configuration value - --config <KEY=VALUE> Override a configuration value + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + details - details + -h, --help Print help - -h, --help Print help + - + Package Selection: - Package Selection: + -p, --package [<SPEC>] Package to run benchmarks for - -p, --package [<SPEC>] Package to run benchmarks for + --workspace Benchmark all packages in the workspace - --workspace Benchmark all packages in the workspace + --exclude <SPEC> Exclude packages from the benchmark - --exclude <SPEC> Exclude packages from the benchmark + --all Alias for --workspace (deprecated) - --all Alias for --workspace (deprecated) + - + Target Selection: - Target Selection: + --lib Benchmark only this package's library - --lib Benchmark only this package's library + --bins Benchmark all binaries - --bins Benchmark all binaries + --bin [<NAME>] Benchmark only the specified binary - --bin [<NAME>] Benchmark only the specified binary + --examples Benchmark all examples - --examples Benchmark all examples + --example [<NAME>] Benchmark only the specified example - --example [<NAME>] Benchmark only the specified example + --tests Benchmark all test targets - --tests Benchmark all test targets + --test [<NAME>] Benchmark only the specified test target - --test [<NAME>] Benchmark only the specified test target + --benches Benchmark all bench targets - --benches Benchmark all bench targets + --bench [<NAME>] Benchmark only the specified bench target - --bench [<NAME>] Benchmark only the specified bench target + --all-targets Benchmark all targets - --all-targets Benchmark all targets + - + Feature Selection: - Feature Selection: + -F, --features <FEATURES> Space or comma separated list of features to activate - -F, --features <FEATURES> Space or comma separated list of features to activate + --all-features Activate all available features - --all-features Activate all available features + --no-default-features Do not activate the `default` feature - --no-default-features Do not activate the `default` feature + - + Compilation Options: - Compilation Options: + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. - -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + --profile <PROFILE-NAME> Build artifacts with the specified profile - --profile <PROFILE-NAME> Build artifacts with the specified profile + --target [<TRIPLE>] Build for the target triple - --target [<TRIPLE>] Build for the target triple + --target-dir <DIRECTORY> Directory for all generated artifacts - --target-dir <DIRECTORY> Directory for all generated artifacts + --unit-graph Output build graph in JSON (unstable) - --unit-graph Output build graph in JSON (unstable) + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json - --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + - + Manifest Options: - Manifest Options: + --manifest-path <PATH> Path to Cargo.toml - --manifest-path <PATH> Path to Cargo.toml + --ignore-rust-version Ignore `rust-version` specification in packages --locked Assert that `Cargo.lock` will remain unchanged diff --git a/tests/testsuite/cargo_build/help/stdout.term.svg b/tests/testsuite/cargo_build/help/stdout.term.svg index 8487003574e..6b297f59393 100644 --- a/tests/testsuite/cargo_build/help/stdout.term.svg +++ b/tests/testsuite/cargo_build/help/stdout.term.svg @@ -29,101 +29,101 @@ Options: - --ignore-rust-version Ignore `rust-version` specification in packages + --future-incompat-report Outputs a future incompatibility report at the end of the build - --future-incompat-report Outputs a future incompatibility report at the end of the build + --message-format <FMT> Error format - --message-format <FMT> Error format + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + -q, --quiet Do not print cargo log messages - -q, --quiet Do not print cargo log messages + --color <WHEN> Coloring: auto, always, never - --color <WHEN> Coloring: auto, always, never + --config <KEY=VALUE> Override a configuration value - --config <KEY=VALUE> Override a configuration value + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + details - details + -h, --help Print help - -h, --help Print help + - + Package Selection: - Package Selection: + -p, --package [<SPEC>] Package to build (see `cargo help pkgid`) - -p, --package [<SPEC>] Package to build (see `cargo help pkgid`) + --workspace Build all packages in the workspace - --workspace Build all packages in the workspace + --exclude <SPEC> Exclude packages from the build - --exclude <SPEC> Exclude packages from the build + --all Alias for --workspace (deprecated) - --all Alias for --workspace (deprecated) + - + Target Selection: - Target Selection: + --lib Build only this package's library - --lib Build only this package's library + --bins Build all binaries - --bins Build all binaries + --bin [<NAME>] Build only the specified binary - --bin [<NAME>] Build only the specified binary + --examples Build all examples - --examples Build all examples + --example [<NAME>] Build only the specified example - --example [<NAME>] Build only the specified example + --tests Build all test targets - --tests Build all test targets + --test [<NAME>] Build only the specified test target - --test [<NAME>] Build only the specified test target + --benches Build all bench targets - --benches Build all bench targets + --bench [<NAME>] Build only the specified bench target - --bench [<NAME>] Build only the specified bench target + --all-targets Build all targets - --all-targets Build all targets + - + Feature Selection: - Feature Selection: + -F, --features <FEATURES> Space or comma separated list of features to activate - -F, --features <FEATURES> Space or comma separated list of features to activate + --all-features Activate all available features - --all-features Activate all available features + --no-default-features Do not activate the `default` feature - --no-default-features Do not activate the `default` feature + - + Compilation Options: - Compilation Options: + -r, --release Build artifacts in release mode, with optimizations - -r, --release Build artifacts in release mode, with optimizations + --profile <PROFILE-NAME> Build artifacts with the specified profile - --profile <PROFILE-NAME> Build artifacts with the specified profile + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. - -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + --keep-going Do not abort the build as soon as there is an error - --keep-going Do not abort the build as soon as there is an error + --target [<TRIPLE>] Build for the target triple - --target [<TRIPLE>] Build for the target triple + --target-dir <DIRECTORY> Directory for all generated artifacts - --target-dir <DIRECTORY> Directory for all generated artifacts + --out-dir <PATH> Copy final artifacts to this directory (unstable) - --out-dir <PATH> Copy final artifacts to this directory (unstable) + --build-plan Output the build plan in JSON (unstable) - --build-plan Output the build plan in JSON (unstable) + --unit-graph Output build graph in JSON (unstable) - --unit-graph Output build graph in JSON (unstable) + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json - --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + - + Manifest Options: - Manifest Options: + --manifest-path <PATH> Path to Cargo.toml - --manifest-path <PATH> Path to Cargo.toml + --ignore-rust-version Ignore `rust-version` specification in packages --locked Assert that `Cargo.lock` will remain unchanged diff --git a/tests/testsuite/cargo_check/help/stdout.term.svg b/tests/testsuite/cargo_check/help/stdout.term.svg index 7f145892b41..13674395087 100644 --- a/tests/testsuite/cargo_check/help/stdout.term.svg +++ b/tests/testsuite/cargo_check/help/stdout.term.svg @@ -29,97 +29,97 @@ Options: - --ignore-rust-version Ignore `rust-version` specification in packages + --future-incompat-report Outputs a future incompatibility report at the end of the build - --future-incompat-report Outputs a future incompatibility report at the end of the build + --message-format <FMT> Error format - --message-format <FMT> Error format + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + -q, --quiet Do not print cargo log messages - -q, --quiet Do not print cargo log messages + --color <WHEN> Coloring: auto, always, never - --color <WHEN> Coloring: auto, always, never + --config <KEY=VALUE> Override a configuration value - --config <KEY=VALUE> Override a configuration value + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + details - details + -h, --help Print help - -h, --help Print help + - + Package Selection: - Package Selection: + -p, --package [<SPEC>] Package(s) to check - -p, --package [<SPEC>] Package(s) to check + --workspace Check all packages in the workspace - --workspace Check all packages in the workspace + --exclude <SPEC> Exclude packages from the check - --exclude <SPEC> Exclude packages from the check + --all Alias for --workspace (deprecated) - --all Alias for --workspace (deprecated) + - + Target Selection: - Target Selection: + --lib Check only this package's library - --lib Check only this package's library + --bins Check all binaries - --bins Check all binaries + --bin [<NAME>] Check only the specified binary - --bin [<NAME>] Check only the specified binary + --examples Check all examples - --examples Check all examples + --example [<NAME>] Check only the specified example - --example [<NAME>] Check only the specified example + --tests Check all test targets - --tests Check all test targets + --test [<NAME>] Check only the specified test target - --test [<NAME>] Check only the specified test target + --benches Check all bench targets - --benches Check all bench targets + --bench [<NAME>] Check only the specified bench target - --bench [<NAME>] Check only the specified bench target + --all-targets Check all targets - --all-targets Check all targets + - + Feature Selection: - Feature Selection: + -F, --features <FEATURES> Space or comma separated list of features to activate - -F, --features <FEATURES> Space or comma separated list of features to activate + --all-features Activate all available features - --all-features Activate all available features + --no-default-features Do not activate the `default` feature - --no-default-features Do not activate the `default` feature + - + Compilation Options: - Compilation Options: + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. - -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + --keep-going Do not abort the build as soon as there is an error - --keep-going Do not abort the build as soon as there is an error + -r, --release Check artifacts in release mode, with optimizations - -r, --release Check artifacts in release mode, with optimizations + --profile <PROFILE-NAME> Check artifacts with the specified profile - --profile <PROFILE-NAME> Check artifacts with the specified profile + --target [<TRIPLE>] Check for the target triple - --target [<TRIPLE>] Check for the target triple + --target-dir <DIRECTORY> Directory for all generated artifacts - --target-dir <DIRECTORY> Directory for all generated artifacts + --unit-graph Output build graph in JSON (unstable) - --unit-graph Output build graph in JSON (unstable) + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json - --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + - + Manifest Options: - Manifest Options: + --manifest-path <PATH> Path to Cargo.toml - --manifest-path <PATH> Path to Cargo.toml + --ignore-rust-version Ignore `rust-version` specification in packages --locked Assert that `Cargo.lock` will remain unchanged diff --git a/tests/testsuite/cargo_doc/help/stdout.term.svg b/tests/testsuite/cargo_doc/help/stdout.term.svg index 7c3433c9e39..28e26eb3602 100644 --- a/tests/testsuite/cargo_doc/help/stdout.term.svg +++ b/tests/testsuite/cargo_doc/help/stdout.term.svg @@ -35,85 +35,85 @@ --document-private-items Document private items - --ignore-rust-version Ignore `rust-version` specification in packages + --message-format <FMT> Error format - --message-format <FMT> Error format + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + -q, --quiet Do not print cargo log messages - -q, --quiet Do not print cargo log messages + --color <WHEN> Coloring: auto, always, never - --color <WHEN> Coloring: auto, always, never + --config <KEY=VALUE> Override a configuration value - --config <KEY=VALUE> Override a configuration value + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + details - details + -h, --help Print help - -h, --help Print help + - + Package Selection: - Package Selection: + -p, --package [<SPEC>] Package to document - -p, --package [<SPEC>] Package to document + --workspace Document all packages in the workspace - --workspace Document all packages in the workspace + --exclude <SPEC> Exclude packages from the build - --exclude <SPEC> Exclude packages from the build + --all Alias for --workspace (deprecated) - --all Alias for --workspace (deprecated) + - + Feature Selection: - Feature Selection: + -F, --features <FEATURES> Space or comma separated list of features to activate - -F, --features <FEATURES> Space or comma separated list of features to activate + --all-features Activate all available features - --all-features Activate all available features + --no-default-features Do not activate the `default` feature - --no-default-features Do not activate the `default` feature + - + Target Selection: - Target Selection: + --lib Document only this package's library - --lib Document only this package's library + --bins Document all binaries - --bins Document all binaries + --bin [<NAME>] Document only the specified binary - --bin [<NAME>] Document only the specified binary + --examples Document all examples - --examples Document all examples + --example [<NAME>] Document only the specified example - --example [<NAME>] Document only the specified example + - + Compilation Options: - Compilation Options: + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. - -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + --keep-going Do not abort the build as soon as there is an error - --keep-going Do not abort the build as soon as there is an error + -r, --release Build artifacts in release mode, with optimizations - -r, --release Build artifacts in release mode, with optimizations + --profile <PROFILE-NAME> Build artifacts with the specified profile - --profile <PROFILE-NAME> Build artifacts with the specified profile + --target [<TRIPLE>] Build for the target triple - --target [<TRIPLE>] Build for the target triple + --target-dir <DIRECTORY> Directory for all generated artifacts - --target-dir <DIRECTORY> Directory for all generated artifacts + --unit-graph Output build graph in JSON (unstable) - --unit-graph Output build graph in JSON (unstable) + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json - --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + - + Manifest Options: - Manifest Options: + --manifest-path <PATH> Path to Cargo.toml - --manifest-path <PATH> Path to Cargo.toml + --ignore-rust-version Ignore `rust-version` specification in packages --locked Assert that `Cargo.lock` will remain unchanged diff --git a/tests/testsuite/cargo_fix/help/stdout.term.svg b/tests/testsuite/cargo_fix/help/stdout.term.svg index f4b05252fe9..64434db7d02 100644 --- a/tests/testsuite/cargo_fix/help/stdout.term.svg +++ b/tests/testsuite/cargo_fix/help/stdout.term.svg @@ -41,93 +41,93 @@ --allow-staged Fix code even if the working directory has staged changes - --ignore-rust-version Ignore `rust-version` specification in packages + --message-format <FMT> Error format - --message-format <FMT> Error format + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + -q, --quiet Do not print cargo log messages - -q, --quiet Do not print cargo log messages + --color <WHEN> Coloring: auto, always, never - --color <WHEN> Coloring: auto, always, never + --config <KEY=VALUE> Override a configuration value - --config <KEY=VALUE> Override a configuration value + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + details - details + -h, --help Print help - -h, --help Print help + - + Package Selection: - Package Selection: + -p, --package [<SPEC>] Package(s) to fix - -p, --package [<SPEC>] Package(s) to fix + --workspace Fix all packages in the workspace - --workspace Fix all packages in the workspace + --exclude <SPEC> Exclude packages from the fixes - --exclude <SPEC> Exclude packages from the fixes + --all Alias for --workspace (deprecated) - --all Alias for --workspace (deprecated) + - + Target Selection: - Target Selection: + --lib Fix only this package's library - --lib Fix only this package's library + --bins Fix all binaries - --bins Fix all binaries + --bin [<NAME>] Fix only the specified binary - --bin [<NAME>] Fix only the specified binary + --examples Fix all examples - --examples Fix all examples + --example [<NAME>] Fix only the specified example - --example [<NAME>] Fix only the specified example + --tests Fix all test targets - --tests Fix all test targets + --test [<NAME>] Fix only the specified test target - --test [<NAME>] Fix only the specified test target + --benches Fix all bench targets - --benches Fix all bench targets + --bench [<NAME>] Fix only the specified bench target - --bench [<NAME>] Fix only the specified bench target + --all-targets Fix all targets (default) - --all-targets Fix all targets (default) + - + Feature Selection: - Feature Selection: + -F, --features <FEATURES> Space or comma separated list of features to activate - -F, --features <FEATURES> Space or comma separated list of features to activate + --all-features Activate all available features - --all-features Activate all available features + --no-default-features Do not activate the `default` feature - --no-default-features Do not activate the `default` feature + - + Compilation Options: - Compilation Options: + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. - -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + --keep-going Do not abort the build as soon as there is an error - --keep-going Do not abort the build as soon as there is an error + -r, --release Fix artifacts in release mode, with optimizations - -r, --release Fix artifacts in release mode, with optimizations + --profile <PROFILE-NAME> Build artifacts with the specified profile - --profile <PROFILE-NAME> Build artifacts with the specified profile + --target [<TRIPLE>] Fix for the target triple - --target [<TRIPLE>] Fix for the target triple + --target-dir <DIRECTORY> Directory for all generated artifacts - --target-dir <DIRECTORY> Directory for all generated artifacts + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json - --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + - + Manifest Options: - Manifest Options: + --manifest-path <PATH> Path to Cargo.toml - --manifest-path <PATH> Path to Cargo.toml + --ignore-rust-version Ignore `rust-version` specification in packages --locked Assert that `Cargo.lock` will remain unchanged diff --git a/tests/testsuite/cargo_install/help/stdout.term.svg b/tests/testsuite/cargo_install/help/stdout.term.svg index 0e1a81c75a5..e021922563f 100644 --- a/tests/testsuite/cargo_install/help/stdout.term.svg +++ b/tests/testsuite/cargo_install/help/stdout.term.svg @@ -59,73 +59,73 @@ --list List all installed packages and their versions - --ignore-rust-version Ignore `rust-version` specification in packages + --message-format <FMT> Error format - --message-format <FMT> Error format + --debug Build in debug mode (with the 'dev' profile) instead of release mode - --debug Build in debug mode (with the 'dev' profile) instead of release mode + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + -q, --quiet Do not print cargo log messages - -q, --quiet Do not print cargo log messages + --color <WHEN> Coloring: auto, always, never - --color <WHEN> Coloring: auto, always, never + --config <KEY=VALUE> Override a configuration value - --config <KEY=VALUE> Override a configuration value + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + details - details + -h, --help Print help - -h, --help Print help + - + Manifest Options: - Target Selection: + --ignore-rust-version Ignore `rust-version` specification in packages - --bin [<NAME>] Install only the specified binary + --locked Assert that `Cargo.lock` will remain unchanged - --bins Install all binaries + --offline Run without accessing the network - --example [<NAME>] Install only the specified example + --frozen Equivalent to specifying both --locked and --offline - --examples Install all examples + - + Target Selection: - Feature Selection: + --bin [<NAME>] Install only the specified binary - -F, --features <FEATURES> Space or comma separated list of features to activate + --bins Install all binaries - --all-features Activate all available features + --example [<NAME>] Install only the specified example - --no-default-features Do not activate the `default` feature + --examples Install all examples - Compilation Options: + Feature Selection: - -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + -F, --features <FEATURES> Space or comma separated list of features to activate - --keep-going Do not abort the build as soon as there is an error + --all-features Activate all available features - --profile <PROFILE-NAME> Install artifacts with the specified profile + --no-default-features Do not activate the `default` feature - --target [<TRIPLE>] Build for the target triple + - --target-dir <DIRECTORY> Directory for all generated artifacts + Compilation Options: - --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. - + --keep-going Do not abort the build as soon as there is an error - Manifest Options: + --profile <PROFILE-NAME> Install artifacts with the specified profile - --locked Assert that `Cargo.lock` will remain unchanged + --target [<TRIPLE>] Build for the target triple - --offline Run without accessing the network + --target-dir <DIRECTORY> Directory for all generated artifacts - --frozen Equivalent to specifying both --locked and --offline + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json diff --git a/tests/testsuite/cargo_run/help/stdout.term.svg b/tests/testsuite/cargo_run/help/stdout.term.svg index e459231d756..2a6004679ed 100644 --- a/tests/testsuite/cargo_run/help/stdout.term.svg +++ b/tests/testsuite/cargo_run/help/stdout.term.svg @@ -35,73 +35,73 @@ Options: - --ignore-rust-version Ignore `rust-version` specification in packages + --message-format <FMT> Error format - --message-format <FMT> Error format + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + -q, --quiet Do not print cargo log messages - -q, --quiet Do not print cargo log messages + --color <WHEN> Coloring: auto, always, never - --color <WHEN> Coloring: auto, always, never + --config <KEY=VALUE> Override a configuration value - --config <KEY=VALUE> Override a configuration value + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + details - details + -h, --help Print help - -h, --help Print help + - + Package Selection: - Package Selection: + -p, --package [<SPEC>] Package with the target to run - -p, --package [<SPEC>] Package with the target to run + - + Target Selection: - Target Selection: + --bin [<NAME>] Name of the bin target to run - --bin [<NAME>] Name of the bin target to run + --example [<NAME>] Name of the example target to run - --example [<NAME>] Name of the example target to run + - + Feature Selection: - Feature Selection: + -F, --features <FEATURES> Space or comma separated list of features to activate - -F, --features <FEATURES> Space or comma separated list of features to activate + --all-features Activate all available features - --all-features Activate all available features + --no-default-features Do not activate the `default` feature - --no-default-features Do not activate the `default` feature + - + Compilation Options: - Compilation Options: + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. - -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + --keep-going Do not abort the build as soon as there is an error - --keep-going Do not abort the build as soon as there is an error + -r, --release Build artifacts in release mode, with optimizations - -r, --release Build artifacts in release mode, with optimizations + --profile <PROFILE-NAME> Build artifacts with the specified profile - --profile <PROFILE-NAME> Build artifacts with the specified profile + --target [<TRIPLE>] Build for the target triple - --target [<TRIPLE>] Build for the target triple + --target-dir <DIRECTORY> Directory for all generated artifacts - --target-dir <DIRECTORY> Directory for all generated artifacts + --unit-graph Output build graph in JSON (unstable) - --unit-graph Output build graph in JSON (unstable) + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json - --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + - + Manifest Options: - Manifest Options: + --manifest-path <PATH> Path to Cargo.toml - --manifest-path <PATH> Path to Cargo.toml + --ignore-rust-version Ignore `rust-version` specification in packages --locked Assert that `Cargo.lock` will remain unchanged diff --git a/tests/testsuite/cargo_rustc/help/stdout.term.svg b/tests/testsuite/cargo_rustc/help/stdout.term.svg index e6e97c39988..30407012641 100644 --- a/tests/testsuite/cargo_rustc/help/stdout.term.svg +++ b/tests/testsuite/cargo_rustc/help/stdout.term.svg @@ -41,89 +41,89 @@ --future-incompat-report Outputs a future incompatibility report at the end of the build - --ignore-rust-version Ignore `rust-version` specification in packages + --message-format <FMT> Error format - --message-format <FMT> Error format + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + -q, --quiet Do not print cargo log messages - -q, --quiet Do not print cargo log messages + --color <WHEN> Coloring: auto, always, never - --color <WHEN> Coloring: auto, always, never + --config <KEY=VALUE> Override a configuration value - --config <KEY=VALUE> Override a configuration value + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + details - details + -h, --help Print help - -h, --help Print help + - + Package Selection: - Package Selection: + -p, --package [<SPEC>] Package to build - -p, --package [<SPEC>] Package to build + - + Target Selection: - Target Selection: + --lib Build only this package's library - --lib Build only this package's library + --bins Build all binaries - --bins Build all binaries + --bin [<NAME>] Build only the specified binary - --bin [<NAME>] Build only the specified binary + --examples Build all examples - --examples Build all examples + --example [<NAME>] Build only the specified example - --example [<NAME>] Build only the specified example + --tests Build all test targets - --tests Build all test targets + --test [<NAME>] Build only the specified test target - --test [<NAME>] Build only the specified test target + --benches Build all bench targets - --benches Build all bench targets + --bench [<NAME>] Build only the specified bench target - --bench [<NAME>] Build only the specified bench target + --all-targets Build all targets - --all-targets Build all targets + - + Feature Selection: - Feature Selection: + -F, --features <FEATURES> Space or comma separated list of features to activate - -F, --features <FEATURES> Space or comma separated list of features to activate + --all-features Activate all available features - --all-features Activate all available features + --no-default-features Do not activate the `default` feature - --no-default-features Do not activate the `default` feature + - + Compilation Options: - Compilation Options: + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. - -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + --keep-going Do not abort the build as soon as there is an error - --keep-going Do not abort the build as soon as there is an error + -r, --release Build artifacts in release mode, with optimizations - -r, --release Build artifacts in release mode, with optimizations + --profile <PROFILE-NAME> Build artifacts with the specified profile - --profile <PROFILE-NAME> Build artifacts with the specified profile + --target [<TRIPLE>] Target triple which compiles will be for - --target [<TRIPLE>] Target triple which compiles will be for + --target-dir <DIRECTORY> Directory for all generated artifacts - --target-dir <DIRECTORY> Directory for all generated artifacts + --unit-graph Output build graph in JSON (unstable) - --unit-graph Output build graph in JSON (unstable) + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json - --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + - + Manifest Options: - Manifest Options: + --manifest-path <PATH> Path to Cargo.toml - --manifest-path <PATH> Path to Cargo.toml + --ignore-rust-version Ignore `rust-version` specification in packages --locked Assert that `Cargo.lock` will remain unchanged diff --git a/tests/testsuite/cargo_rustdoc/help/stdout.term.svg b/tests/testsuite/cargo_rustdoc/help/stdout.term.svg index 3d5bbbbfae7..68d77a06bd6 100644 --- a/tests/testsuite/cargo_rustdoc/help/stdout.term.svg +++ b/tests/testsuite/cargo_rustdoc/help/stdout.term.svg @@ -37,91 +37,91 @@ --open Opens the docs in a browser after the operation - --ignore-rust-version Ignore `rust-version` specification in packages + --message-format <FMT> Error format - --message-format <FMT> Error format + --output-format <FMT> The output type to write (unstable) [possible values: html, json] - --output-format <FMT> The output type to write (unstable) [possible values: html, json] + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + -q, --quiet Do not print cargo log messages - -q, --quiet Do not print cargo log messages + --color <WHEN> Coloring: auto, always, never - --color <WHEN> Coloring: auto, always, never + --config <KEY=VALUE> Override a configuration value - --config <KEY=VALUE> Override a configuration value + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + details - details + -h, --help Print help - -h, --help Print help + - + Package Selection: - Package Selection: + -p, --package [<SPEC>] Package to document - -p, --package [<SPEC>] Package to document + - + Target Selection: - Target Selection: + --lib Build only this package's library - --lib Build only this package's library + --bins Build all binaries - --bins Build all binaries + --bin [<NAME>] Build only the specified binary - --bin [<NAME>] Build only the specified binary + --examples Build all examples - --examples Build all examples + --example [<NAME>] Build only the specified example - --example [<NAME>] Build only the specified example + --tests Build all test targets - --tests Build all test targets + --test [<NAME>] Build only the specified test target - --test [<NAME>] Build only the specified test target + --benches Build all bench targets - --benches Build all bench targets + --bench [<NAME>] Build only the specified bench target - --bench [<NAME>] Build only the specified bench target + --all-targets Build all targets - --all-targets Build all targets + - + Feature Selection: - Feature Selection: + -F, --features <FEATURES> Space or comma separated list of features to activate - -F, --features <FEATURES> Space or comma separated list of features to activate + --all-features Activate all available features - --all-features Activate all available features + --no-default-features Do not activate the `default` feature - --no-default-features Do not activate the `default` feature + - + Compilation Options: - Compilation Options: + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. - -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + --keep-going Do not abort the build as soon as there is an error - --keep-going Do not abort the build as soon as there is an error + -r, --release Build artifacts in release mode, with optimizations - -r, --release Build artifacts in release mode, with optimizations + --profile <PROFILE-NAME> Build artifacts with the specified profile - --profile <PROFILE-NAME> Build artifacts with the specified profile + --target [<TRIPLE>] Build for the target triple - --target [<TRIPLE>] Build for the target triple + --target-dir <DIRECTORY> Directory for all generated artifacts - --target-dir <DIRECTORY> Directory for all generated artifacts + --unit-graph Output build graph in JSON (unstable) - --unit-graph Output build graph in JSON (unstable) + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json - --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + - + Manifest Options: - Manifest Options: + --manifest-path <PATH> Path to Cargo.toml - --manifest-path <PATH> Path to Cargo.toml + --ignore-rust-version Ignore `rust-version` specification in packages --locked Assert that `Cargo.lock` will remain unchanged diff --git a/tests/testsuite/cargo_test/help/stdout.term.svg b/tests/testsuite/cargo_test/help/stdout.term.svg index 0ec4686cda6..5146edb1f15 100644 --- a/tests/testsuite/cargo_test/help/stdout.term.svg +++ b/tests/testsuite/cargo_test/help/stdout.term.svg @@ -43,95 +43,95 @@ --no-fail-fast Run all tests regardless of failure - --ignore-rust-version Ignore `rust-version` specification in packages + --future-incompat-report Outputs a future incompatibility report at the end of the build - --future-incompat-report Outputs a future incompatibility report at the end of the build + --message-format <FMT> Error format - --message-format <FMT> Error format + -q, --quiet Display one character per test instead of one line - -q, --quiet Display one character per test instead of one line + -v, --verbose... Use verbose output (-vv very verbose/build.rs output) - -v, --verbose... Use verbose output (-vv very verbose/build.rs output) + --color <WHEN> Coloring: auto, always, never - --color <WHEN> Coloring: auto, always, never + --config <KEY=VALUE> Override a configuration value - --config <KEY=VALUE> Override a configuration value + -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for - -Z <FLAG> Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for + details - details + -h, --help Print help - -h, --help Print help + - + Package Selection: - Package Selection: + -p, --package [<SPEC>] Package to run tests for - -p, --package [<SPEC>] Package to run tests for + --workspace Test all packages in the workspace - --workspace Test all packages in the workspace + --exclude <SPEC> Exclude packages from the test - --exclude <SPEC> Exclude packages from the test + --all Alias for --workspace (deprecated) - --all Alias for --workspace (deprecated) + - + Target Selection: - Target Selection: + --lib Test only this package's library - --lib Test only this package's library + --bins Test all binaries - --bins Test all binaries + --bin [<NAME>] Test only the specified binary - --bin [<NAME>] Test only the specified binary + --examples Test all examples - --examples Test all examples + --example [<NAME>] Test only the specified example - --example [<NAME>] Test only the specified example + --tests Test all test targets - --tests Test all test targets + --test [<NAME>] Test only the specified test target - --test [<NAME>] Test only the specified test target + --benches Test all bench targets - --benches Test all bench targets + --bench [<NAME>] Test only the specified bench target - --bench [<NAME>] Test only the specified bench target + --all-targets Test all targets (does not include doctests) - --all-targets Test all targets (does not include doctests) + - + Feature Selection: - Feature Selection: + -F, --features <FEATURES> Space or comma separated list of features to activate - -F, --features <FEATURES> Space or comma separated list of features to activate + --all-features Activate all available features - --all-features Activate all available features + --no-default-features Do not activate the `default` feature - --no-default-features Do not activate the `default` feature + - + Compilation Options: - Compilation Options: + -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. - -j, --jobs <N> Number of parallel jobs, defaults to # of CPUs. + -r, --release Build artifacts in release mode, with optimizations - -r, --release Build artifacts in release mode, with optimizations + --profile <PROFILE-NAME> Build artifacts with the specified profile - --profile <PROFILE-NAME> Build artifacts with the specified profile + --target [<TRIPLE>] Build for the target triple - --target [<TRIPLE>] Build for the target triple + --target-dir <DIRECTORY> Directory for all generated artifacts - --target-dir <DIRECTORY> Directory for all generated artifacts + --unit-graph Output build graph in JSON (unstable) - --unit-graph Output build graph in JSON (unstable) + --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json - --timings[=<FMTS>] Timing output formats (unstable) (comma separated): html, json + - + Manifest Options: - Manifest Options: + --manifest-path <PATH> Path to Cargo.toml - --manifest-path <PATH> Path to Cargo.toml + --ignore-rust-version Ignore `rust-version` specification in packages --locked Assert that `Cargo.lock` will remain unchanged