Fix clippy warnings (#275)

src/driver/crypto.rs

@@ -581,7 +581,7 @@ mod test {
 
         // If there is no mutual intelligibility, return an error.
         let bad_modes = ["not_real", "des", "rc5"];
-        assert!(CryptoMode::negotiate(&bad_modes, None).is_err());
+        assert!(CryptoMode::negotiate(bad_modes, None).is_err());
-        assert!(CryptoMode::negotiate(&bad_modes, Some(CryptoMode::Aes256Gcm)).is_err());
+        assert!(CryptoMode::negotiate(bad_modes, Some(CryptoMode::Aes256Gcm)).is_err());
     }
 }

src/driver/tasks/mixer/mix_logic.rs

@@ -246,7 +246,7 @@ pub fn mix_symph_indiv(
                     resample_in_progress = true;
                     continue;
                 }
-            };
+            }
 
             let samples_marched = mix_resampled(rs_out_buf, symph_mix, samples_written, volume);
 

src/driver/tasks/mixer/mod.rs

@@ -679,12 +679,11 @@ impl Mixer {
 
             Ok(())
         } else {
-            self._send_packet(packet)
+            self.send_packet_(packet)
         };
 
         #[cfg(not(test))]
-        #[allow(clippy::used_underscore_items)]
+        let send_status = self.send_packet_(packet);
-        let send_status = self._send_packet(packet);
 
         send_status.or_else(Error::disarm_would_block)?;
 
@@ -692,7 +691,7 @@ impl Mixer {
     }
 
     #[inline]
-    fn _send_packet(&self, packet: &[u8]) -> Result<()> {
+    fn send_packet_(&self, packet: &[u8]) -> Result<()> {
         let conn = self
             .conn_active
             .as_ref()

src/input/adapters/cached/compressed.rs

@@ -434,7 +434,7 @@ where
                         },
                         Err(e) => {
                             debug!("Read error {:?} {:?} {:?}.", e, out, raw_len);
-                            out = Some(Err(IoError::new(IoErrorKind::Other, e)));
+                            out = Some(Err(IoError::other(e)));
                             break;
                         },
                     }
@@ -472,7 +472,7 @@ where
 
         // NOTE: use of raw_len here preserves true sample length even if
         // stream is extended to 20ms boundary.
-        out.unwrap_or_else(|| Err(IoError::new(IoErrorKind::Other, "Unclear.")))
+        out.unwrap_or_else(|| Err(IoError::other("Unclear.")))
             .map(|compressed_sz| {
                 self.audio_bytes
                     .fetch_add(raw_len * mem::size_of::<f32>(), Ordering::Release);

src/input/sources/http.rs

@@ -132,8 +132,7 @@ impl HttpRequest {
                 });
 
             let stream = Box::new(StreamReader::new(
-                resp.bytes_stream()
+                resp.bytes_stream().map_err(IoError::other),
-                    .map_err(|e| IoError::new(IoErrorKind::Other, e)),
             ));
 
             let input = HttpStream {

src/lib.rs

@@ -77,6 +77,9 @@
     clippy::missing_panics_doc,
     clippy::doc_link_with_quotes,
     clippy::doc_markdown,
+    // Allowed as they cannot be fixed without breaking
+    clippy::result_large_err,
+    clippy::large_enum_variant,
 )]
 
 mod config;