Merge branch 'master' into rm-to-string-as

Author: robjtede

Cargo.lock

@@ -20,10 +20,11 @@ arbitrary = ["dep:arbitrary"]
 serde = ["dep:serde"]
 
 [dependencies]
-arbitrary = { version = "1", features = ["derive"], optional = true }
+arbitrary = { version = "1", optional = true }
 serde = { version = "1", optional = true }
 
 [dev-dependencies]
+quickcheck = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 toml = "0.8"

Cargo.toml

@@ -0,0 +1,13 @@
+use arbitrary::{Arbitrary, Unstructured};
+
+use crate::ByteSize;
+
+impl Arbitrary<'_> for ByteSize {
+    fn arbitrary(u: &mut Unstructured<'_>) -> arbitrary::Result<Self> {
+        Ok(ByteSize(u64::arbitrary(u)?))
+    }
+
+    fn size_hint(depth: usize) -> (usize, Option<usize>) {
+        u64::size_hint(depth)
+    }
+}

src/arbitrary.rs

@@ -39,6 +39,8 @@
 //! assert_eq!(ByteSize::gb(996), minus);
 //! ```
 
+#[cfg(feature = "arbitrary")]
+mod arbitrary;
 mod parse;
 #[cfg(feature = "serde")]
 mod serde;
@@ -135,7 +137,6 @@ pub fn pib<V: Into<u64>>(size: V) -> u64 {
 
 /// Byte size representation
 #[derive(Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Default)]
-#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 pub struct ByteSize(pub u64);
 
 impl ByteSize {
@@ -369,6 +370,37 @@ where
     }
 }
 
+#[cfg(test)]
+mod property_tests {
+    use super::*;
+
+    impl quickcheck::Arbitrary for ByteSize {
+        fn arbitrary(g: &mut quickcheck::Gen) -> Self {
+            Self(u64::arbitrary(g))
+        }
+    }
+
+    quickcheck::quickcheck! {
+        fn parsing_never_panics(size: String) -> bool {
+            let _ = size.parse::<ByteSize>();
+            true
+        }
+
+        fn to_string_never_blank(size: ByteSize) -> bool {
+            !size.to_string().is_empty()
+        }
+
+        fn to_string_never_large(size: ByteSize) -> bool {
+            size.to_string().len() < 11
+        }
+
+        // // currently fails on input like "14.0 EiB"
+        // fn string_round_trip(size: ByteSize) -> bool {
+        //     size.to_string().parse::<ByteSize>().unwrap() == size
+        // }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;