Auto merge of #12685 - eopb:ambiguous-spec-12433, r=epage

generalise suggestion on abiguous spec Fixes #12433
rust-lang · Sep 18, 2023 · 4ac43be · 4ac43be
2 parents 30ce446 + 9831e83
commit 4ac43be
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/cargo/core/package_id_spec.rs b/src/cargo/core/package_id_spec.rs
@@ -250,8 +250,8 @@ impl PackageIdSpec {
                      your project, and the specification \
                      `{}` is ambiguous.\n\
                      Please re-run this command \
-                     with `-p <spec>` where `<spec>` is one \
-                     of the following:",
+                     with one of the following \
+                     specifications:",
                     self.name(),
                     self
                 );

diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs
@@ -1887,8 +1887,8 @@ fn update_ambiguous() {
             "\
 [ERROR] There are multiple `bar` packages in your project, and the specification `bar` \
 is ambiguous.
-Please re-run this command with `-p <spec>` where `<spec>` is one of the \
-following:
+Please re-run this command with one of the \
+following specifications:
   bar@0.[..].0
   bar@0.[..].0
 ",

diff --git a/tests/testsuite/pkgid.rs b/tests/testsuite/pkgid.rs
@@ -152,7 +152,7 @@ fn multiple_versions() {
         .with_stderr(
             "\
 error: There are multiple `two-ver` packages in your project, and the specification `two-ver@0` is ambiguous.
-Please re-run this command with `-p <spec>` where `<spec>` is one of the following:
+Please re-run this command with one of the following specifications:
   [email protected]
   [email protected]
 ",
@@ -174,7 +174,7 @@ https://github.com/rust-lang/crates.io-index#[email protected]
         .with_stderr(
             "\
 error: There are multiple `two-ver` packages in your project, and the specification `two-ver` is ambiguous.
-Please re-run this command with `-p <spec>` where `<spec>` is one of the following:
+Please re-run this command with one of the following specifications:
   [email protected]
   [email protected]
 ",

diff --git a/tests/testsuite/tree.rs b/tests/testsuite/tree.rs
@@ -1675,7 +1675,7 @@ fn ambiguous_name() {
         .with_stderr_contains(
             "\
 error: There are multiple `dep` packages in your project, and the specification `dep` is ambiguous.
-Please re-run this command with `-p <spec>` where `<spec>` is one of the following:
+Please re-run this command with one of the following specifications:
   [email protected]
   [email protected]
 ",