fix warnings

crdt-enc-gpgme/src/lib.rs

@@ -1,15 +1,9 @@
 use anyhow::{Context, Error, Result};
 use async_trait::async_trait;
-use crdt_enc::{
+use crdt_enc::{key_cryptor::Keys, utils::VersionBytes, CoreSubHandle, Info};
-    cryptor::Cryptor,
-    key_cryptor::Keys,
-    storage::Storage,
-    utils::{VersionBytes, VersionBytesRef},
-    CoreSubHandle, Info,
-};
 use crdts::{CmRDT, CvRDT, MVReg, Orswot};
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
-use std::{borrow::Cow, convert::Infallible, fmt::Debug, sync::Mutex as SyncMutex};
+use std::{convert::Infallible, fmt::Debug, sync::Mutex as SyncMutex};
 use uuid::Uuid;
 
 pub fn init() {

crdt-enc-sodium/src/lib.rs

@@ -1,12 +1,7 @@
 use anyhow::{Context, Error, Result};
 use async_trait::async_trait;
-use crdt_enc::{
+use crdt_enc::utils::{VersionBytes, VersionBytesRef};
-    key_cryptor::KeyCryptor,
+use serde::{Deserialize, Serialize};
-    storage::Storage,
-    utils::{VersionBytes, VersionBytesRef},
-};
-use crdts::{CmRDT, CvRDT};
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use sodiumoxide::crypto::secretbox;
 use std::{borrow::Cow, fmt::Debug};
 use uuid::Uuid;

crdt-enc-tokio/src/lib.rs

@@ -1,27 +1,21 @@
 use ::bytes::Buf;
 use anyhow::{ensure, Context, Error, Result};
 use async_trait::async_trait;
-use crdt_enc::{
+use crdt_enc::utils::{VersionBytes, VersionBytesRef};
-    cryptor::Cryptor,
-    key_cryptor::KeyCryptor,
-    utils::{VersionBytes, VersionBytesRef},
-};
-use crdts::{CmRDT, CvRDT};
 use futures::{
     future::{Either, TryFutureExt},
     stream::{self, Stream, StreamExt, TryStreamExt},
 };
-use serde::{de::DeserializeOwned, Serialize};
 use std::{
     convert::TryFrom,
-    fmt::{Debug, Write},
+    fmt::Debug,
     path::{Path, PathBuf},
     str::FromStr,
 };
 use tiny_keccak::{Hasher, Sha3};
 use tokio::{
     fs,
-    io::{self, AsyncWrite, AsyncWriteExt},
+    io::{self, AsyncWriteExt},
 };
 use tokio_stream::wrappers::ReadDirStream;
 use uuid::Uuid;
@@ -414,9 +408,10 @@ async fn write_content_addressible_file(
     let mut digest = Sha3::v256();
     let mut buf = bytes.buf();
     while buf.has_remaining() {
-        let b = buf.chunk();
+        let chunk = buf.chunk();
-        digest.update(b);
+        digest.update(chunk);
-        buf.advance(b.len());
+        let chunk_len = chunk.len();
+        buf.advance(chunk_len);
     }
     let mut digest_output = [0; 32];
     digest.finalize(&mut digest_output);

crdt-enc/src/cryptor.rs

@@ -1,12 +1,11 @@
 use crate::{
     utils::{VersionBytes, VersionBytesRef},
-    CoreSubHandle, Info, KeyCryptor, Storage,
+    CoreSubHandle, Info,
 };
 use anyhow::Result;
 use async_trait::async_trait;
-use crdts::{CmRDT, CvRDT, MVReg};
+use crdts::MVReg;
-use serde::{de::DeserializeOwned, Serialize};
+use std::fmt::Debug;
-use std::{fmt::Debug, sync::Arc};
 use uuid::Uuid;
 
 #[async_trait]

crdt-enc/src/key_cryptor.rs

@@ -1,18 +1,17 @@
 use crate::{
     utils::{VersionBytes, VersionBytesRef},
-    CoreSubHandle, Cryptor, Info, Storage,
+    CoreSubHandle, Info,
 };
 use anyhow::Result;
 use async_trait::async_trait;
 use crdts::{CmRDT, CvRDT, MVReg, Orswot};
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use std::{
     borrow::Borrow,
     cmp::{Eq, Ord, Ordering, PartialEq},
     convert::Infallible,
     fmt::Debug,
     hash::{Hash, Hasher},
-    sync::Arc,
 };
 use uuid::Uuid;
 

crdt-enc/src/lib.rs

@@ -15,7 +15,6 @@ use async_trait::async_trait;
 use crdts::{CmRDT, CvRDT, MVReg, VClock};
 use dyn_clone::DynClone;
 use futures::{
-    future::BoxFuture,
     lock::Mutex as AsyncMutex,
     stream::{self, StreamExt, TryStreamExt},
 };

crdt-enc/src/storage.rs

@@ -1,9 +1,8 @@
-use crate::{utils::VersionBytes, CoreSubHandle, Cryptor, Info, KeyCryptor};
+use crate::{utils::VersionBytes, CoreSubHandle, Info};
 use anyhow::Result;
 use async_trait::async_trait;
-use crdts::{CmRDT, CvRDT, MVReg};
+use crdts::MVReg;
-use serde::{de::DeserializeOwned, Serialize};
+use std::fmt::Debug;
-use std::{fmt::Debug, sync::Arc};
 use uuid::Uuid;
 
 #[async_trait]

crdt-enc/src/utils.rs

@@ -14,7 +14,7 @@ impl CmRDT for EmptyCrdt {
 
     type Validation = Infallible;
 
-    fn validate_op(&self, op: &Self::Op) -> Result<(), Infallible> {
+    fn validate_op(&self, _op: &Self::Op) -> Result<(), Infallible> {
         Ok(())
     }
 

examples/test/src/main.rs

@@ -2,7 +2,6 @@ use anyhow::Result;
 use crdt_enc_gpgme::KeyHandler;
 use crdt_enc_sodium::EncHandler;
 use crdt_enc_tokio::Storage;
-use futures::future::FutureExt;
 use uuid::Uuid;
 
 const CURRENT_DATA_VERSION: Uuid = Uuid::from_u128(1u128);