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

Jump to bottom

Improved error message when update --breaking invalid spec. #14279

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Improved error message when update --breaking invalid spec. #14279

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
6 changes: 5 additions & 1 deletion src/cargo/ops/cargo_update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use crate::util::toml_mut::manifest::LocalManifest;
use crate::util::toml_mut::upgrade::upgrade_requirement;
use crate::util::{style, OptVersionReq};
use crate::util::{CargoResult, VersionExt};
use anyhow::Context as _;
use itertools::Itertools;
use semver::{Op, Version, VersionReq};
use std::cmp::Ordering;
Expand Down Expand Up @@ -224,7 +225,10 @@ pub fn upgrade_manifests(

let to_update = to_update
.iter()
.map(|s| PackageIdSpec::parse(s))
.map(|spec| {
PackageIdSpec::parse(spec)
.with_context(|| format!("invalid package ID specification: `{spec}`"))
})
.collect::<Result<Vec<_>, _>>()?;

// Updates often require a lot of modifications to the registry, so ensure
Expand Down
5 changes: 4 additions & 1 deletion tests/testsuite/update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2263,7 +2263,10 @@ fn update_breaking_spec_version() {
.masquerade_as_nightly_cargo(&["update-breaking"])
.with_status(101)
.with_stderr_data(str![[r#"
[ERROR] expected a version like "1.32"
[ERROR] invalid package ID specification: `incompatible@foo`

Caused by:
expected a version like "1.32"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not optimal but better. Thanks!


"#]])
.run();
Expand Down