Skip to content

Use NonZeroU32::new_unchecked to convert wasi error #233

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
newpavlov merged 2 commits into from
Oct 15, 2021
Merged

Use NonZeroU32::new_unchecked to convert wasi error #233

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddd854a
Use `NonZeroU32::new_unchecked` to convert wasi error
Cyborus04 Oct 14, 2021
3a8c1bf
Consolidate `unsafe` blocks
Cyborus04 Oct 15, 2021
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
12 changes: 8 additions & 4 deletions src/wasi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ use core::num::NonZeroU32;
use wasi::random_get;

pub fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
unsafe { random_get(dest.as_mut_ptr(), dest.len()) }.map_err(|e: wasi::Error| {
// convert wasi's Error into getrandom's NonZeroU32 error
NonZeroU32::new(e.raw_error() as u32).unwrap().into()
})
unsafe {
Copy link
Copy Markdown
Contributor Author

@Cyborus04 Cyborus04 Oct 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had no idea unsafe blocks propagated into closures

random_get(dest.as_mut_ptr(), dest.len()).map_err(|e: wasi::Error| {
// convert wasi's Error into getrandom's NonZeroU32 error
// SAFETY: `wasi::Error` is `NonZeroU16` internally, so `e.raw_error()`
// will never return 0
NonZeroU32::new_unchecked(e.raw_error() as u32).into()
})
}
}
⚡