aquatic_ws: fix some clippy warnings

aquatic_ws/src/lib/handler.rs

@@ -198,25 +198,24 @@ pub fn handle_announce_requests(
         }
 
         // If peer sent answer, send it on to relevant peer
-        match (request.answer, request.to_peer_id, request.offer_id){
+        if let (Some(answer), Some(answer_receiver_id), Some(offer_id)) =
-            (Some(answer), Some(answer_receiver_id), Some(offer_id)) => {
+            (request.answer, request.to_peer_id, request.offer_id)
-                if let Some(answer_receiver) = torrent_data.peers
+        {
-                    .get(&answer_receiver_id)
+            if let Some(answer_receiver) = torrent_data.peers
-                {
+                .get(&answer_receiver_id)
-                    let middleman_answer = MiddlemanAnswerToPeer {
+            {
-                        peer_id: request.peer_id,
+                let middleman_answer = MiddlemanAnswerToPeer {
-                        info_hash: request.info_hash,
+                    peer_id: request.peer_id,
-                        answer,
+                    info_hash: request.info_hash,
-                        offer_id,
+                    answer,
-                    };
+                    offer_id,
+                };
 
-                    messages_out.push((
+                messages_out.push((
-                        answer_receiver.connection_meta,
+                    answer_receiver.connection_meta,
-                        OutMessage::Answer(middleman_answer)
+                    OutMessage::Answer(middleman_answer)
-                    ));
+                ));
-                }
+            }
-            },
-            _ => (),
         }
 
         let response = OutMessage::AnnounceResponse(AnnounceResponse {

aquatic_ws/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 {
+                if let Some(Err(err)) = opt_status {
-                    Some(Err(err)) => {
+                    return Err(::anyhow::anyhow!(err.to_owned()));
-                        return Err(::anyhow::anyhow!(err.to_owned()));
-                    },
-                    _ => {},
                 }
             }
 
@@ -126,7 +123,7 @@ pub fn create_tls_acceptor(
             .context("Couldn't read pkcs12 identity file")?;
 
         let identity = Identity::from_pkcs12(
-            &mut identity_bytes,
+            &identity_bytes,
             &config.network.tls_pkcs12_password
         ).context("Couldn't parse pkcs12 identity file")?;
 

aquatic_ws/src/lib/network/connection.rs

@@ -222,7 +222,7 @@ impl Connection {
     }
 
     #[inline]
-    pub fn get_established_ws<'a>(&mut self) -> Option<&mut EstablishedWs> {
+    pub fn get_established_ws(&mut self) -> Option<&mut EstablishedWs> {
         match self.inner {
             Either::Left(ref mut ews) => Some(ews),
             Either::Right(_) => None,