Skip to content

Commit f30f909

Browse files
committed
refactor(resolve): reuse RustVersion construct
1 parent 844457c commit f30f909

File tree

1 file changed

+13
-20
lines changed

1 file changed

+13
-20
lines changed

src/cargo/core/resolver/resolve.rs

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -125,28 +125,21 @@ impl ResolveVersion {
125125
return ResolveVersion::default();
126126
};
127127

128-
let rust_1_41 = PartialVersion {
129-
major: 1,
130-
minor: Some(41),
131-
patch: None,
132-
pre: None,
133-
build: None,
134-
}
135-
.try_into()
136-
.expect("PartialVersion 1.41");
137-
let rust_1_53 = PartialVersion {
138-
major: 1,
139-
minor: Some(53),
140-
patch: None,
141-
pre: None,
142-
build: None,
143-
}
144-
.try_into()
145-
.expect("PartialVersion 1.53");
128+
let rust = |major, minor| -> RustVersion {
129+
PartialVersion {
130+
major,
131+
minor: Some(minor),
132+
patch: None,
133+
pre: None,
134+
build: None,
135+
}
136+
.try_into()
137+
.unwrap()
138+
};
146139

147-
if rust_version >= &rust_1_53 {
140+
if rust_version >= &rust(1, 53) {
148141
ResolveVersion::V3
149-
} else if rust_version >= &rust_1_41 {
142+
} else if rust_version >= &rust(1, 41) {
150143
ResolveVersion::V2
151144
} else {
152145
ResolveVersion::V1

0 commit comments

Comments
 (0)