From 36aadf628810272aec28af89b562d9e29166521f Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 7 Mar 2024 20:13:10 -0600 Subject: [PATCH] refactor(lockfile): Pull out is_latest for reuse --- src/cargo/ops/cargo_generate_lockfile.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs index b813ffeb76c1..36624af48cfc 100644 --- a/src/cargo/ops/cargo_generate_lockfile.rs +++ b/src/cargo/ops/cargo_generate_lockfile.rs @@ -188,14 +188,6 @@ fn print_lockfile_update( let warn = style::WARN; format!(" {warn}(latest: v{version}){warn:#}") } - fn is_latest(candidate: &semver::Version, current: &semver::Version) -> bool { - current < candidate - // Only match pre-release if major.minor.patch are the same - && (candidate.pre.is_empty() - || (candidate.major == current.major - && candidate.minor == current.minor - && candidate.patch == current.patch)) - } let possibilities = if let Some(query) = diff.alternatives_query() { loop { match registry.query_vec(&query, QueryKind::Exact) { @@ -302,6 +294,15 @@ fn print_lockfile_update( Ok(()) } +fn is_latest(candidate: &semver::Version, current: &semver::Version) -> bool { + current < candidate + // Only match pre-release if major.minor.patch are the same + && (candidate.pre.is_empty() + || (candidate.major == current.major + && candidate.minor == current.minor + && candidate.patch == current.patch)) +} + fn fill_with_deps<'a>( resolve: &'a Resolve, dep: PackageId,