Skip to content

fix compilation on uefi targets #1665

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 3 commits into from
Oct 22, 2025
+10 −1
Merged

fix compilation on uefi targets #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
855570b
fix compilation on uefi targets
usamoi Oct 7, 2025
23fe09b
add changelog
usamoi Oct 15, 2025
ad95b73
Merge branch 'master' into uefi
dhardy Oct 22, 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
1 change: 1 addition & 0 deletions rand_core/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
### API changes
- Relax `Sized` bound on impls of `SeedableRng` (#1641)
- Fix `OsError::raw_os_error` on UEFI targets by returning `Option<usize>` (#1665)
- Move `rand_core::impls::*` to `rand_core::le` module (#1667)
- Use Edition 2024 and MSRV 1.85 (#1668)
- Remove fn `TryRngCore::read_adapter(..) -> RngReadAdapter` (replaced with `rand::RngReader`) (#1669)
Expand Down
10 changes: 9 additions & 1 deletion rand_core/src/os.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ impl std::error::Error for OsError {
}
}

// If [`RawOsError`](https://doc.rust-lang.org/std/io/type.RawOsError.html) is stablized, we can use it.

#[cfg(not(target_os = "uefi"))]
type RawOsError = i32;

#[cfg(target_os = "uefi")]
type RawOsError = usize;

impl OsError {
/// Extract the raw OS error code (if this error came from the OS)
///
Expand All @@ -75,7 +83,7 @@ impl OsError {
///
/// [1]: https://doc.rust-lang.org/std/io/struct.Error.html#method.raw_os_error
#[inline]
pub fn raw_os_error(self) -> Option<i32> {
pub fn raw_os_error(self) -> Option<RawOsError> {
self.0.raw_os_error()
}
}
Expand Down