Skip to content

Fix inconsistent Windows host information #18384

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

Closed
zanieb wants to merge 1 commit into from
Closed

Fix inconsistent Windows host information #18384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 21 additions & 6 deletions crates/uv-platform/src/host.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl fmt::Display for OsType {
match self {
Self::Linux(os_type) => f.write_str(os_type),
Self::Darwin => f.write_str("Darwin"),
Self::WindowsNt => f.write_str("Windows_NT"),
Self::WindowsNt => f.write_str("Windows"),
}
}
}
Expand All @@ -56,8 +56,12 @@ impl fmt::Display for OsType {
pub enum OsRelease {
/// Unix kernel release from `uname -r` (e.g., `"6.8.0-90-generic"`).
Unix(String),
/// Windows build number from the registry (e.g., `"22631"`).
Windows(String),
/// Windows version from the registry (e.g., `10, 0, 22631`).
Windows {
major: u32,
minor: u32,
build: String,
},
}

impl OsRelease {
Expand All @@ -76,7 +80,14 @@ impl OsRelease {
let key = windows_registry::LOCAL_MACHINE
.open(r"SOFTWARE\Microsoft\Windows NT\CurrentVersion")
.ok()?;
Some(Self::Windows(key.get_string("CurrentBuildNumber").ok()?))
let major = key.get_u32("CurrentMajorVersionNumber").ok()?;
let minor = key.get_u32("CurrentMinorVersionNumber").ok()?;
let build = key.get_string("CurrentBuildNumber").ok()?;
Some(Self::Windows {
major,
minor,
build,
})
}
#[cfg(not(any(unix, windows)))]
{
Expand All @@ -89,7 +100,11 @@ impl fmt::Display for OsRelease {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::Unix(release) => f.write_str(release),
Self::Windows(build) => f.write_str(build),
Self::Windows {
major,
minor,
build,
} => write!(f, "{major}.{minor}.{build}"),
}
}
}
Expand Down Expand Up @@ -242,6 +257,6 @@ VERSION_ID=40
#[cfg(unix)]
assert!(matches!(os_release, OsRelease::Unix(_)));
#[cfg(windows)]
assert!(matches!(os_release, OsRelease::Windows(_)));
assert!(matches!(os_release, OsRelease::Windows { .. }));
}
}
Loading