ffi: fix clippy

Author: yukibtc

Makefile

@@ -2,6 +2,7 @@ precommit:
 	cargo fmt --all -- --config format_code_in_doc_comments=true
 	cargo clippy -p negentropy && cargo clippy -p negentropy --no-default-features
 	cargo test -p negentropy && cargo test -p negentropy --no-default-features
+	cargo build -p negentropy-ffi && cargo clippy -p negentropy-ffi && cargo test -p negentropy-ffi
 
 bench:
 	RUSTFLAGS='--cfg=bench' cargo +nightly bench -p negentropy

negentropy-ffi/src/bytes.rs

@@ -25,13 +25,13 @@ impl From<negentropy::Bytes> for Bytes {
 impl Bytes {
     pub fn new(bytes: Vec<u8>) -> Self {
         Self {
-            inner: negentropy::Bytes::new(bytes)
+            inner: negentropy::Bytes::new(bytes),
         }
     }
 
     pub fn from_hex(data: String) -> Result<Self> {
         Ok(Self {
-            inner: negentropy::Bytes::from_hex(data)?
+            inner: negentropy::Bytes::from_hex(data)?,
         })
     }
 
@@ -42,4 +42,4 @@ impl Bytes {
     pub fn as_bytes(&self) -> Vec<u8> {
         self.inner.as_bytes().to_vec()
     }
-}
+}

negentropy-ffi/src/error.rs

@@ -22,4 +22,4 @@ impl From<negentropy::Error> for NegentropyError {
     fn from(e: negentropy::Error) -> Self {
         Self::Generic { err: e.to_string() }
     }
-}
+}

negentropy-ffi/src/lib.rs

@@ -6,12 +6,12 @@ use std::sync::Arc;
 
 use parking_lot::RwLock;
 
-mod error;
 mod bytes;
+mod error;
 
-use self::error::Result;
 pub use self::bytes::Bytes;
 pub use self::error::NegentropyError;
+use self::error::Result;
 
 pub struct ReconcileWithIds {
     pub have_ids: Vec<Arc<Bytes>>,
@@ -26,7 +26,10 @@ pub struct Negentropy {
 impl Negentropy {
     pub fn new(id_size: u8, frame_size_limit: Option<u64>) -> Result<Self> {
         Ok(Self {
-            inner: RwLock::new(negentropy::Negentropy::new(id_size as usize, frame_size_limit)?)
+            inner: RwLock::new(negentropy::Negentropy::new(
+                id_size as usize,
+                frame_size_limit,
+            )?),
         })
     }
 
@@ -67,25 +70,24 @@ impl Negentropy {
 
     pub fn reconcile(&self, query: Arc<Bytes>) -> Result<Arc<Bytes>> {
         let mut negentropy = self.inner.write();
-        Ok(Arc::new(negentropy.reconcile(query.as_ref().deref())?.into()))
+        Ok(Arc::new(
+            negentropy.reconcile(query.as_ref().deref())?.into(),
+        ))
     }
 
-    pub fn reconcile_with_ids(
-        &self,
-        query: Arc<Bytes>,
-    ) -> Result<ReconcileWithIds> {
+    pub fn reconcile_with_ids(&self, query: Arc<Bytes>) -> Result<ReconcileWithIds> {
         let mut negentropy = self.inner.write();
         let mut have_ids: Vec<negentropy::Bytes> = Vec::new();
         let mut need_ids: Vec<negentropy::Bytes> = Vec::new();
-        let output: Option<negentropy::Bytes> = negentropy.reconcile_with_ids(query.as_ref().deref(), &mut have_ids, &mut need_ids)?;
-        Ok(ReconcileWithIds { 
-            have_ids: have_ids.into_iter().map(|id| Arc::new(id.into())).collect(), 
-            need_ids: need_ids.into_iter().map(|id| Arc::new(id.into())).collect(), 
-            output: output.map(|o| Arc::new(o.into()))
+        let output: Option<negentropy::Bytes> =
+            negentropy.reconcile_with_ids(query.as_ref().deref(), &mut have_ids, &mut need_ids)?;
+        Ok(ReconcileWithIds {
+            have_ids: have_ids.into_iter().map(|id| Arc::new(id.into())).collect(),
+            need_ids: need_ids.into_iter().map(|id| Arc::new(id.into())).collect(),
+            output: output.map(|o| Arc::new(o.into())),
         })
     }
 }
 
-
 // UDL
 uniffi::include_scaffolding!("negentropy");