Merge branch 'waywardmonkeys/update-bitflags-dep' (#349)

* waywardmonkeys/update-bitflags-dep: deps: Update bitflags to v2
proptest-rs · Jul 29, 2023 · 17ad16e · 17ad16e
2 parents c289085 + 06fbba2
commit 17ad16e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/proptest/Cargo.toml b/proptest/Cargo.toml
@@ -57,7 +57,7 @@ atomic64bit = []
 break-dead-code = []
 
 [dependencies]
-bitflags = "1.0.1"
+bitflags = "2"
 unarray = "0.1.4"
 
 # [dependencies.hashmap_core]

diff --git a/proptest/src/num.rs b/proptest/src/num.rs
@@ -362,6 +362,7 @@ unsigned_integer_bin_search!(u128);
 unsigned_integer_bin_search!(usize);
 
 bitflags! {
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub(crate) struct FloatTypes: u32 {
         const POSITIVE          = 0b0000_0001;
         const NEGATIVE          = 0b0000_0010;
@@ -372,13 +373,13 @@ bitflags! {
         const QUIET_NAN         = 0b0100_0000;
         const SIGNALING_NAN     = 0b1000_0000;
         const ANY =
-            Self::POSITIVE.bits |
-            Self::NEGATIVE.bits |
-            Self::NORMAL.bits |
-            Self::SUBNORMAL.bits |
-            Self::ZERO.bits |
-            Self::INFINITE.bits |
-            Self::QUIET_NAN.bits;
+            Self::POSITIVE.bits() |
+            Self::NEGATIVE.bits() |
+            Self::NORMAL.bits() |
+            Self::SUBNORMAL.bits() |
+            Self::ZERO.bits() |
+            Self::INFINITE.bits() |
+            Self::QUIET_NAN.bits();
     }
 }