@@ -788,12 +788,6 @@ fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Opti
788
788
} )
789
789
. filter ( |s| package_id. version ( ) != s. version ( ) && version_req. matches ( s. version ( ) ) )
790
790
. max_by_key ( |s| s. version ( ) ) ;
791
- if let Some ( summary) = compat_ver_compat_msrv_summary {
792
- let warn = style:: WARN ;
793
- let version = summary. version ( ) ;
794
- let report = format ! ( " {warn}(available: v{version}){warn:#}" ) ;
795
- return Some ( report) ;
796
- }
797
791
798
792
let incompat_ver_compat_msrv_summary = possibilities
799
793
. iter ( )
@@ -809,50 +803,54 @@ fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Opti
809
803
} )
810
804
. filter ( |s| is_latest ( s. version ( ) , package_id. version ( ) ) )
811
805
. max_by_key ( |s| s. version ( ) ) ;
812
- if let Some ( summary) = incompat_ver_compat_msrv_summary {
806
+
807
+ let compat_ver_summary = possibilities
808
+ . iter ( )
809
+ . map ( |s| s. as_summary ( ) )
810
+ . filter ( |s| package_id. version ( ) != s. version ( ) && version_req. matches ( s. version ( ) ) )
811
+ . max_by_key ( |s| s. version ( ) ) ;
812
+
813
+ let incompat_ver_summary = possibilities
814
+ . iter ( )
815
+ . map ( |s| s. as_summary ( ) )
816
+ . filter ( |s| is_latest ( s. version ( ) , package_id. version ( ) ) )
817
+ . max_by_key ( |s| s. version ( ) ) ;
818
+
819
+ if let Some ( summary) = compat_ver_compat_msrv_summary {
820
+ let warn = style:: WARN ;
821
+ let version = summary. version ( ) ;
822
+ let report = format ! ( " {warn}(available: v{version}){warn:#}" ) ;
823
+ Some ( report)
824
+ } else if let Some ( summary) = incompat_ver_compat_msrv_summary {
813
825
let warn = if change. is_transitive . unwrap_or ( true ) {
814
826
Default :: default ( )
815
827
} else {
816
828
style:: WARN
817
829
} ;
818
830
let version = summary. version ( ) ;
819
831
let report = format ! ( " {warn}(available: v{version}){warn:#}" ) ;
820
- return Some ( report) ;
821
- }
822
-
823
- let compat_ver_summary = possibilities
824
- . iter ( )
825
- . map ( |s| s. as_summary ( ) )
826
- . filter ( |s| package_id. version ( ) != s. version ( ) && version_req. matches ( s. version ( ) ) )
827
- . max_by_key ( |s| s. version ( ) ) ;
828
- if let Some ( summary) = compat_ver_summary {
832
+ Some ( report)
833
+ } else if let Some ( summary) = compat_ver_summary {
829
834
let msrv_note = summary
830
835
. rust_version ( )
831
836
. map ( |rv| format ! ( ", requires Rust {rv}" ) )
832
837
. unwrap_or_default ( ) ;
833
838
let warn = style:: NOP ;
834
839
let version = summary. version ( ) ;
835
840
let report = format ! ( " {warn}(available: v{version}{msrv_note}){warn:#}" ) ;
836
- return Some ( report) ;
837
- }
838
-
839
- let incompat_ver_summary = possibilities
840
- . iter ( )
841
- . map ( |s| s. as_summary ( ) )
842
- . filter ( |s| is_latest ( s. version ( ) , package_id. version ( ) ) )
843
- . max_by_key ( |s| s. version ( ) ) ;
844
- if let Some ( summary) = incompat_ver_summary {
841
+ Some ( report)
842
+ } else if let Some ( summary) = incompat_ver_summary {
845
843
let msrv_note = summary
846
844
. rust_version ( )
847
845
. map ( |rv| format ! ( ", requires Rust {rv}" ) )
848
846
. unwrap_or_default ( ) ;
849
847
let warn = style:: NOP ;
850
848
let version = summary. version ( ) ;
851
849
let report = format ! ( " {warn}(available: v{version}{msrv_note}){warn:#}" ) ;
852
- return Some ( report) ;
850
+ Some ( report)
851
+ } else {
852
+ None
853
853
}
854
-
855
- None
856
854
}
857
855
858
856
fn is_latest ( candidate : & semver:: Version , current : & semver:: Version ) -> bool {
0 commit comments