fix: Improved error message when update --breaking invalid spec.

rust-lang · Jul 21, 2024 · 57622d7 · 57622d7
1 parent 631b877
commit 57622d7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/cargo/ops/cargo_update.rs b/src/cargo/ops/cargo_update.rs
@@ -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;
@@ -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

diff --git a/tests/testsuite/update.rs b/tests/testsuite/update.rs
@@ -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"
 
 "#]])
         .run();