Skip to content

Commit 545ca21

Browse files
committed
refactor(resolve): Give more details to 'report_latest'
1 parent 78d6795 commit 545ca21

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

src/cargo/ops/cargo_update.rs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -523,9 +523,8 @@ fn print_lockfile_generation(
523523
vec![]
524524
};
525525

526-
let package_id = change.package_id;
527526
let required_rust_version = report_required_rust_version(resolve, change);
528-
let latest = report_latest(&possibilities, package_id);
527+
let latest = report_latest(&possibilities, change);
529528
let note = required_rust_version.or(latest);
530529

531530
if let Some(note) = note {
@@ -587,9 +586,8 @@ fn print_lockfile_sync(
587586
vec![]
588587
};
589588

590-
let package_id = change.package_id;
591589
let required_rust_version = report_required_rust_version(resolve, change);
592-
let latest = report_latest(&possibilities, package_id);
590+
let latest = report_latest(&possibilities, change);
593591
let note = required_rust_version.or(latest).unwrap_or_default();
594592

595593
ws.gctx().shell().status_with_color(
@@ -641,9 +639,8 @@ fn print_lockfile_updates(
641639
PackageChangeKind::Added
642640
| PackageChangeKind::Upgraded
643641
| PackageChangeKind::Downgraded => {
644-
let package_id = change.package_id;
645642
let required_rust_version = report_required_rust_version(resolve, change);
646-
let latest = report_latest(&possibilities, package_id);
643+
let latest = report_latest(&possibilities, change);
647644
let note = required_rust_version.or(latest).unwrap_or_default();
648645

649646
ws.gctx().shell().status_with_color(
@@ -660,9 +657,8 @@ fn print_lockfile_updates(
660657
)?;
661658
}
662659
PackageChangeKind::Unchanged => {
663-
let package_id = change.package_id;
664660
let required_rust_version = report_required_rust_version(resolve, change);
665-
let latest = report_latest(&possibilities, package_id);
661+
let latest = report_latest(&possibilities, change);
666662
let note = required_rust_version.as_deref().or(latest.as_deref());
667663

668664
if let Some(note) = note {
@@ -754,15 +750,16 @@ fn report_required_rust_version(resolve: &Resolve, change: &PackageChange) -> Op
754750
))
755751
}
756752

757-
fn report_latest(possibilities: &[IndexSummary], package: PackageId) -> Option<String> {
758-
if !package.source_id().is_registry() {
753+
fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Option<String> {
754+
let package_id = change.package_id;
755+
if !package_id.source_id().is_registry() {
759756
return None;
760757
}
761758

762759
if let Some(version) = possibilities
763760
.iter()
764761
.map(|s| s.as_summary())
765-
.filter(|s| is_latest(s.version(), package.version()))
762+
.filter(|s| is_latest(s.version(), package_id.version()))
766763
.map(|s| s.version().clone())
767764
.max()
768765
{

0 commit comments

Comments
 (0)