@@ -513,15 +513,15 @@ fn print_lockfile_generation(
513
513
vec ! [ ]
514
514
} ;
515
515
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 ) ;
519
519
let note = required_rust_version. or ( latest) ;
520
520
521
521
if let Some ( note) = note {
522
522
ws. gctx ( ) . shell ( ) . status_with_color (
523
523
"Adding" ,
524
- format ! ( "{package }{note}" ) ,
524
+ format ! ( "{package_id }{note}" ) ,
525
525
& style:: NOTE ,
526
526
) ?;
527
527
}
@@ -558,25 +558,25 @@ fn print_lockfile_sync(
558
558
vec ! [ ]
559
559
} ;
560
560
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 ) ;
564
564
let note = required_rust_version. or ( latest) . unwrap_or_default ( ) ;
565
565
566
- let msg = if removed . source_id ( ) . is_git ( ) {
566
+ let msg = if previous_id . source_id ( ) . is_git ( ) {
567
567
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 ] ,
570
570
)
571
571
} else {
572
- format ! ( "{removed } -> v{}{note}" , added . version( ) )
572
+ format ! ( "{previous_id } -> v{}{note}" , package_id . version( ) )
573
573
} ;
574
574
575
575
// If versions differ only in build metadata, we call it an "update"
576
576
// regardless of whether the build metadata has gone up or down.
577
577
// This metadata is often stuff like git commit hashes, which are
578
578
// 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 {
580
580
ws. gctx ( )
581
581
. shell ( )
582
582
. status_with_color ( "Downgrading" , msg, & style:: WARN ) ?;
@@ -586,14 +586,14 @@ fn print_lockfile_sync(
586
586
. status_with_color ( "Updating" , msg, & style:: GOOD ) ?;
587
587
}
588
588
} 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 ) ;
592
592
let note = required_rust_version. or ( latest) . unwrap_or_default ( ) ;
593
593
594
594
ws. gctx ( ) . shell ( ) . status_with_color (
595
595
"Adding" ,
596
- format ! ( "{package }{note}" ) ,
596
+ format ! ( "{package_id }{note}" ) ,
597
597
& style:: NOTE ,
598
598
) ?;
599
599
}
@@ -631,25 +631,25 @@ fn print_lockfile_updates(
631
631
vec ! [ ]
632
632
} ;
633
633
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 ) ;
637
637
let note = required_rust_version. or ( latest) . unwrap_or_default ( ) ;
638
638
639
- let msg = if removed . source_id ( ) . is_git ( ) {
639
+ let msg = if previous_id . source_id ( ) . is_git ( ) {
640
640
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 ] ,
643
643
)
644
644
} else {
645
- format ! ( "{removed } -> v{}{note}" , added . version( ) )
645
+ format ! ( "{previous_id } -> v{}{note}" , package_id . version( ) )
646
646
} ;
647
647
648
648
// If versions differ only in build metadata, we call it an "update"
649
649
// regardless of whether the build metadata has gone up or down.
650
650
// This metadata is often stuff like git commit hashes, which are
651
651
// 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 {
653
653
ws. gctx ( )
654
654
. shell ( )
655
655
. status_with_color ( "Downgrading" , msg, & style:: WARN ) ?;
@@ -659,28 +659,28 @@ fn print_lockfile_updates(
659
659
. status_with_color ( "Updating" , msg, & style:: GOOD ) ?;
660
660
}
661
661
} else {
662
- for package in diff. removed . iter ( ) {
662
+ for package_id in diff. removed . iter ( ) {
663
663
ws. gctx ( ) . shell ( ) . status_with_color (
664
664
"Removing" ,
665
- format ! ( "{package }" ) ,
665
+ format ! ( "{package_id }" ) ,
666
666
& style:: ERROR ,
667
667
) ?;
668
668
}
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 ) ;
672
672
let note = required_rust_version. or ( latest) . unwrap_or_default ( ) ;
673
673
674
674
ws. gctx ( ) . shell ( ) . status_with_color (
675
675
"Adding" ,
676
- format ! ( "{package }{note}" ) ,
676
+ format ! ( "{package_id }{note}" ) ,
677
677
& style:: NOTE ,
678
678
) ?;
679
679
}
680
680
}
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 ) ;
684
684
let note = required_rust_version. as_deref ( ) . or ( latest. as_deref ( ) ) ;
685
685
686
686
if let Some ( note) = note {
@@ -690,7 +690,7 @@ fn print_lockfile_updates(
690
690
if ws. gctx ( ) . shell ( ) . verbosity ( ) == Verbosity :: Verbose {
691
691
ws. gctx ( ) . shell ( ) . status_with_color (
692
692
"Unchanged" ,
693
- format ! ( "{package }{note}" ) ,
693
+ format ! ( "{package_id }{note}" ) ,
694
694
& anstyle:: Style :: new ( ) . bold ( ) ,
695
695
) ?;
696
696
}
0 commit comments