Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

generalise suggestion on abiguous spec #12685

Merged
merged 1 commit into from
Sep 18, 2023
Merged

generalise suggestion on abiguous spec #12685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/cargo/core/package_id_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand Down
4 changes: 2 additions & 2 deletions tests/testsuite/git.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
",
Expand Down
4 changes: 2 additions & 2 deletions tests/testsuite/pkgid.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
",
Expand All @@ -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]
",
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
",
Expand Down