Skip to content

Commit 63e27c6

Browse files
committed
refactor(update): Calculate all reporting states
1 parent 1b3c91b commit 63e27c6

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

src/cargo/ops/cargo_update.rs

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -788,12 +788,6 @@ fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Opti
788788
})
789789
.filter(|s| package_id.version() != s.version() && version_req.matches(s.version()))
790790
.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-
}
797791

798792
let incompat_ver_compat_msrv_summary = if !change.is_transitive.unwrap_or(true) {
799793
possibilities
@@ -813,28 +807,12 @@ fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Opti
813807
} else {
814808
None
815809
};
816-
if let Some(summary) = incompat_ver_compat_msrv_summary {
817-
let warn = style::WARN;
818-
let version = summary.version();
819-
let report = format!(" {warn}(available: v{version}){warn:#}");
820-
return Some(report);
821-
}
822810

823811
let compat_ver_summary = possibilities
824812
.iter()
825813
.map(|s| s.as_summary())
826814
.filter(|s| package_id.version() != s.version() && version_req.matches(s.version()))
827815
.max_by_key(|s| s.version());
828-
if let Some(summary) = compat_ver_summary {
829-
let msrv_note = summary
830-
.rust_version()
831-
.map(|rv| format!(", requires Rust {rv}"))
832-
.unwrap_or_default();
833-
let warn = style::NOP;
834-
let version = summary.version();
835-
let report = format!(" {warn}(available: v{version}{msrv_note}){warn:#}");
836-
return Some(report);
837-
}
838816

839817
let incompat_ver_summary = if !change.is_transitive.unwrap_or(true) {
840818
possibilities
@@ -845,6 +823,29 @@ fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Opti
845823
} else {
846824
None
847825
};
826+
827+
if let Some(summary) = compat_ver_compat_msrv_summary {
828+
let warn = style::WARN;
829+
let version = summary.version();
830+
let report = format!(" {warn}(available: v{version}){warn:#}");
831+
return Some(report);
832+
}
833+
if let Some(summary) = incompat_ver_compat_msrv_summary {
834+
let warn = style::WARN;
835+
let version = summary.version();
836+
let report = format!(" {warn}(available: v{version}){warn:#}");
837+
return Some(report);
838+
}
839+
if let Some(summary) = compat_ver_summary {
840+
let msrv_note = summary
841+
.rust_version()
842+
.map(|rv| format!(", requires Rust {rv}"))
843+
.unwrap_or_default();
844+
let warn = style::NOP;
845+
let version = summary.version();
846+
let report = format!(" {warn}(available: v{version}{msrv_note}){warn:#}");
847+
return Some(report);
848+
}
848849
if let Some(summary) = incompat_ver_summary {
849850
let msrv_note = summary
850851
.rust_version()

0 commit comments

Comments
 (0)