refactor(resolve): Make it easier to extend MSRV logic

epage · epage · commit b7b3874d097f · 2024-04-11T14:38:02.000-05:00
diff --git a/src/cargo/ops/resolve.rs b/src/cargo/ops/resolve.rs
@@ -304,7 +304,8 @@ pub fn resolve_with_previous<'gctx>(
         version_prefs.version_ordering(VersionOrdering::MinimumVersionsFirst)
     }
     if ws.resolve_honors_rust_version() {
-        version_prefs.max_rust_version(ws.rust_version().cloned().map(RustVersion::into_partial));
+        let rust_version = ws.rust_version().cloned().map(RustVersion::into_partial);
+        version_prefs.max_rust_version(rust_version);
     }
 
     let avoid_patch_ids = if register_patches {

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,8 @@ pub fn resolve_with_previous<'gctx>(`
`304`	`304`	`version_prefs.version_ordering(VersionOrdering::MinimumVersionsFirst)`
`305`	`305`	`}`
`306`	`306`	`if ws.resolve_honors_rust_version() {`
`307`		`- version_prefs.max_rust_version(ws.rust_version().cloned().map(RustVersion::into_partial));`
	`307`	`+ let rust_version = ws.rust_version().cloned().map(RustVersion::into_partial);`
	`308`	`+ version_prefs.max_rust_version(rust_version);`
`308`	`309`	`}`
`309`	`310`
`310`	`311`	`let avoid_patch_ids = if register_patches {`