Fixed bunch of clippy warnings (#427)

This commit is contained in:
Jędrzej Stuczyński
2020-11-10 15:28:55 +00:00
committed by GitHub
parent 7d694194ca
commit 69eefaf91f
43 changed files with 102 additions and 152 deletions
@@ -114,7 +114,7 @@ impl ClientsHandler {
// NOTE: THIS IGNORES MESSAGE RETRIEVAL LIMIT AND TAKES EVERYTHING!
let all_stored_messages = match self
.clients_inbox_storage
.retrieve_all_client_messages(client_address.clone())
.retrieve_all_client_messages(client_address)
.await
{
Ok(msgs) => msgs,
@@ -173,7 +173,7 @@ impl ClientsHandler {
if self
.clients_ledger
.insert_shared_key(derived_shared_key, address.clone())
.insert_shared_key(derived_shared_key, address)
.unwrap()
.is_some()
{
@@ -181,11 +181,7 @@ impl ClientsHandler {
"Client {:?} was already registered before!",
address.to_base58_string()
)
} else if let Err(e) = self
.clients_inbox_storage
.create_storage_dir(address.clone())
.await
{
} else if let Err(e) = self.clients_inbox_storage.create_storage_dir(address).await {
error!("We failed to create inbox directory for the client -{:?}\nReverting stored shared key...", e);
// we must revert our changes if this operation failed
self.clients_ledger.remove_shared_key(&address).unwrap();
@@ -54,10 +54,7 @@ enum SocketStream<S> {
impl<S> SocketStream<S> {
fn is_websocket(&self) -> bool {
match self {
SocketStream::UpgradedWebSocket(_) => true,
_ => false,
}
matches!(self, SocketStream::UpgradedWebSocket(_))
}
}
@@ -194,7 +191,7 @@ impl<S> Handle<S> {
// announced hence we do not need to send 'disconnect' message
if let Some(addr) = self.remote_address.as_ref() {
self.clients_handler_sender
.unbounded_send(ClientsHandlerRequest::Disconnect(addr.clone()))
.unbounded_send(ClientsHandlerRequest::Disconnect(*addr))
.unwrap();
}
}
@@ -254,7 +251,7 @@ impl<S> Handle<S> {
let (res_sender, res_receiver) = oneshot::channel();
let clients_handler_request = ClientsHandlerRequest::Authenticate(
address.clone(),
address,
encrypted_address,
iv,
mix_sender,
@@ -320,7 +317,7 @@ impl<S> Handle<S> {
let (res_sender, res_receiver) = oneshot::channel();
let clients_handler_request = ClientsHandlerRequest::Register(
remote_address.clone(),
remote_address,
derived_shared_key.clone(),
mix_sender,
res_sender,
@@ -70,7 +70,7 @@ impl ConnectionHandler {
let (k, v) = element_guard.pair();
// TODO: this will be made redundant once there's some cache invalidator mechanism here
if !v.is_closed() {
senders_cache.insert(k.clone(), v.clone());
senders_cache.insert(*k, v.clone());
}
}
@@ -131,8 +131,7 @@ impl ConnectionHandler {
// if we got here it means that either we have no sender channel for this client or it's closed
// so we must refresh it from the source, i.e. ClientsHandler
let (res_sender, res_receiver) = oneshot::channel();
let clients_handler_request =
ClientsHandlerRequest::IsOnline(client_address.clone(), res_sender);
let clients_handler_request = ClientsHandlerRequest::IsOnline(client_address, res_sender);
self.clients_handler_sender
.unbounded_send(clients_handler_request)
.unwrap(); // the receiver MUST BE alive