fix: Report more detailed semver errors

For `cargo install` we'll now show a more specific parse error for
semver, much like other parts of cargo.

This came out of my work on #12801.  I was looking at what might be
appropriate to put in a `cargo-util-semver` crate and realized we have
the `ToSemver` trait that exists but doesn't do much, so I dropped it.

Cargo.lock

@@ -3785,6 +3785,7 @@ dependencies = [
  "cargo-util",
  "clap",
  "git2",
+ "semver",
  "tracing",
  "tracing-subscriber",
 ]

crates/xtask-bump-check/Cargo.toml

@@ -11,5 +11,6 @@ cargo.workspace = true
 cargo-util.workspace = true
 clap.workspace = true
 git2.workspace = true
-tracing.workspace = true
+semver.workspace = true
 tracing-subscriber.workspace = true
+tracing.workspace = true

crates/xtask-bump-check/src/xtask.rs

@@ -24,7 +24,6 @@ use cargo::core::Workspace;
 use cargo::sources::source::QueryKind;
 use cargo::util::cache_lock::CacheLockMode;
 use cargo::util::command_prelude::*;
-use cargo::util::ToSemver;
 use cargo::CargoResult;
 use cargo_util::ProcessBuilder;
 
@@ -277,7 +276,7 @@ fn beta_and_stable_branch(repo: &git2::Repository) -> CargoResult<[git2::Branch<
             tracing::trace!("branch `{name}` is not in the format of `<remote>/rust-<semver>`");
             continue;
         };
