From b65297195a18146a1018cee6c91532d26753c7a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Sun, 5 Jul 2020 20:22:03 +0200
Subject: [PATCH] aquatic_http, aquatic_common_tcp: fix some clippy warnings

---
 aquatic_common_tcp/src/network/utils.rs   | 2 +-
 aquatic_http/src/lib/handler.rs           | 4 ++--
 aquatic_http/src/lib/lib.rs               | 7 ++-----
 aquatic_http/src/lib/protocol/response.rs | 4 ++--
 aquatic_http/src/lib/protocol/utils.rs    | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/aquatic_common_tcp/src/network/utils.rs b/aquatic_common_tcp/src/network/utils.rs
index fbfe32b..63a46fb 100644
--- a/aquatic_common_tcp/src/network/utils.rs
+++ b/aquatic_common_tcp/src/network/utils.rs
@@ -22,7 +22,7 @@ pub fn create_tls_acceptor(
             .context("Couldn't read pkcs12 identity file")?;
 
         let identity = Identity::from_pkcs12(
-            &mut identity_bytes,
+            &identity_bytes[..],
             &config.tls_pkcs12_password
         ).context("Couldn't parse pkcs12 identity file")?;
 
diff --git a/aquatic_http/src/lib/handler.rs b/aquatic_http/src/lib/handler.rs
index e9e4e15..5c581ec 100644
--- a/aquatic_http/src/lib/handler.rs
+++ b/aquatic_http/src/lib/handler.rs
@@ -95,7 +95,7 @@ pub fn handle_announce_requests(
 ){
     let valid_until = ValidUntil::new(config.cleaning.max_peer_age);
 
-    responses.extend(requests.into_iter().map(|(request_sender_meta, request)| {
+    responses.extend(requests.map(|(request_sender_meta, request)| {
         let torrent_data: &mut TorrentData = if request_sender_meta.peer_addr.is_ipv4(){
             torrent_maps.ipv4.entry(request.info_hash).or_default()
         } else {
@@ -117,7 +117,7 @@ pub fn handle_announce_requests(
             };
 
             let ip_or_key = request.key
-                .map(|k| Either::Right(k))
+                .map(Either::Right)
                 .unwrap_or_else(||
                     Either::Left(request_sender_meta.peer_addr.ip())
                 );
diff --git a/aquatic_http/src/lib/lib.rs b/aquatic_http/src/lib/lib.rs
index 647cec3..d065c61 100644
--- a/aquatic_http/src/lib/lib.rs
+++ b/aquatic_http/src/lib/lib.rs
@@ -68,11 +68,8 @@ pub fn run(config: Config) -> anyhow::Result<()> {
 
         if let Some(statuses) = socket_worker_statuses.try_lock(){
             for opt_status in statuses.iter(){
-                match opt_status {
-                    Some(Err(err)) => {
-                        return Err(::anyhow::anyhow!(err.to_owned()));
-                    },
-                    _ => {},
+                if let Some(Err(err))  = opt_status {
+                    return Err(::anyhow::anyhow!(err.to_owned()));
                 }
             }
 
diff --git a/aquatic_http/src/lib/protocol/response.rs b/aquatic_http/src/lib/protocol/response.rs
index 023f089..dc4621d 100644
--- a/aquatic_http/src/lib/protocol/response.rs
+++ b/aquatic_http/src/lib/protocol/response.rs
@@ -71,8 +71,8 @@ pub enum Response {
 
 
 impl Response {
-    pub fn to_bytes(self) -> Vec<u8> {
-        match bendy::serde::to_bytes(&self){
+    pub fn to_bytes(&self) -> Vec<u8> {
+        match bendy::serde::to_bytes(self){
             Ok(bytes) => bytes,
             Err(err) => {
                 log::error!("error encoding response: {}", err);
diff --git a/aquatic_http/src/lib/protocol/utils.rs b/aquatic_http/src/lib/protocol/utils.rs
index a557c32..91e6e0f 100644
--- a/aquatic_http/src/lib/protocol/utils.rs
+++ b/aquatic_http/src/lib/protocol/utils.rs
@@ -43,7 +43,7 @@ pub fn serialize_20_bytes<S>(
 
 
 pub fn serialize_response_peers_compact<S>(
-    response_peers: &Vec<ResponsePeer>,
+    response_peers: &[ResponsePeer],
     serializer: S
 ) -> Result<S::Ok, S::Error> where S: Serializer {
     let mut bytes = Vec::with_capacity(response_peers.len() * 6);