directly use SocketAddr in command line arguments & methods

Author: syphar

src/bin/cratesfyi.rs

@@ -1,5 +1,6 @@
 use std::env;
 use std::fmt::Write;
+use std::net::SocketAddr;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;
@@ -107,12 +108,12 @@ enum CommandLine {
     /// Starts web server
     StartWebServer {
         #[arg(name = "SOCKET_ADDR", default_value = "0.0.0.0:3000")]
-        socket_addr: String,
+        socket_addr: SocketAddr,
     },
 
     StartRegistryWatcher {
         #[arg(name = "SOCKET_ADDR", default_value = "0.0.0.0:3000")]
-        metric_server_socket_addr: String,
+        metric_server_socket_addr: SocketAddr,
         /// Enable or disable the repository stats updater
         #[arg(
             long = "repository-stats-updater",
@@ -126,7 +127,7 @@ enum CommandLine {
 
     StartBuildServer {
         #[arg(name = "SOCKET_ADDR", default_value = "0.0.0.0:3000")]
-        metric_server_socket_addr: String,
+        metric_server_socket_addr: SocketAddr,
     },
 
     /// Starts the daemon
@@ -170,22 +171,22 @@ impl CommandLine {
                     docs_rs::utils::daemon::start_background_cdn_invalidator(&ctx)?;
                 }
 
-                start_background_metrics_webserver(Some(&metric_server_socket_addr), &ctx)?;
+                start_background_metrics_webserver(Some(metric_server_socket_addr), &ctx)?;
 
                 docs_rs::utils::watch_registry(ctx.build_queue()?, ctx.config()?, ctx.index()?)?;
             }
             Self::StartBuildServer {
                 metric_server_socket_addr,
             } => {
-                start_background_metrics_webserver(Some(&metric_server_socket_addr), &ctx)?;
+                start_background_metrics_webserver(Some(metric_server_socket_addr), &ctx)?;
 
                 let build_queue = ctx.build_queue()?;
                 let rustwide_builder = RustwideBuilder::init(&ctx)?;
                 queue_builder(rustwide_builder, build_queue)?;
             }
             Self::StartWebServer { socket_addr } => {
                 // Blocks indefinitely
-                start_web_server(Some(&socket_addr), &ctx)?;
+                start_web_server(Some(socket_addr), &ctx)?;
             }
             Self::Daemon { registry_watcher } => {
                 docs_rs::utils::start_daemon(ctx, registry_watcher == Toggle::Enabled)?;

src/web/mod.rs

@@ -46,6 +46,7 @@ use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS};
 use postgres::Client;
 use semver::{Version, VersionReq};
 use serde::Serialize;
+use std::net::{IpAddr, Ipv4Addr};
 use std::{
     borrow::{Borrow, Cow},
     net::SocketAddr,
@@ -65,7 +66,7 @@ pub(crate) fn encode_url_path(path: &str) -> String {
     utf8_percent_encode(path, PATH).to_string()
 }
 
-const DEFAULT_BIND: &str = "0.0.0.0:3000";
+const DEFAULT_BIND: SocketAddr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080);
 
 #[derive(Debug)]
 struct MatchVersion {
@@ -311,10 +312,10 @@ pub(crate) fn build_metrics_axum_app(context: &dyn Context) -> Result<AxumRouter
 }
 
 pub fn start_background_metrics_webserver(
-    addr: Option<&str>,
+    addr: Option<SocketAddr>,
     context: &dyn Context,
 ) -> Result<(), Error> {
-    let axum_addr: SocketAddr = addr.unwrap_or(DEFAULT_BIND).parse()?;
+    let axum_addr: SocketAddr = addr.unwrap_or(DEFAULT_BIND);
 
     tracing::info!(
         "Starting metrics web server on `{}:{}`",
@@ -341,13 +342,13 @@ pub fn start_background_metrics_webserver(
 }
 
 #[instrument(skip_all)]
-pub fn start_web_server(addr: Option<&str>, context: &dyn Context) -> Result<(), Error> {
+pub fn start_web_server(addr: Option<SocketAddr>, context: &dyn Context) -> Result<(), Error> {
     let template_data = Arc::new(TemplateData::new(
         &mut *context.pool()?.get()?,
         context.config()?.render_threads,
     )?);
 
-    let axum_addr: SocketAddr = addr.unwrap_or(DEFAULT_BIND).parse()?;
+    let axum_addr = addr.unwrap_or(DEFAULT_BIND);
 
     tracing::info!(
         "Starting web server on `{}:{}`",