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

Document bias and entropy-exhausted behavior #184

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 4 additions & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ pub enum Error {
EmptyChoose,
/// There was not enough underlying data to fulfill some request for raw
/// bytes.
///
/// Note that outside of [`Unstructured::bytes`][crate::Unstructured::bytes],
/// most APIs do *not* return this error when running out of underlying arbitrary bytes
/// but silently return some default value instead.
NotEnoughData,
/// The input bytes were not of the right format
IncorrectFormat,
Expand Down
27 changes: 27 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ impl<'a> Arbitrary<'a> for () {
}
}

/// Returns false, not an error, if this `Unstructured` [is empty][Unstructured::is_empty].
impl<'a> Arbitrary<'a> for bool {
fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
Ok(<u8 as Arbitrary<'a>>::arbitrary(u)? & 1 == 1)
Expand All @@ -335,6 +336,8 @@ impl<'a> Arbitrary<'a> for bool {
macro_rules! impl_arbitrary_for_integers {
( $( $ty:ty; )* ) => {
$(
/// Returns zero, not an error,
/// if this `Unstructured` [is empty][Unstructured::is_empty].
impl<'a> Arbitrary<'a> for $ty {
fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
let mut buf = [0; mem::size_of::<$ty>()];
Expand Down Expand Up @@ -369,6 +372,7 @@ impl_arbitrary_for_integers! {
// Note: We forward Arbitrary for i/usize to i/u64 in order to simplify corpus
// compatibility between 32-bit and 64-bit builds. This introduces dead space in
// 32-bit builds but keeps the input layout independent of the build platform.
/// Returns zero, not an error, if this `Unstructured` [is empty][Unstructured::is_empty].
impl<'a> Arbitrary<'a> for usize {
fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
u.arbitrary::<u64>().map(|x| x as usize)
Expand All @@ -380,6 +384,7 @@ impl<'a> Arbitrary<'a> for usize {
}
}

/// Returns zero, not an error, if this `Unstructured` [is empty][Unstructured::is_empty].
impl<'a> Arbitrary<'a> for isize {
fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
u.arbitrary::<i64>().map(|x| x as isize)
Expand All @@ -394,6 +399,8 @@ impl<'a> Arbitrary<'a> for isize {
macro_rules! impl_arbitrary_for_floats {
( $( $ty:ident : $unsigned:ty; )* ) => {
$(
/// Returns zero, not an error,
/// if this `Unstructured` [is empty][Unstructured::is_empty].
impl<'a> Arbitrary<'a> for $ty {
fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
Ok(Self::from_bits(<$unsigned as Arbitrary<'a>>::arbitrary(u)?))
Expand All @@ -413,6 +420,7 @@ impl_arbitrary_for_floats! {
f64: u64;
}

/// Returns '\0', not an error, if this `Unstructured` [is empty][Unstructured::is_empty].
impl<'a> Arbitrary<'a> for char {
fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
use std::char;
Expand All @@ -437,6 +445,7 @@ impl<'a> Arbitrary<'a> for char {
}
}

/// Returns false, not an error, if this `Unstructured` [is empty][Unstructured::is_empty].
impl<'a> Arbitrary<'a> for AtomicBool {
fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
Arbitrary::arbitrary(u).map(Self::new)
Expand All @@ -448,6 +457,7 @@ impl<'a> Arbitrary<'a> for AtomicBool {
}
}

/// Returns zero, not an error, if this `Unstructured` [is empty][Unstructured::is_empty].
impl<'a> Arbitrary<'a> for AtomicIsize {
fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
Arbitrary::arbitrary(u).map(Self::new)
Expand All @@ -459,6 +469,7 @@ impl<'a> Arbitrary<'a> for AtomicIsize {
}
}

/// Returns zero, not an error, if this `Unstructured` [is empty][Unstructured::is_empty].
impl<'a> Arbitrary<'a> for AtomicUsize {
fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
Arbitrary::arbitrary(u).map(Self::new)
Expand Down Expand Up @@ -559,6 +570,7 @@ where
cb(bound)
}

/// Returns zero, not an error, if this `Unstructured` [is empty][Unstructured::is_empty].
impl<'a> Arbitrary<'a> for Duration {
fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
Ok(Self::new(
Expand All @@ -576,6 +588,7 @@ impl<'a> Arbitrary<'a> for Duration {
}
}

/// Returns `None`, not an error, if this `Unstructured` [is empty][Unstructured::is_empty].
impl<'a, A: Arbitrary<'a>> Arbitrary<'a> for Option<A> {
fn arbitrary(u: &mut Unstructured<'a>) -> Result<Self> {
Ok(if <bool as Arbitrary<'a>>::arbitrary(u)? {
Expand Down Expand Up @@ -1621,6 +1634,20 @@ mod test {
);
assert_eq!((1, None), <(u8, Vec<u8>) as Arbitrary>::size_hint(0));
}

#[test]
fn exhausted_entropy() {
let mut u = Unstructured::new(&[]);
assert_eq!(u.arbitrary::<bool>().unwrap(), false);
assert_eq!(u.arbitrary::<u8>().unwrap(), 0);
assert_eq!(u.arbitrary::<usize>().unwrap(), 0);
assert_eq!(u.arbitrary::<f32>().unwrap(), 0.0);
assert_eq!(u.arbitrary::<f64>().unwrap(), 0.0);
assert_eq!(u.arbitrary::<Option<u32>>().unwrap(), None);
assert_eq!(u.int_in_range(4..=100).unwrap(), 4);
assert_eq!(u.choose_index(10).unwrap(), 0);
assert_eq!(u.ratio(5, 7).unwrap(), true);
}
}

/// Multiple conflicting arbitrary attributes are used on the same field:
Expand Down
31 changes: 25 additions & 6 deletions src/unstructured.rs
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,11 @@ impl<'a> Unstructured<'a> {
/// Do not use this to generate the size of a collection. Use
/// `arbitrary_len` instead.
///
/// The probability distribution of the return value is not necessarily uniform.
///
/// Returns `range.start()`, not an error,
/// if this `Unstructured` [is empty][Unstructured::is_empty].
///
/// # Panics
///
/// Panics if `range.start > range.end`. That is, the given range must be
Expand Down Expand Up @@ -376,8 +381,12 @@ impl<'a> Unstructured<'a> {
///
/// This should only be used inside of `Arbitrary` implementations.
///
/// Returns an error if there is not enough underlying data to make a
/// choice or if no choices are provided.
/// The probability distribution of choices is not necessarily uniform.
///
/// Returns the first choice, not an error,
/// if this `Unstructured` [is empty][Unstructured::is_empty].
///
/// Returns an error if no choices are provided.
///
/// # Examples
///
Expand Down Expand Up @@ -415,8 +424,12 @@ impl<'a> Unstructured<'a> {
///
/// This should only be used inside of `Arbitrary` implementations.
///
/// Returns an error if there is not enough underlying data to make a
/// choice or if no choices are provided.
/// The probability distribution of choices is not necessarily uniform.
///
/// Returns the first choice, not an error,
/// if this `Unstructured` [is empty][Unstructured::is_empty].
///
/// Returns an error if no choices are provided.
///
/// # Examples
///
Expand Down Expand Up @@ -448,6 +461,10 @@ impl<'a> Unstructured<'a> {

/// Choose a value in `0..len`.
///
/// The probability distribution of return values is not necessarily uniform.
///
/// Returns zero, not an error, if this `Unstructured` [is empty][Unstructured::is_empty].
///
/// Returns an error if the `len` is zero.
///
/// # Examples
Expand Down Expand Up @@ -491,7 +508,9 @@ impl<'a> Unstructured<'a> {
Ok(idx)
}

/// Generate a boolean according to the given ratio.
/// Generate a boolean which is true with probability approximately the given ratio.
///
/// Returns true, not an error, if this `Unstructured` [is empty][Unstructured::is_empty].
///
/// # Panics
///
Expand All @@ -511,7 +530,7 @@ impl<'a> Unstructured<'a> {
/// let mut u = Unstructured::new(&my_data);
///
/// if u.ratio(5, 7)? {
/// // Take this branch 5/7 of the time.
/// // Take this branch approximately 5/7 of the time.
/// }
/// # Ok(())
/// # }
Expand Down
Loading