From af9080551ff836267ce0709f1db11183602333a8 Mon Sep 17 00:00:00 2001 From: pea-sys Date: Sun, 26 Feb 2023 18:12:28 +0900 Subject: [PATCH 1/3] Addition of support for -F as an alias for --features --- src/doc/man/cargo-add.md | 3 ++- src/doc/man/generated_txt/cargo-add.txt | 2 +- src/doc/src/commands/cargo-add.md | 2 ++ src/etc/man/cargo-add.1 | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/doc/man/cargo-add.md b/src/doc/man/cargo-add.md index 07f8fd225d7..c9bb2376e0c 100644 --- a/src/doc/man/cargo-add.md +++ b/src/doc/man/cargo-add.md @@ -1,4 +1,5 @@ # cargo-add(1) + {{*set actionverb="Add"}} {{*set nouns="adds"}} @@ -115,7 +116,7 @@ Disable the [default features](../reference/features.html#dependency-features). Re-enable the [default features](../reference/features.html#dependency-features). {{/option}} -{{#option "`--features` _features_" }} +{{#option "`-F` _features_" "`--features` _features_" }} Space or comma separated list of [features to activate](../reference/features.html#dependency-features). When adding multiple crates, the features for a specific crate may be enabled with diff --git a/src/doc/man/generated_txt/cargo-add.txt b/src/doc/man/generated_txt/cargo-add.txt index b85d9172fe8..8cd30eba335 100644 --- a/src/doc/man/generated_txt/cargo-add.txt +++ b/src/doc/man/generated_txt/cargo-add.txt @@ -103,7 +103,7 @@ OPTIONS Re-enable the default features . - --features features + -F features, --features features Space or comma separated list of features to activate . When adding multiple crates, the features for a specific crate may diff --git a/src/doc/src/commands/cargo-add.md b/src/doc/src/commands/cargo-add.md index a54a551fd3b..1f575b552fc 100644 --- a/src/doc/src/commands/cargo-add.md +++ b/src/doc/src/commands/cargo-add.md @@ -2,6 +2,7 @@ + ## NAME cargo-add --- Add dependencies to a Cargo.toml manifest file @@ -121,6 +122,7 @@ which is defined by the registry.default config key which defaults
Re-enable the default features.
+
-F features
--features features
Space or comma separated list of features to activate. When adding multiple diff --git a/src/etc/man/cargo-add.1 b/src/etc/man/cargo-add.1 index 05e52d68d88..c93db74f26b 100644 --- a/src/etc/man/cargo-add.1 +++ b/src/etc/man/cargo-add.1 @@ -130,6 +130,7 @@ Disable the \fIdefault features\fR \&. .RE .sp +\fB\-F\fR \fIfeatures\fR, \fB\-\-features\fR \fIfeatures\fR .RS 4 Space or comma separated list of \fIfeatures to From 2c3fec27b9911a135ca22aeb61f9b0807de16f52 Mon Sep 17 00:00:00 2001 From: pea-sys Date: Sun, 26 Feb 2023 21:15:57 +0900 Subject: [PATCH 2/3] add options-features.md --- src/doc/man/cargo-add.md | 8 +------- src/doc/man/includes/options-features.md | 7 +++++++ src/doc/src/commands/cargo-add.md | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 src/doc/man/includes/options-features.md diff --git a/src/doc/man/cargo-add.md b/src/doc/man/cargo-add.md index c9bb2376e0c..483f672b1d3 100644 --- a/src/doc/man/cargo-add.md +++ b/src/doc/man/cargo-add.md @@ -116,13 +116,7 @@ Disable the [default features](../reference/features.html#dependency-features). Re-enable the [default features](../reference/features.html#dependency-features). {{/option}} -{{#option "`-F` _features_" "`--features` _features_" }} -Space or comma separated list of [features to -activate](../reference/features.html#dependency-features). When adding multiple -crates, the features for a specific crate may be enabled with -`package-name/feature-name` syntax. This flag may be specified multiple times, -which enables all specified features. -{{/option}} +{{> options-features }} {{/options}} diff --git a/src/doc/man/includes/options-features.md b/src/doc/man/includes/options-features.md new file mode 100644 index 00000000000..4434bebe98c --- /dev/null +++ b/src/doc/man/includes/options-features.md @@ -0,0 +1,7 @@ +{{#option "`-F` _features_" "`--features` _features_" }} +Space or comma separated list of [features to +activate](../reference/features.html#dependency-features). When adding multiple +crates, the features for a specific crate may be enabled with +`package-name/feature-name` syntax. This flag may be specified multiple times, +which enables all specified features. +{{/option}} diff --git a/src/doc/src/commands/cargo-add.md b/src/doc/src/commands/cargo-add.md index 1f575b552fc..c3e8e80e486 100644 --- a/src/doc/src/commands/cargo-add.md +++ b/src/doc/src/commands/cargo-add.md @@ -131,6 +131,7 @@ crates, the features for a specific crate may be enabled with which enables all specified features.
+ From b88504ab6466a95b96a7cb4052d29e90006a37e3 Mon Sep 17 00:00:00 2001 From: pea-sys Date: Mon, 27 Feb 2023 06:57:15 +0900 Subject: [PATCH 3/3] Revert "add options-features.md" This reverts commit 2c3fec27b9911a135ca22aeb61f9b0807de16f52. --- src/doc/man/cargo-add.md | 8 +++++++- src/doc/man/includes/options-features.md | 7 ------- src/doc/src/commands/cargo-add.md | 1 - 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 src/doc/man/includes/options-features.md diff --git a/src/doc/man/cargo-add.md b/src/doc/man/cargo-add.md index 483f672b1d3..c9bb2376e0c 100644 --- a/src/doc/man/cargo-add.md +++ b/src/doc/man/cargo-add.md @@ -116,7 +116,13 @@ Disable the [default features](../reference/features.html#dependency-features). Re-enable the [default features](../reference/features.html#dependency-features). {{/option}} -{{> options-features }} +{{#option "`-F` _features_" "`--features` _features_" }} +Space or comma separated list of [features to +activate](../reference/features.html#dependency-features). When adding multiple +crates, the features for a specific crate may be enabled with +`package-name/feature-name` syntax. This flag may be specified multiple times, +which enables all specified features. +{{/option}} {{/options}} diff --git a/src/doc/man/includes/options-features.md b/src/doc/man/includes/options-features.md deleted file mode 100644 index 4434bebe98c..00000000000 --- a/src/doc/man/includes/options-features.md +++ /dev/null @@ -1,7 +0,0 @@ -{{#option "`-F` _features_" "`--features` _features_" }} -Space or comma separated list of [features to -activate](../reference/features.html#dependency-features). When adding multiple -crates, the features for a specific crate may be enabled with -`package-name/feature-name` syntax. This flag may be specified multiple times, -which enables all specified features. -{{/option}} diff --git a/src/doc/src/commands/cargo-add.md b/src/doc/src/commands/cargo-add.md index c3e8e80e486..1f575b552fc 100644 --- a/src/doc/src/commands/cargo-add.md +++ b/src/doc/src/commands/cargo-add.md @@ -131,7 +131,6 @@ crates, the features for a specific crate may be enabled with which enables all specified features. -