diff --git a/src/cargo/core/package_id_spec.rs b/src/cargo/core/package_id_spec.rs index 51e026f51cf..457166b3710 100644 --- a/src/cargo/core/package_id_spec.rs +++ b/src/cargo/core/package_id_spec.rs @@ -153,7 +153,7 @@ impl PackageIdSpec { /// Full `semver::Version`, if present pub fn version(&self) -> Option { - self.version.as_ref().and_then(|v| v.version()) + self.version.as_ref().and_then(|v| v.to_version()) } pub fn partial_version(&self) -> Option<&PartialVersion> { diff --git a/src/cargo/ops/cargo_compile/mod.rs b/src/cargo/ops/cargo_compile/mod.rs index 9cf8599c48c..94c6cf9de04 100644 --- a/src/cargo/ops/cargo_compile/mod.rs +++ b/src/cargo/ops/cargo_compile/mod.rs @@ -493,7 +493,7 @@ pub fn create_bcx<'a, 'cfg>( continue; }; - let req = version.caret_req(); + let req = version.to_caret_req(); if req.matches(&untagged_version) { continue; } diff --git a/src/cargo/ops/common_for_install_and_uninstall.rs b/src/cargo/ops/common_for_install_and_uninstall.rs index 803f3488d38..d1f9152be40 100644 --- a/src/cargo/ops/common_for_install_and_uninstall.rs +++ b/src/cargo/ops/common_for_install_and_uninstall.rs @@ -555,7 +555,7 @@ where match deps.iter().max_by_key(|p| p.package_id()) { Some(summary) => { if let (Some(current), Some(msrv)) = (current_rust_version, summary.rust_version()) { - let msrv_req = msrv.caret_req(); + let msrv_req = msrv.to_caret_req(); if !msrv_req.matches(current) { let name = summary.name(); let ver = summary.version(); @@ -574,7 +574,7 @@ where .filter(|summary| { summary .rust_version() - .map(|msrv| msrv.caret_req().matches(current)) + .map(|msrv| msrv.to_caret_req().matches(current)) .unwrap_or(true) }) .max_by_key(|s| s.package_id()) diff --git a/src/cargo/util/semver_ext.rs b/src/cargo/util/semver_ext.rs index 86f0b19245e..475abacc578 100644 --- a/src/cargo/util/semver_ext.rs +++ b/src/cargo/util/semver_ext.rs @@ -201,7 +201,7 @@ pub struct PartialVersion { } impl PartialVersion { - pub fn version(&self) -> Option { + pub fn to_version(&self) -> Option { Some(Version { major: self.major, minor: self.minor?, @@ -211,7 +211,7 @@ impl PartialVersion { }) } - pub fn caret_req(&self) -> VersionReq { + pub fn to_caret_req(&self) -> VersionReq { VersionReq { comparators: vec![Comparator { op: semver::Op::Caret, diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index 35aa3c50f17..3c1dc48f3ee 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -568,7 +568,7 @@ impl schema::TomlManifest { let rust_version = rust_version .clone() .resolve("rust_version", || inherit()?.rust_version())?; - let req = rust_version.caret_req(); + let req = rust_version.to_caret_req(); if let Some(first_version) = edition.first_version() { let unsupported = semver::Version::new(first_version.major, first_version.minor - 1, 9999);