Merge pull request 'Update Rust crate clap to 4.2.3' (#43) from renovate/clap-4.x into master

Reviewed-on: #43

Cargo.toml

@@ -5,27 +5,27 @@ edition = "2021"
 description = "TCP-over-HTTP solution"
 
 [dependencies]
-clap = { version = "3.2.18", features = ["derive", "env"] }
+clap = { version = "4.2.4", features = ["derive", "env"] }
 log = "0.4.17"
-env_logger = "0.9.0"
+env_logger = "0.10.0"
 actix = "0.13.0"
 actix-web = { version = "4", features = ["rustls"] }
-actix-web-actors = "4.1.0"
+actix-web-actors = "4.2.0"
 actix-tls = "3.0.3"
-serde = { version = "1.0.144", features = ["derive"] }
+serde = { version = "1.0.159", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
-futures = "0.3.24"
+futures = "0.3.25"
 webpki = "0.22.0"
-x509-parser = "0.14.0"
+x509-parser = "0.15.0"
-pem = "1.1.0"
+pem = "2.0.1"
 reqwest = { version = "0.11", features = ["json", "rustls-tls"], default-features = false }
-tokio-tungstenite = { version = "0.17.2", features = ["__rustls-tls", "rustls-tls-native-roots"] }
+tokio-tungstenite = { version = "0.18.0", features = ["__rustls-tls", "rustls-tls-native-roots"] }
-urlencoding = "2.1.0"
+urlencoding = "2.1.2"
-hyper-rustls = { version = "0.23.0", features = ["rustls-native-certs"] }
+hyper-rustls = { version = "0.23.2", features = ["rustls-native-certs"] }
-bytes = "1.2.1"
+bytes = "1.4.0"
-rustls-pemfile = "1.0.1"
+rustls-pemfile = "1.0.2"
-rustls = "0.20.6"
+rustls = "0.20.7"
 
 [dev-dependencies]
 rand = "0.8.5"
-mktemp = "0.4.1"
+mktemp = "0.5.0"

src/tcp_relay_client/client_config.rs

@@ -93,7 +93,7 @@ fn load_pem_file(path: &Option<String>, name: &str) -> std::io::Result<Option<Ve
         None => None,
         Some(p) => Some(
             std::fs::read(p)
-                .map_err(|e| encpasulate_error(e, format!("Failed to load {}!", name)))?,
+                .map_err(|e| encpasulate_error(e, format!("Failed to load {name}!")))?,
         ),
     })
 }

src/tcp_relay_client/mod.rs

@@ -76,7 +76,7 @@ pub async fn run_app(mut args: ClientConfig) -> std::io::Result<()> {
         Err(e) => {
             Err(std::io::Error::new(
                 ErrorKind::Other,
-                format!("Failed to fetch relay configuration from server! {}", e),
+                format!("Failed to fetch relay configuration from server! {e}"),
             ))?;
             unreachable!();
         }

src/tcp_relay_server/tls_cert_client_verifier.rs

@@ -55,7 +55,7 @@ impl CustomCertClientVerifier {
             let parsed_crl = pem::parse(crl_file)
                 .map_err(|e| encpasulate_error(e, "Failed to decode CRL file!"))?;
 
-            Some(parsed_crl.contents)
+            Some(parsed_crl.into_contents())
         } else {
             None
         };