chore: apply clippy lints

Author: jacobtread

cspell.json

@@ -0,0 +1,5 @@
+{
+  "userWords": [
+    "reqwest"
+  ]
+}

src/servers/http.rs

@@ -12,7 +12,6 @@ use hyper::{
 use log::error;
 use std::{
     convert::Infallible,
-    io::ErrorKind,
     net::{Ipv4Addr, SocketAddr, SocketAddrV4},
     sync::Arc,
 };
@@ -37,9 +36,7 @@ pub async fn start_http_server(ctx: Arc<ClientContext>) -> std::io::Result<()> {
 
     let server = Server::bind(&addr).serve(make_svc);
 
-    server
-        .await
-        .map_err(|err| std::io::Error::new(ErrorKind::Other, err))
+    server.await.map_err(std::io::Error::other)
 }
 
 /// Handles an HTTP request from the HTTP acting as a proxy

src/servers/telemetry.rs

@@ -127,7 +127,7 @@ fn xor_cipher(input: &[u8], key: &[u8]) -> Vec<u8> {
         // Iterate along-side the key
         .zip(key.iter().cycle().copied())
         // Process the next value using the key
-        .map(|(data, key)| ((data ^ key) % 0x80))
+        .map(|(data, key)| (data ^ key) % 0x80)
         // Collect the processed bytes
         .collect()
 }

src/servers/tunnel.rs

@@ -18,7 +18,6 @@ use log::{debug, error};
 use reqwest::Upgraded;
 use std::{
     future::Future,
-    io::ErrorKind,
     net::{Ipv4Addr, SocketAddr, SocketAddrV4},
     pin::Pin,
     sync::Arc,
@@ -85,10 +84,7 @@ pub async fn start_tunnel_server(ctx: Arc<ClientContext>) -> std::io::Result<()>
         tokio::time::sleep(reconnect_time).await;
     }
 
-    Err(last_error.unwrap_or(std::io::Error::new(
-        ErrorKind::Other,
-        "Reached error connect limit",
-    )))
+    Err(last_error.unwrap_or(std::io::Error::other("Reached error connect limit")))
 }
 
 /// Creates a new tunnel
@@ -103,7 +99,7 @@ async fn create_tunnel(ctx: Arc<ClientContext>, association: &str) -> std::io::R
         // Wrap the tunnel with the [`TunnelCodec`] framing
         .map(|io| Framed::new(io, TunnelCodec::default()))
         // Wrap the error into an [`std::io::Error`]
-        .map_err(|err| std::io::Error::new(ErrorKind::Other, err))?;
+        .map_err(std::io::Error::other)?;
     debug!("Created server tunnel");
 
     // Allocate the socket pool for the tunnel
@@ -496,7 +492,7 @@ mod codec {
     //! Tunnel message frames are as follows:
     //!
     //! ```text
-    //!  0                   1                   2                      
+    //!  0                   1                   2
     //!  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3
     //! +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     //! |     Index     |            Length             |

src/servers/udp_tunnel.rs

@@ -14,7 +14,6 @@ use pocket_relay_udp_tunnel::{
 };
 use std::{
     future::Future,
-    io::ErrorKind,
     net::{Ipv4Addr, SocketAddr, SocketAddrV4},
     pin::Pin,
     sync::Arc,
@@ -142,11 +141,8 @@ pub async fn start_udp_tunnel_server(
     }
 
     Err(last_error
-        .map(|err| std::io::Error::new(ErrorKind::Other, err))
-        .unwrap_or(std::io::Error::new(
-            ErrorKind::Other,
-            "Reached error connect limit",
-        )))
+        .map(std::io::Error::other)
+        .unwrap_or(std::io::Error::other("Reached error connect limit")))
 }
 
 /// Creates a new tunnel