-
Notifications
You must be signed in to change notification settings - Fork 23
Add optional zerocopy support #62
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.
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
base: master
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -667,6 +667,33 @@ where | |||||
| unsafe { BitFlags::from_bits_unchecked(bits & T::ALL_BITS) } | ||||||
| } | ||||||
|
|
||||||
| /// Validate if an underlying bitwise value can safely be converted to `BitFlags`. | ||||||
| /// Returns false if any invalid bits are set. | ||||||
| /// | ||||||
| /// ``` | ||||||
| /// # use enumflags2::{bitflags, BitFlags}; | ||||||
| /// #[bitflags] | ||||||
| /// #[repr(u8)] | ||||||
| /// #[derive(Clone, Copy, PartialEq, Eq)] | ||||||
| /// enum MyFlag { | ||||||
| /// One = 0b0001, | ||||||
| /// Two = 0b0010, | ||||||
| /// Three = 0b1000, | ||||||
| /// } | ||||||
| /// | ||||||
| /// assert_eq!(BitFlags::<MyFlag>::validate_bits(0b1011), true); | ||||||
| /// assert_eq!(BitFlags::<MyFlag>::validate_bits(0b0000), true); | ||||||
| /// assert_eq!(BitFlags::<MyFlag>::validate_bits(0b0100), false); | ||||||
| /// assert_eq!(BitFlags::<MyFlag>::validate_bits(0b1111), false); | ||||||
| /// ``` | ||||||
| #[must_use] | ||||||
| #[inline(always)] | ||||||
| pub fn validate_bits(bits: T::Numeric) -> bool { | ||||||
| // SAFETY: We're truncating out all the invalid bits so it will | ||||||
| // only be different if there are invalid bits set. | ||||||
| (bits & T::ALL_BITS) == bits | ||||||
| } | ||||||
|
|
||||||
| /// Create a new BitFlags unsafely, without checking if the bits form | ||||||
| /// a valid bit pattern for the type. | ||||||
| /// | ||||||
|
|
@@ -1102,8 +1129,11 @@ mod impl_zerocopy { | |||||
| let my_candidate = | ||||||
| unsafe { candidate.assume_validity::<zerocopy::pointer::invariant::Valid>() }; | ||||||
| { | ||||||
| (my_candidate.read_unaligned::<zerocopy::pointer::BecauseImmutable>() ^ T::ALL_BITS) | ||||||
| == T::EMPTY | ||||||
| // TODO: Currently this assumes that the candidate is aligned. We actually need to check this beforehand | ||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not sure if this is something I would've caught. Do you have any links I could reference for example zerocopy implementations for similar types? |
||||||
| // Dereference the pointer to the candidate | ||||||
| let candidate = | ||||||
| my_candidate.read_unaligned::<zerocopy::pointer::BecauseImmutable>(); | ||||||
| return BitFlags::<T>::validate_bits(candidate); | ||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| } | ||||||
|
Comment on lines
1104
to
1149
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This bit manipulation looks suspicious. Please add tests that exercise this. Or, maybe something like |
||||||
| } | ||||||
| } | ||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Honestly, I'm not sure if this makes sense as a public API.