-
Notifications
You must be signed in to change notification settings - Fork 18
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
Add optional zerocopy support #62
Draft
zebreus
wants to merge
4
commits into
meithecatte:master
Choose a base branch
from
zebreus:zerocopy-support
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||||||
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); | ||||||
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
|
||||||
} | ||||||
} | ||||||
} | ||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.