Skip to content

Commit 2c9f9c2

Browse files
committed
refactor(update): Be clearer, consistent in variable name
1 parent 99ad632 commit 2c9f9c2

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

src/cargo/ops/cargo_update.rs

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -513,15 +513,15 @@ fn print_lockfile_generation(
513513
vec![]
514514
};
515515

516-
for package in diff.added.iter() {
517-
let required_rust_version = report_required_rust_version(ws, resolve, *package);
518-
let latest = report_latest(&possibilities, *package);
516+
for package_id in diff.added.iter() {
517+
let required_rust_version = report_required_rust_version(ws, resolve, *package_id);
518+
let latest = report_latest(&possibilities, *package_id);
519519
let note = required_rust_version.or(latest);
520520

521521
if let Some(note) = note {
522522
ws.gctx().shell().status_with_color(
523523
"Adding",
524-
format!("{package}{note}"),
524+
format!("{package_id}{note}"),
525525
&style::NOTE,
526526
)?;
527527
}
@@ -558,25 +558,25 @@ fn print_lockfile_sync(
558558
vec![]
559559
};
560560

561-
if let Some((removed, added)) = diff.change() {
562-
let required_rust_version = report_required_rust_version(ws, resolve, added);
563-
let latest = report_latest(&possibilities, added);
561+
if let Some((previous_id, package_id)) = diff.change() {
562+
let required_rust_version = report_required_rust_version(ws, resolve, package_id);
563+
let latest = report_latest(&possibilities, package_id);
564564
let note = required_rust_version.or(latest).unwrap_or_default();
565565

566-
let msg = if removed.source_id().is_git() {
566+
let msg = if previous_id.source_id().is_git() {
567567
format!(
568-
"{removed} -> #{}",
569-
&added.source_id().precise_git_fragment().unwrap()[..8],
568+
"{previous_id} -> #{}",
569+
&package_id.source_id().precise_git_fragment().unwrap()[..8],
570570
)
571571
} else {
572-
format!("{removed} -> v{}{note}", added.version())
572+
format!("{previous_id} -> v{}{note}", package_id.version())
573573
};
574574

575575
// If versions differ only in build metadata, we call it an "update"
576576
// regardless of whether the build metadata has gone up or down.
577577
// This metadata is often stuff like git commit hashes, which are
578578
// not meaningfully ordered.
579-
if removed.version().cmp_precedence(added.version()) == Ordering::Greater {
579+
if previous_id.version().cmp_precedence(package_id.version()) == Ordering::Greater {
580580
ws.gctx()
581581
.shell()
582582
.status_with_color("Downgrading", msg, &style::WARN)?;
@@ -586,14 +586,14 @@ fn print_lockfile_sync(
586586
.status_with_color("Updating", msg, &style::GOOD)?;
587587
}
588588
} else {
589-
for package in diff.added.iter() {
590-
let required_rust_version = report_required_rust_version(ws, resolve, *package);
591-
let latest = report_latest(&possibilities, *package);
589+
for package_id in diff.added.iter() {
590+
let required_rust_version = report_required_rust_version(ws, resolve, *package_id);
591+
let latest = report_latest(&possibilities, *package_id);
592592
let note = required_rust_version.or(latest).unwrap_or_default();
593593

594594
ws.gctx().shell().status_with_color(
595595
"Adding",
596-
format!("{package}{note}"),
596+
format!("{package_id}{note}"),
597597
&style::NOTE,
598598
)?;
599599
}
@@ -631,25 +631,25 @@ fn print_lockfile_updates(
631631
vec![]
632632
};
633633

634-
if let Some((removed, added)) = diff.change() {
635-
let required_rust_version = report_required_rust_version(ws, resolve, added);
636-
let latest = report_latest(&possibilities, added);
634+
if let Some((previous_id, package_id)) = diff.change() {
635+
let required_rust_version = report_required_rust_version(ws, resolve, package_id);
636+
let latest = report_latest(&possibilities, package_id);
637637
let note = required_rust_version.or(latest).unwrap_or_default();
638638

639-
let msg = if removed.source_id().is_git() {
639+
let msg = if previous_id.source_id().is_git() {
640640
format!(
641-
"{removed} -> #{}{note}",
642-
&added.source_id().precise_git_fragment().unwrap()[..8],
641+
"{previous_id} -> #{}{note}",
642+
&package_id.source_id().precise_git_fragment().unwrap()[..8],
643643
)
644644
} else {
645-
format!("{removed} -> v{}{note}", added.version())
645+
format!("{previous_id} -> v{}{note}", package_id.version())
646646
};
647647

648648
// If versions differ only in build metadata, we call it an "update"
649649
// regardless of whether the build metadata has gone up or down.
650650
// This metadata is often stuff like git commit hashes, which are
651651
// not meaningfully ordered.
652-
if removed.version().cmp_precedence(added.version()) == Ordering::Greater {
652+
if previous_id.version().cmp_precedence(package_id.version()) == Ordering::Greater {
653653
ws.gctx()
654654
.shell()
655655
.status_with_color("Downgrading", msg, &style::WARN)?;
@@ -659,28 +659,28 @@ fn print_lockfile_updates(
659659
.status_with_color("Updating", msg, &style::GOOD)?;
660660
}
661661
} else {
662-
for package in diff.removed.iter() {
662+
for package_id in diff.removed.iter() {
663663
ws.gctx().shell().status_with_color(
664664
"Removing",
665-
format!("{package}"),
665+
format!("{package_id}"),
666666
&style::ERROR,
667667
)?;
668668
}
669-
for package in diff.added.iter() {
670-
let required_rust_version = report_required_rust_version(ws, resolve, *package);
671-
let latest = report_latest(&possibilities, *package);
669+
for package_id in diff.added.iter() {
670+
let required_rust_version = report_required_rust_version(ws, resolve, *package_id);
671+
let latest = report_latest(&possibilities, *package_id);
672672
let note = required_rust_version.or(latest).unwrap_or_default();
673673

674674
ws.gctx().shell().status_with_color(
675675
"Adding",
676-
format!("{package}{note}"),
676+
format!("{package_id}{note}"),
677677
&style::NOTE,
678678
)?;
679679
}
680680
}
681-
for package in &diff.unchanged {
682-
let required_rust_version = report_required_rust_version(ws, resolve, *package);
683-
let latest = report_latest(&possibilities, *package);
681+
for package_id in &diff.unchanged {
682+
let required_rust_version = report_required_rust_version(ws, resolve, *package_id);
683+
let latest = report_latest(&possibilities, *package_id);
684684
let note = required_rust_version.as_deref().or(latest.as_deref());
685685

686686
if let Some(note) = note {
@@ -690,7 +690,7 @@ fn print_lockfile_updates(
690690
if ws.gctx().shell().verbosity() == Verbosity::Verbose {
691691
ws.gctx().shell().status_with_color(
692692
"Unchanged",
693-
format!("{package}{note}"),
693+
format!("{package_id}{note}"),
694694
&anstyle::Style::new().bold(),
695695
)?;
696696
}

0 commit comments

Comments
 (0)