Skip to content

Commit fbe79f5

Browse files
committed
refactor(update): Clarify reporting states are mutually exclusive
1 parent 63e27c6 commit fbe79f5

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

src/cargo/ops/cargo_update.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -828,36 +828,33 @@ fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Opti
828828
let warn = style::WARN;
829829
let version = summary.version();
830830
let report = format!(" {warn}(available: v{version}){warn:#}");
831-
return Some(report);
832-
}
833-
if let Some(summary) = incompat_ver_compat_msrv_summary {
831+
Some(report)
832+
} else if let Some(summary) = incompat_ver_compat_msrv_summary {
834833
let warn = style::WARN;
835834
let version = summary.version();
836835
let report = format!(" {warn}(available: v{version}){warn:#}");
837-
return Some(report);
838-
}
839-
if let Some(summary) = compat_ver_summary {
836+
Some(report)
837+
} else if let Some(summary) = compat_ver_summary {
840838
let msrv_note = summary
841839
.rust_version()
842840
.map(|rv| format!(", requires Rust {rv}"))
843841
.unwrap_or_default();
844842
let warn = style::NOP;
845843
let version = summary.version();
846844
let report = format!(" {warn}(available: v{version}{msrv_note}){warn:#}");
847-
return Some(report);
848-
}
849-
if let Some(summary) = incompat_ver_summary {
845+
Some(report)
846+
} else if let Some(summary) = incompat_ver_summary {
850847
let msrv_note = summary
851848
.rust_version()
852849
.map(|rv| format!(", requires Rust {rv}"))
853850
.unwrap_or_default();
854851
let warn = style::NOP;
855852
let version = summary.version();
856853
let report = format!(" {warn}(available: v{version}{msrv_note}){warn:#}");
857-
return Some(report);
854+
Some(report)
855+
} else {
856+
None
858857
}
859-
860-
None
861858
}
862859

863860
fn is_latest(candidate: &semver::Version, current: &semver::Version) -> bool {

0 commit comments

Comments
 (0)