Skip to content

Commit 1b3c91b

Browse files
committed
refactor(update): Remove redundant scopes
1 parent 0d2349d commit 1b3c91b

File tree

1 file changed

+41
-45
lines changed

1 file changed

+41
-45
lines changed

src/cargo/ops/cargo_update.rs

Lines changed: 41 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -795,31 +795,29 @@ fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Opti
795795
return Some(report);
796796
}
797797

798-
{
799-
let incompat_ver_compat_msrv_summary = if !change.is_transitive.unwrap_or(true) {
800-
possibilities
801-
.iter()
802-
.map(|s| s.as_summary())
803-
.filter(|s| {
804-
if let (Some(summary_rust_version), Some(required_rust_version)) =
805-
(s.rust_version(), required_rust_version)
806-
{
807-
summary_rust_version.is_compatible_with(required_rust_version)
808-
} else {
809-
true
810-
}
811-
})
812-
.filter(|s| is_latest(s.version(), package_id.version()))
813-
.max_by_key(|s| s.version())
814-
} else {
815-
None
816-
};
817-
if let Some(summary) = incompat_ver_compat_msrv_summary {
818-
let warn = style::WARN;
819-
let version = summary.version();
820-
let report = format!(" {warn}(available: v{version}){warn:#}");
821-
return Some(report);
822-
}
798+
let incompat_ver_compat_msrv_summary = if !change.is_transitive.unwrap_or(true) {
799+
possibilities
800+
.iter()
801+
.map(|s| s.as_summary())
802+
.filter(|s| {
803+
if let (Some(summary_rust_version), Some(required_rust_version)) =
804+
(s.rust_version(), required_rust_version)
805+
{
806+
summary_rust_version.is_compatible_with(required_rust_version)
807+
} else {
808+
true
809+
}
810+
})
811+
.filter(|s| is_latest(s.version(), package_id.version()))
812+
.max_by_key(|s| s.version())
813+
} else {
814+
None
815+
};
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);
823821
}
824822

825823
let compat_ver_summary = possibilities
@@ -838,26 +836,24 @@ fn report_latest(possibilities: &[IndexSummary], change: &PackageChange) -> Opti
838836
return Some(report);
839837
}
840838

841-
{
842-
let incompat_ver_summary = if !change.is_transitive.unwrap_or(true) {
843-
possibilities
844-
.iter()
845-
.map(|s| s.as_summary())
846-
.filter(|s| is_latest(s.version(), package_id.version()))
847-
.max_by_key(|s| s.version())
848-
} else {
849-
None
850-
};
851-
if let Some(summary) = incompat_ver_summary {
852-
let msrv_note = summary
853-
.rust_version()
854-
.map(|rv| format!(", requires Rust {rv}"))
855-
.unwrap_or_default();
856-
let warn = style::NOP;
857-
let version = summary.version();
858-
let report = format!(" {warn}(available: v{version}{msrv_note}){warn:#}");
859-
return Some(report);
860-
}
839+
let incompat_ver_summary = if !change.is_transitive.unwrap_or(true) {
840+
possibilities
841+
.iter()
842+
.map(|s| s.as_summary())
843+
.filter(|s| is_latest(s.version(), package_id.version()))
844+
.max_by_key(|s| s.version())
845+
} else {
846+
None
847+
};
848+
if let Some(summary) = incompat_ver_summary {
849+
let msrv_note = summary
850+
.rust_version()
851+
.map(|rv| format!(", requires Rust {rv}"))
852+
.unwrap_or_default();
853+
let warn = style::NOP;
854+
let version = summary.version();
855+
let report = format!(" {warn}(available: v{version}{msrv_note}){warn:#}");
856+
return Some(report);
861857
}
862858

863859
None

0 commit comments

Comments
 (0)