Skip to content

Optimize parse_version in find_tools.rs #1527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 21, 2025
Merged

Optimize parse_version in find_tools.rs #1527

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
797148d
Optimize parse_version in find_tools.rs
NobodyXu Aug 21, 2025
eb821ff
Fix find_msvc_15plus in find_tools.rs
NobodyXu Aug 21, 2025
f27dbf1
Fix find_tools.rs
NobodyXu Aug 21, 2025
25d9a81
More optimization for parse_version find_tools.rs
NobodyXu Aug 21, 2025
75f6418
Fmt find_tools.rs
NobodyXu Aug 21, 2025
b72f6ad
Fix find_tools.rs
NobodyXu Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/windows/find_tools.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,11 +632,19 @@ mod impl_ {

// Inspired from official microsoft/vswhere ParseVersionString
// i.e. at most four u16 numbers separated by '.'
fn parse_version(version: &str) -> Option<Vec<u16>> {
version
.split('.')
.map(|chunk| u16::from_str(chunk).ok())
.collect()
fn parse_version(version: &str) -> Option<[u16; 4]> {
let mut iter = version.split('.').map(u16::from_str).fuse();
let mut get_next_number = move || match iter.next() {
Some(Ok(version_part)) => Some(version_part),
Some(Err(_)) => None,
None => Some(0),
};
Some([
get_next_number()?,
get_next_number()?,
get_next_number()?,
get_next_number()?,
])
}

pub(super) fn find_msvc_15plus(
Expand Down
Loading