fix clippy warnings

picoHz · Jul 2, 2023 · b53ec95 · b53ec95
1 parent ec2613d
commit b53ec95
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/taxy/src/certs/mod.rs b/taxy/src/certs/mod.rs
@@ -138,7 +138,7 @@ impl Cert {
     ) -> Result<Self, Error> {
         let key = if let Some(pem_key) = &pem_key {
             let key_pem =
-                std::str::from_utf8(&pem_key).map_err(|_| Error::FailedToDecryptPrivateKey)?;
+                std::str::from_utf8(pem_key).map_err(|_| Error::FailedToDecryptPrivateKey)?;
             let (_, key) =
                 SecretDocument::from_pem(key_pem).map_err(|_| Error::FailedToDecryptPrivateKey)?;
             Some(key)

diff --git a/taxy/src/proxy/http/compression.rs b/taxy/src/proxy/http/compression.rs
@@ -93,20 +93,20 @@ mod test {
     use super::*;
     #[test]
     fn test_is_compressed() {
-        assert_eq!(is_compressed(b"text/html"), false);
-        assert_eq!(is_compressed(b"application/json"), false);
-        assert_eq!(is_compressed(b"image/svg+xml"), false);
-        assert_eq!(is_compressed(b"image/bmp"), false);
-        assert_eq!(is_compressed(b"image/png"), true);
-        assert_eq!(is_compressed(b"image/x-ms-bmp"), false);
-        assert_eq!(is_compressed(b"audio/mp3"), true);
-        assert_eq!(is_compressed(b"audio/wav"), false);
-        assert_eq!(is_compressed(b"audio/x-wav"), false);
-        assert_eq!(is_compressed(b"audio/midi"), false);
-        assert_eq!(is_compressed(b"audio/x-midi"), false);
-        assert_eq!(is_compressed(b"video/webm"), true);
-        assert_eq!(is_compressed(b"application/x-bzip"), true);
-        assert_eq!(is_compressed(b"application/x-bzip2"), true);
-        assert_eq!(is_compressed(b"application/gzip"), true);
+        assert!(!is_compressed(b"text/html"));
+        assert!(!is_compressed(b"application/json"));
+        assert!(!is_compressed(b"image/svg+xml"));
+        assert!(!is_compressed(b"image/bmp"));
+        assert!(is_compressed(b"image/png"));
+        assert!(!is_compressed(b"image/x-ms-bmp"));
+        assert!(is_compressed(b"audio/mp3"));
+        assert!(!is_compressed(b"audio/wav"));
+        assert!(!is_compressed(b"audio/x-wav"));
+        assert!(!is_compressed(b"audio/midi"));
+        assert!(!is_compressed(b"audio/x-midi"));
+        assert!(is_compressed(b"video/webm"));
+        assert!(is_compressed(b"application/x-bzip"));
+        assert!(is_compressed(b"application/x-bzip2"));
+        assert!(is_compressed(b"application/gzip"));
     }
 }
diff --git a/taxy/tests/http_test.rs b/taxy/tests/http_test.rs
@@ -12,7 +12,7 @@ use common::{with_server, TestStorage};
 #[tokio::test]
 async fn http_proxy() -> anyhow::Result<()> {
     let listener = TcpListener::bind("127.0.0.1:52000").await.unwrap();
-    let hello = warp::path!("hello").map(|| format!("Hello"));
+    let hello = warp::path!("hello").map(|| "Hello".to_string());
     tokio::spawn(warp::serve(hello).run_incoming(TcpListenerStream::new(listener)));
 
     let config = TestStorage::builder()

diff --git a/taxy/tests/https_test.rs b/taxy/tests/https_test.rs
@@ -16,11 +16,11 @@ async fn https_proxy() -> anyhow::Result<()> {
     let cert = Arc::new(Cert::new_self_signed(&["localhost".parse().unwrap()], &root).unwrap());
 
     let addr = "localhost:53000".to_socket_addrs().unwrap().next().unwrap();
-    let hello = warp::path!("hello").map(|| format!("Hello"));
+    let hello = warp::path!("hello").map(|| "Hello".to_string());
     let (_, server) = warp::serve(hello)
         .tls()
         .cert(&cert.pem_chain)
-        .key(&cert.pem_key.as_ref().unwrap())
+        .key(cert.pem_key.as_ref().unwrap())
         .bind_ephemeral(addr);
     tokio::spawn(server);
 

diff --git a/taxy/tests/tcp_test.rs b/taxy/tests/tcp_test.rs
@@ -9,7 +9,7 @@ use common::{with_server, TestStorage};
 #[tokio::test]
 async fn tcp_proxy() -> anyhow::Result<()> {
     let listener = TcpListener::bind("127.0.0.1:50000").await.unwrap();
-    let hello = warp::path!("hello").map(|| format!("Hello"));
+    let hello = warp::path!("hello").map(|| "Hello".to_string());
     tokio::spawn(warp::serve(hello).run_incoming(TcpListenerStream::new(listener)));
 
     let config = TestStorage::builder()

diff --git a/taxy/tests/tls_test.rs b/taxy/tests/tls_test.rs
@@ -15,11 +15,11 @@ async fn tls_proxy() -> anyhow::Result<()> {
     let cert = Arc::new(Cert::new_self_signed(&["localhost".parse().unwrap()], &root).unwrap());
 
     let addr = "localhost:51000".to_socket_addrs().unwrap().next().unwrap();
-    let hello = warp::path!("hello").map(|| format!("Hello"));
+    let hello = warp::path!("hello").map(|| "Hello".to_string());
     let (_, server) = warp::serve(hello)
         .tls()
         .cert(&cert.pem_chain)
-        .key(&cert.pem_key.as_ref().unwrap())
+        .key(cert.pem_key.as_ref().unwrap())
         .bind_ephemeral(addr);
     tokio::spawn(server);