Skip to content

Commit

Permalink
refactor(lockfile): Pull out is_latest for reuse
Browse files Browse the repository at this point in the history
  • Loading branch information
epage committed Mar 8, 2024
1 parent f3a9de3 commit 36aadf6
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/cargo/ops/cargo_generate_lockfile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 36aadf6

Please sign in to comment.