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

Added implementation of proptest::Arbitrary #51

Open
wants to merge 1 commit into
base: master
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
### Added
- Added `TryFrom` fallible conversion.
- Added implementation of `proptest::Arbitrary` (feature "proptest-support").
### Changed
- Made `new` a `const fn`
### Deprecated
Expand Down
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@ categories = ["embedded", "no-std", "data-structures"]


[dependencies]
proptest = { version = "1", optional = true, default-features = false, features = ["std"] }


[features]
default = []
# This is a no-op feature only provided for compatibility in case it is
# explicitly selected by a user. This crate works without explicit indication
# both on std and no_std systems.
std = []
proptest-support = [ "proptest" ]
3 changes: 3 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ mod lib {

mod conversion;

#[cfg(feature = "proptest-support")]
mod proptest;

use lib::core::ops::{
BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Not, Shl, ShlAssign, Shr,
ShrAssign,
Expand Down
76 changes: 76 additions & 0 deletions src/proptest.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
//! Implementing `Arbitrary` trait from crate `proptest` for the u* and s* types.
//! This allows them to be easily used as inputs in `proptest` propery based tests.
//!
//! The arbitrary selection strategy is adapted using `proptest`'s range strategy,
//! with range from minimum value to the maximum value.

use crate::*;
use ::proptest::arbitrary::Arbitrary;
use ::proptest::strategy::{Strategy, BoxedStrategy};

macro_rules! implement_arbitrary {
([$($name:ident),+], $type:ident) => {$(implement_arbitrary!($name, $type);)+};
($name:ident, $type:ident) => {
impl Arbitrary for $name {
type Parameters = ();
type Strategy = BoxedStrategy<Self>;

fn arbitrary_with(_args: ()) -> BoxedStrategy<Self> {
let range = $type::from(Self::MIN)..=$type::from(Self::MAX);
range.prop_map(
|x| Self::try_from(x).expect(
"Value should be in range due to the interval we're choosing from"
)
).boxed()
}
}
}
}


implement_arbitrary!([u1, u2, u3, u4, u5, u6, u7], u8);
implement_arbitrary!([u9, u10, u11, u12, u13, u14, u15], u16);
implement_arbitrary!(
[
u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31
],
u32
);
implement_arbitrary!(
[
u33, u34, u35, u36, u37, u38, u39, u40, u41, u42, u43, u44, u45, u46, u47,
u48, u49, u50, u51, u52, u53, u54, u55, u56, u57, u58, u59, u60, u61, u62,
u63
],
u64
);

implement_arbitrary!([i2, i3, i4, i5, i6, i7], i8);
implement_arbitrary!([i9, i10, i11, i12, i13, i14, i15], i16);
implement_arbitrary!(
[
i17, i18, i19, i20, i21, i22, i23, i24, i25, i26, i27, i28, i29, i30, i31
],
i32
);
implement_arbitrary!(
[
i33, i34, i35, i36, i37, i38, i39, i40, i41, i42, i43, i44, i45, i46, i47,
i48, i49, i50, i51, i52, i53, i54, i55, i56, i57, i58, i59, i60, i61, i62,
i63
],
i64
);
// Arbitrary implementations for i1, u65-u127 and i65-i127 are intentionally missing,
// because these are not supported for conversions.

#[cfg(test)]
mod tests {
use super::*;
use ::proptest::prelude::*;

proptest!{
#[test]
fn u7_doesnt_panic(_ in any::<u7>()) {}
}
}