-        let Ok(version) = version.to_semver() else {
+        let Ok(version) = version.parse::<semver::Version>() else {
             tracing::trace!("branch `{name}` is not a valid semver: `{version}`");
             continue;
         };

src/bin/cargo/commands/install.rs

@@ -6,7 +6,6 @@ use anyhow::format_err;
 use cargo::core::{GitReference, SourceId, Workspace};
 use cargo::ops;
 use cargo::util::IntoUrl;
-use cargo::util::ToSemver;
 use cargo::util::VersionReqExt;
 use cargo::CargoResult;
 use itertools::Itertools;
@@ -264,7 +263,7 @@ fn parse_semver_flag(v: &str) -> CargoResult<VersionReq> {
             ),
         }
     } else {
-        match v.to_semver() {
+        match v.trim().parse() {
             Ok(v) => Ok(VersionReq::exact(&v)),
             Err(e) => {
                 let mut msg = e.to_string();

src/cargo/core/package_id.rs

@@ -12,7 +12,7 @@ use serde::ser;
 
 use crate::core::SourceId;
 use crate::util::interning::InternedString;
-use crate::util::{CargoResult, ToSemver};
+use crate::util::CargoResult;
 
 static PACKAGE_ID_CACHE: OnceLock<Mutex<HashSet<&'static PackageIdInner>>> = OnceLock::new();
 
@@ -82,7 +82,7 @@ impl<'de> de::Deserialize<'de> for PackageId {
         let (field, rest) = rest
             .split_once(' ')
             .ok_or_else(|| de::Error::custom("invalid serialized PackageId"))?;
-        let version = field.to_semver().map_err(de::Error::custom)?;
+        let version = field.parse().map_err(de::Error::custom)?;
 
         let url =
             strip_parens(rest).ok_or_else(|| de::Error::custom("invalid serialized PackageId"))?;
@@ -123,12 +123,12 @@ impl Hash for PackageId {
 }
 
 impl PackageId {
-    pub fn new<T: ToSemver>(
+    pub fn new(
         name: impl Into<InternedString>,
-        version: T,
+        version: &str,
         sid: SourceId,
     ) -> CargoResult<PackageId> {
-        let v = version.to_semver()?;
+        let v = version.parse()?;
         Ok(PackageId::pure(name.into(), v, sid))
     }
 

src/cargo/sources/registry/index.rs

@@ -935,7 +935,7 @@ impl IndexSummary {
         } = serde_json::from_slice(line)?;
         let v = v.unwrap_or(1);
         tracing::trace!("json parsed registry {}/{}", name, vers);
-        let pkgid = PackageId::new(name, &vers, source_id)?;
+        let pkgid = PackageId::pure(name.into(), vers.clone(), source_id);
         let deps = deps
             .into_iter()
             .map(|dep| dep.into_dep(source_id))

src/cargo/util/mod.rs

@@ -23,7 +23,6 @@ pub use self::queue::Queue;
 pub use self::restricted_names::validate_package_name;
 pub use self::rustc::Rustc;
 pub use self::semver_ext::{OptVersionReq, PartialVersion, RustVersion, VersionExt, VersionReqExt};
-pub use self::to_semver::ToSemver;
 pub use self::vcs::{existing_vcs_repo, FossilRepo, GitRepo, HgRepo, PijulRepo};
 pub use self::workspace::{
     add_path_args, path_args, print_available_benches, print_available_binaries,
@@ -62,7 +61,6 @@ pub mod restricted_names;
 pub mod rustc;
 mod semver_ext;
 pub mod style;
-pub mod to_semver;
 pub mod toml;
 pub mod toml_mut;
 mod vcs;

src/cargo/util/to_semver.rs

@@ -1,36 +0,0 @@
-use crate::util::errors::CargoResult;
-use semver::Version;
-
-pub trait ToSemver {
-    fn to_semver(self) -> CargoResult<Version>;
-}
-
-impl ToSemver for Version {
-    fn to_semver(self) -> CargoResult<Version> {
-        Ok(self)
-    }
-}
-
-impl<'a> ToSemver for &'a str {
-    fn to_semver(self) -> CargoResult<Version> {
-        match Version::parse(self.trim()) {
-            Ok(v) => Ok(v),
-            Err(..) => Err(anyhow::format_err!(
-                "cannot parse '{}' as a SemVer version",
-                self
-            )),
-        }
-    }
-}
-
-impl<'a> ToSemver for &'a String {
-    fn to_semver(self) -> CargoResult<Version> {
-        (**self).to_semver()
-    }
-}
-
-impl<'a> ToSemver for &'a Version {
-    fn to_semver(self) -> CargoResult<Version> {
-        Ok(self.clone())
-    }
-}

src/cargo/util/toml/mod.rs

@@ -536,7 +536,7 @@ impl schema::TomlManifest {
             version
                 .clone()
                 .unwrap_or_else(|| semver::Version::new(0, 0, 0)),
-        )?;
+        );
 
         let edition = if let Some(edition) = package.edition.clone() {
             let edition: Edition = edition
@@ -1596,12 +1596,8 @@ impl schema::InheritableFields {
 }
 
 impl schema::TomlPackage {
-    pub fn to_package_id(
-        &self,
-        source_id: SourceId,
-        version: semver::Version,
-    ) -> CargoResult<PackageId> {
-        PackageId::new(&self.name, version, source_id)
+    pub fn to_package_id(&self, source_id: SourceId, version: semver::Version) -> PackageId {
+        PackageId::pure(self.name.as_str().into(), version, source_id)
     }
 }
 

tests/testsuite/install_upgrade.rs

@@ -230,7 +230,7 @@ fn ambiguous_version_no_longer_allowed() {
     cargo_process("install foo --version=1.0")
         .with_stderr(
             "\
-[ERROR] invalid value '1.0' for '--version <VERSION>': cannot parse '1.0' as a SemVer version
+[ERROR] invalid value '1.0' for '--version <VERSION>': unexpected end of input while parsing minor version number
 
   tip: if you want to specify SemVer range, add an explicit qualifier, like '^1.0'
 

triagebot.toml

@@ -201,7 +201,6 @@ trigger_files = ["src/cargo/util/auth/"]
 trigger_files = [
   "crates/semver-check",
   "src/cargo/util/semver_ext.rs",
-  "src/cargo/util/to_semver.rs",
 ]
 
 [autolabel."A-source-replacement"]