chore: cargo fmt

Author: ovr

src/bridge.rs

@@ -24,7 +24,9 @@ pub(crate) mod ffi {
         pub(crate) type OpaqueCpcSketch;
 
         pub(crate) fn new_opaque_cpc_sketch() -> UniquePtr<OpaqueCpcSketch>;
-        pub(crate) fn deserialize_opaque_cpc_sketch(buf: &[u8]) -> Result<UniquePtr<OpaqueCpcSketch>>;
+        pub(crate) fn deserialize_opaque_cpc_sketch(
+            buf: &[u8],
+        ) -> Result<UniquePtr<OpaqueCpcSketch>>;
         pub(crate) fn estimate(self: &OpaqueCpcSketch) -> f64;
         pub(crate) fn update(self: Pin<&mut OpaqueCpcSketch>, buf: &[u8]);
         pub(crate) fn update_u64(self: Pin<&mut OpaqueCpcSketch>, value: u64);
@@ -81,16 +83,17 @@ pub(crate) mod ffi {
 
         pub(crate) type OpaqueHhSketch;
 
-        pub(crate) fn new_opaque_hh_sketch(lg2_k: u8, hashset_addr: usize) -> UniquePtr<OpaqueHhSketch>;
+        pub(crate) fn new_opaque_hh_sketch(
+            lg2_k: u8,
+            hashset_addr: usize,
+        ) -> UniquePtr<OpaqueHhSketch>;
         pub(crate) fn estimate_no_fp(
             self: &OpaqueHhSketch,
         ) -> UniquePtr<CxxVector<ThinHeavyHitterRow>>;
         pub(crate) fn estimate_no_fn(
             self: &OpaqueHhSketch,
         ) -> UniquePtr<CxxVector<ThinHeavyHitterRow>>;
-        pub(crate) fn state(
-            self: &OpaqueHhSketch,
-        ) -> UniquePtr<CxxVector<ThinHeavyHitterRow>>;
+        pub(crate) fn state(self: &OpaqueHhSketch) -> UniquePtr<CxxVector<ThinHeavyHitterRow>>;
         pub(crate) fn update(self: Pin<&mut OpaqueHhSketch>, value: usize, weight: u64);
         pub(crate) fn set_weights(self: Pin<&mut OpaqueHhSketch>, total_weight: u64, weight: u64);
         pub(crate) fn get_total_weight(self: &OpaqueHhSketch) -> u64;

src/counters.rs

@@ -150,29 +150,30 @@ impl KeyedMerger {
 
 pub struct HeavyHitter {
     sketch: HhSketch,
-    k: u64
+    k: u64,
 }
 
 // https://users.rust-lang.org/t/logarithm-of-integers/8506/5
 
 fn log2_floor(x: u64) -> usize {
-    const fn num_bits<T>() -> usize { std::mem::size_of::<T>() * 8 }
+    const fn num_bits<T>() -> usize {
+        std::mem::size_of::<T>() * 8
+    }
     assert!(x > 0);
     num_bits::<u64>() - x.leading_zeros() as usize - 1
 }
 
 impl HeavyHitter {
-
     /// Creates a new heavy hitter sketch targeting elements in the top-k
     /// by reserving O(k) space.
-    pub fn new( k: u64) -> Self {
+    pub fn new(k: u64) -> Self {
         let lg2_k_with_room = log2_floor(k as u64).max(1) + 2;
         Self {
             sketch: HhSketch::new(lg2_k_with_room.try_into().unwrap()),
-            k
+            k,
         }
     }
-    
+
     /// Serializes to base64 string with no newlines or `=` padding.
     pub fn serialize(&self) -> String {
         unimplemented!()
@@ -187,8 +188,7 @@ impl HeavyHitter {
     pub fn estimate(&self) -> impl Iterator<Item = (&[u8], u64)> {
         let mut v = self.sketch.estimate_no_fn();
         v.sort_by_key(|row| row.ub);
-        v
-            .into_iter()
+        v.into_iter()
             .rev()
             .take(self.k as usize)
             .map(|row| (row.key, row.ub))

src/error.rs

@@ -10,7 +10,9 @@ impl Display for DataSketchesError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
             DataSketchesError::CXXError(err) => f.write_fmt(format_args!("Error: {}", err)),
-            DataSketchesError::DecodeError(err) => f.write_fmt(format_args!("DecodeError: {}", err))
+            DataSketchesError::DecodeError(err) => {
+                f.write_fmt(format_args!("DecodeError: {}", err))
+            }
         }
     }
 }

src/lib.rs

@@ -1,16 +1,16 @@
 //! `dsrs` contains bindings for a subset of [Apache DataSketches](https://github.com/apache/datasketches-cpp).
 
-mod error;
 mod bridge;
 pub mod counters;
+mod error;
 pub mod stream_reducer;
 mod wrapper;
 
+pub use error::DataSketchesError;
 pub use wrapper::CpcSketch;
 pub use wrapper::CpcUnion;
 pub use wrapper::HhSketch;
 pub use wrapper::StaticThetaSketch;
 pub use wrapper::ThetaIntersection;
 pub use wrapper::ThetaSketch;
 pub use wrapper::ThetaUnion;
-pub use error::DataSketchesError;

src/main.rs

@@ -141,14 +141,13 @@ fn main() {
         assert!(!opt.raw, "--raw and --hh cannot be set simultaneously");
         assert!(!opt.merge, "--merge and --hh cannot be set simultaneously");
         if k == 0 {
-            return
+            return;
         }
-        let reduced =
-            reduce_stream(io::stdin().lock(), HeavyHitter::new(k)).expect("no io error");
+        let reduced = reduce_stream(io::stdin().lock(), HeavyHitter::new(k)).expect("no io error");
         for (line, count) in reduced.estimate() {
             println!("{} {}", count, str::from_utf8(line).expect("valid UTF-8"));
         }
-        return
+        return;
     }
 
     match (opt.key, opt.merge) {
@@ -221,10 +220,12 @@ mod tests {
             .success()
             .get_output()
             .clone();
-        assert!(out.stderr.is_empty(), "stderr {}",
-                str::from_utf8(&out.stderr).expect("valid UTF-8"));
-        out
-            .stdout
+        assert!(
+            out.stderr.is_empty(),
+            "stderr {}",
+            str::from_utf8(&out.stderr).expect("valid UTF-8")
+        );
+        out.stdout
     }
 
     fn eval_bash(cmd: &str) -> Vec<u8> {
@@ -233,8 +234,11 @@ mod tests {
             .arg(cmd)
             .output()
             .expect("datagen process successful");
-        assert!(out.stderr.is_empty(), "{}",
-                str::from_utf8(&out.stderr).unwrap());
+        assert!(
+            out.stderr.is_empty(),
+            "{}",
+            str::from_utf8(&out.stderr).unwrap()
+        );
         out.stdout
     }
 
@@ -392,14 +396,17 @@ mod tests {
     }
 
     fn unix_hh(k: usize) -> String {
-        format!("sort | uniq -c | sort -rn | head -{} | sed 's/^ *//' | sort", k)
+        format!(
+            "sort | uniq -c | sort -rn | head -{} | sed 's/^ *//' | sort",
+            k
+        )
     }
 
     fn validate_unix_hh(datagen: &str, k: usize) {
         let unix = unix_hh(k);
         let kstr = format!("{}", k);
         let dsrs = &["--hh", &kstr];
-        validate_equal_cmd(datagen, dsrs, &unix);        
+        validate_equal_cmd(datagen, dsrs, &unix);
     }
 
     #[test]

src/wrapper/cpc.rs

@@ -198,6 +198,9 @@ mod tests {
 
     #[test]
     fn cpc_deserialization_error() {
-        assert!(matches!(CpcSketch::deserialize(&[9, 9, 9, 9]), Err(DataSketchesError::CXXError(_))));
+        assert!(matches!(
+            CpcSketch::deserialize(&[9, 9, 9, 9]),
+            Err(DataSketchesError::CXXError(_))
+        ));
     }
 }