itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(resolve): reuse RustVersion construct

Browse Source
This commit is contained in:
Weihang Lo 2024-09-24 15:35:47 -04:00
parent 844457cf85
commit f30f909756
No known key found for this signature in database
GPG Key ID: D7DBF189825E82E7
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/cargo/core/resolver/resolve.rs
View File

@ -125,28 +125,21 @@ impl ResolveVersion {
return ResolveVersion::default(); return ResolveVersion::default();
}; };
let rust_1_41 = PartialVersion { let rust = |major, minor| -> RustVersion {
major: 1, PartialVersion {
minor: Some(41), major,
patch: None, minor: Some(minor),
pre: None, patch: None,
build: None, pre: None,
} build: None,
.try_into() }
.expect("PartialVersion 1.41"); .try_into()
let rust_1_53 = PartialVersion { .unwrap()
major: 1, };
minor: Some(53),
patch: None,
pre: None,
build: None,
}
.try_into()
.expect("PartialVersion 1.53");
if rust_version >= &rust_1_53 { if rust_version >= &rust(1, 53) {
ResolveVersion::V3 ResolveVersion::V3
} else if rust_version >= &rust_1_41 { } else if rust_version >= &rust(1, 41) {
ResolveVersion::V2 ResolveVersion::V2
} else { } else {
ResolveVersion::V1 ResolveVersion::V1