From a126104889b0f5d6d36cba7df1446ab2008a600b Mon Sep 17 00:00:00 2001 From: Thomas Heck Date: Sat, 13 Feb 2021 11:05:23 +0100 Subject: [PATCH] fix warnings --- crdt-enc-gpgme/src/lib.rs | 12 +++--------- crdt-enc-sodium/src/lib.rs | 9 ++------- crdt-enc-tokio/src/lib.rs | 19 +++++++------------ crdt-enc/src/cryptor.rs | 7 +++---- crdt-enc/src/key_cryptor.rs | 5 ++--- crdt-enc/src/lib.rs | 1 - crdt-enc/src/storage.rs | 7 +++---- crdt-enc/src/utils.rs | 2 +- examples/test/src/main.rs | 1 - 9 files changed, 21 insertions(+), 42 deletions(-) diff --git a/crdt-enc-gpgme/src/lib.rs b/crdt-enc-gpgme/src/lib.rs index 71529b3..18dc7ee 100644 --- a/crdt-enc-gpgme/src/lib.rs +++ b/crdt-enc-gpgme/src/lib.rs @@ -1,15 +1,9 @@ use anyhow::{Context, Error, Result}; use async_trait::async_trait; -use crdt_enc::{ - cryptor::Cryptor, - key_cryptor::Keys, - storage::Storage, - utils::{VersionBytes, VersionBytesRef}, - CoreSubHandle, Info, -}; +use crdt_enc::{key_cryptor::Keys, utils::VersionBytes, CoreSubHandle, Info}; use crdts::{CmRDT, CvRDT, MVReg, Orswot}; -use serde::{de::DeserializeOwned, Deserialize, Serialize}; -use std::{borrow::Cow, convert::Infallible, fmt::Debug, sync::Mutex as SyncMutex}; +use serde::{Deserialize, Serialize}; +use std::{convert::Infallible, fmt::Debug, sync::Mutex as SyncMutex}; use uuid::Uuid; pub fn init() { diff --git a/crdt-enc-sodium/src/lib.rs b/crdt-enc-sodium/src/lib.rs index 76c289e..f548304 100644 --- a/crdt-enc-sodium/src/lib.rs +++ b/crdt-enc-sodium/src/lib.rs @@ -1,12 +1,7 @@ use anyhow::{Context, Error, Result}; use async_trait::async_trait; -use crdt_enc::{ - key_cryptor::KeyCryptor, - storage::Storage, - utils::{VersionBytes, VersionBytesRef}, -}; -use crdts::{CmRDT, CvRDT}; -use serde::{de::DeserializeOwned, Deserialize, Serialize}; +use crdt_enc::utils::{VersionBytes, VersionBytesRef}; +use serde::{Deserialize, Serialize}; use sodiumoxide::crypto::secretbox; use std::{borrow::Cow, fmt::Debug}; use uuid::Uuid; diff --git a/crdt-enc-tokio/src/lib.rs b/crdt-enc-tokio/src/lib.rs index 837590b..1c4e9d9 100644 --- a/crdt-enc-tokio/src/lib.rs +++ b/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::{ - cryptor::Cryptor, - key_cryptor::KeyCryptor, - utils::{VersionBytes, VersionBytesRef}, -}; -use crdts::{CmRDT, CvRDT}; +use crdt_enc::utils::{VersionBytes, VersionBytesRef}; 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(); - digest.update(b); - buf.advance(b.len()); + let chunk = buf.chunk(); + digest.update(chunk); + let chunk_len = chunk.len(); + buf.advance(chunk_len); } let mut digest_output = [0; 32]; digest.finalize(&mut digest_output); diff --git a/crdt-enc/src/cryptor.rs b/crdt-enc/src/cryptor.rs index 7ec8d1b..c2f7f34 100644 --- a/crdt-enc/src/cryptor.rs +++ b/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 serde::{de::DeserializeOwned, Serialize}; -use std::{fmt::Debug, sync::Arc}; +use crdts::MVReg; +use std::fmt::Debug; use uuid::Uuid; #[async_trait] diff --git a/crdt-enc/src/key_cryptor.rs b/crdt-enc/src/key_cryptor.rs index 9a899b6..013ddd4 100644 --- a/crdt-enc/src/key_cryptor.rs +++ b/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; diff --git a/crdt-enc/src/lib.rs b/crdt-enc/src/lib.rs index 605a094..dfc987c 100644 --- a/crdt-enc/src/lib.rs +++ b/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}, }; diff --git a/crdt-enc/src/storage.rs b/crdt-enc/src/storage.rs index ef9436c..abafe30 100644 --- a/crdt-enc/src/storage.rs +++ b/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 serde::{de::DeserializeOwned, Serialize}; -use std::{fmt::Debug, sync::Arc}; +use crdts::MVReg; +use std::fmt::Debug; use uuid::Uuid; #[async_trait] diff --git a/crdt-enc/src/utils.rs b/crdt-enc/src/utils.rs index 3da10c2..de26cce 100644 --- a/crdt-enc/src/utils.rs +++ b/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(()) } diff --git a/examples/test/src/main.rs b/examples/test/src/main.rs index ca95c32..600d3c2 100644 --- a/examples/test/src/main.rs +++ b/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);