Skip to content
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
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
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
34 changes: 32 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Comment on lines +689 to +695
Copy link
Owner

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.


/// Create a new BitFlags unsafely, without checking if the bits form
/// a valid bit pattern for the type.
///
Expand Down Expand Up @@ -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
Copy link
Owner

Choose a reason for hiding this comment

The 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);
Copy link
Owner

Choose a reason for hiding this comment

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

Suggested change
return BitFlags::<T>::validate_bits(candidate);
BitFlags::<T>::validate_bits(candidate)

}
}
}
Expand Down