Cargo fmt

Author: Roderick Bovee

src/bfield.rs

@@ -1,12 +1,11 @@
 use std::io;
 use std::path::Path;
 
-use serde::Serialize;
 use serde::de::DeserializeOwned;
+use serde::Serialize;
 
 use crate::bfield_member::{BFieldLookup, BFieldMember, BFieldVal};
-use crate::marker::{to_marker};
-
+use crate::marker::to_marker;
 
 pub struct BField<T> {
     members: Vec<BFieldMember<T>>,
@@ -19,9 +18,9 @@ impl<'a, T: Clone + DeserializeOwned + Serialize> BField<T> {
     pub fn create<P>(
         filename: P,
         size: usize,
-        n_hashes: u8, // k
-        marker_width: u8, // nu
-        n_marker_bits: u8, // kappa
+        n_hashes: u8,             // k
+        marker_width: u8,         // nu
+        n_marker_bits: u8,        // kappa
         secondary_scaledown: f64, // beta
         max_scaledown: f64,
         n_secondaries: u8,
@@ -43,8 +42,14 @@ impl<'a, T: Clone + DeserializeOwned + Serialize> BField<T> {
             } else {
                 None
             };
-            let member =
-                BFieldMember::create(file, cur_size, n_hashes, marker_width, n_marker_bits, params)?;
+            let member = BFieldMember::create(
+                file,
+                cur_size,
+                n_hashes,
+                marker_width,
+                n_marker_bits,
+                params,
+            )?;
             members.push(member);
             cur_size = f64::max(
                 cur_size as f64 * secondary_scaledown,
@@ -84,13 +89,10 @@ impl<'a, T: Clone + DeserializeOwned + Serialize> BField<T> {
         if members.is_empty() {
             return Err(io::Error::new(
                 io::ErrorKind::NotFound,
-                format!("No Bfield found at {:?}", filename.as_ref())
+                format!("No Bfield found at {:?}", filename.as_ref()),
             ));
         }
-        Ok(BField {
-            members,
-            read_only,
-        })
+        Ok(BField { members, read_only })
     }
 
     #[cfg(feature = "legacy")]
@@ -178,9 +180,7 @@ impl<'a, T: Clone + DeserializeOwned + Serialize> BField<T> {
     }
 
     pub fn info(&self) -> Vec<(usize, u8, u8, u8)> {
-        self.members.iter().map(|m| {
-            m.info()
-        }).collect()
+        self.members.iter().map(|m| m.info()).collect()
     }
 }
 

src/bfield_member.rs

@@ -6,21 +6,20 @@ use std::intrinsics;
 use std::io;
 use std::path::Path;
 
-use bincode::{serialize, deserialize, Infinite};
-use mmap_bitvec::{BitVector, MmapBitVec, BitVecSlice};
+use bincode::{deserialize, serialize, Infinite};
+use mmap_bitvec::{BitVecSlice, BitVector, MmapBitVec};
 use murmurhash3::murmurhash3_x64_128;
-use serde::Serialize;
 use serde::de::DeserializeOwned;
+use serde::Serialize;
 #[cfg(feature = "legacy")]
 use serde_json;
 
 use crate::marker::{from_marker, to_marker};
 
-
 #[derive(Debug, Deserialize, Serialize)]
 pub(crate) struct BFieldParams<T> {
-    n_hashes: u8, // k
-    marker_width: u8, // nu
+    n_hashes: u8,      // k
+    marker_width: u8,  // nu
     n_marker_bits: u8, // kappa
     pub(crate) other: Option<T>,
 }
@@ -148,10 +147,8 @@ impl<T: Clone + DeserializeOwned + Serialize> BFieldMember<T> {
 
         for marker_ix in 0usize..self.params.n_hashes as usize {
             let pos = marker_pos(hash, marker_ix, self.bitvec.size(), marker_width);
-            self.bitvec.set_range(
-                pos..pos + marker_width,
-                aligned_marker,
-            );
+            self.bitvec
+                .set_range(pos..pos + marker_width, aligned_marker);
         }
     }
 
@@ -168,7 +165,7 @@ impl<T: Clone + DeserializeOwned + Serialize> BFieldMember<T> {
         let existing_marker = self.get_raw(key, k);
 
         match existing_marker.count_ones().cmp(&k) {
-            Ordering::Greater => false,  // already indeterminate
+            Ordering::Greater => false, // already indeterminate
             Ordering::Equal => {
                 // value already in b-field, but is it correct?
                 if existing_marker == correct_marker {
@@ -186,12 +183,12 @@ impl<T: Clone + DeserializeOwned + Serialize> BFieldMember<T> {
                 // mask out the existing!
                 self.insert_raw(key, new_marker);
                 false
-            },
+            }
             Ordering::Less => {
                 // nothing present; insert the value
                 self.insert_raw(key, correct_marker);
                 true
-            },
+            }
         }
     }
 
@@ -211,7 +208,7 @@ impl<T: Clone + DeserializeOwned + Serialize> BFieldMember<T> {
         let marker_width = self.params.marker_width as usize;
         let hash = murmurhash3_x64_128(key, 0);
         let mut merged_marker = BitVecSlice::max_value();
-        let mut positions: [usize; 16] = [0; 16];  // support up to 16 hashes
+        let mut positions: [usize; 16] = [0; 16]; // support up to 16 hashes
         for marker_ix in 0usize..self.params.n_hashes as usize {
             let pos = marker_pos(hash, marker_ix, self.bitvec.size(), marker_width);
             positions[marker_ix] = pos;
@@ -229,7 +226,7 @@ impl<T: Clone + DeserializeOwned + Serialize> BFieldMember<T> {
 
         assert!(self.params.n_hashes <= 16);
         for pos in positions.iter().take(self.params.n_hashes as usize) {
-            let marker =  self.bitvec.get_range(*pos..*pos + marker_width);
+            let marker = self.bitvec.get_range(*pos..*pos + marker_width);
             merged_marker &= marker;
             if merged_marker.count_ones() < k {
                 return 0;
@@ -239,7 +236,12 @@ impl<T: Clone + DeserializeOwned + Serialize> BFieldMember<T> {
     }
 
     pub fn info(&self) -> (usize, u8, u8, u8) {
-        (self.bitvec.size(), self.params.n_hashes, self.params.marker_width, self.params.n_marker_bits)
+        (
+            self.bitvec.size(),
+            self.params.n_hashes,
+            self.params.marker_width,
+            self.params.n_marker_bits,
+        )
     }
 }
 
@@ -319,7 +321,7 @@ fn test_bfield_bits_set() {
     bfield.insert(b"test2", 200);
     assert_eq!(bfield.bitvec.rank(0..128), 16);
     bfield.insert(b"test3", 300);
-    assert!(bfield.bitvec.rank(0..128) < 24);  // 23 bits set
+    assert!(bfield.bitvec.rank(0..128) < 24); // 23 bits set
 }
 
 #[test]

src/marker.rs

@@ -42,7 +42,6 @@ pub fn to_marker(value: BFieldVal, k: u8) -> BitVecSlice {
     }
 }
 
-
 #[cfg(not(feature = "marker_lookup"))]
 pub fn to_marker(value: BFieldVal, k: u8) -> BitVecSlice {
     // set the appropriate number of bits in the marker
@@ -142,7 +141,6 @@ fn next_marker(marker: BitVecSlice) -> BitVecSlice {
     (t + 1) | (((!t & (t + 1)) - 1) >> (marker.trailing_zeros() + 1))
 }
 
-
 #[test]
 fn test_next_marker() {
     assert_eq!(next_marker(0b1), 0b10);