From 365ca5d28c62468df17af711c659deffe412315b Mon Sep 17 00:00:00 2001 From: Philpax Date: Thu, 15 Dec 2022 19:09:25 +1100 Subject: [PATCH 1/2] fix(add): use the possessive in error message --- src/bin/cargo/commands/add.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/cargo/commands/add.rs b/src/bin/cargo/commands/add.rs index 43e485b6742..39f0e189e3d 100644 --- a/src/bin/cargo/commands/add.rs +++ b/src/bin/cargo/commands/add.rs @@ -256,7 +256,7 @@ fn parse_dependencies(config: &Config, matches: &ArgMatches) -> CargoResult>(); - anyhow::bail!("feature `{feature}` must be qualified by the dependency its being activated for, like {}", candidates.join(", ")); + anyhow::bail!("feature `{feature}` must be qualified by the dependency it's being activated for, like {}", candidates.join(", ")); } crates .first_mut() From 249683b456a92263404ed70b325938e20f06db66 Mon Sep 17 00:00:00 2001 From: Philpax Date: Thu, 15 Dec 2022 09:34:23 +0100 Subject: [PATCH 2/2] fix(tests): update to match add change --- .../cargo_add/multiple_conflicts_with_features/stderr.log | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log index 60a6961e60c..72fd9fc9d4a 100644 --- a/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log +++ b/tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log @@ -1 +1 @@ -error: feature `nose` must be qualified by the dependency its being activated for, like `my-package1/nose`, `your-face/nose` +error: feature `nose` must be qualified by the dependency it's being activated for, like `my-package1/nose`, `your-face/nose`