From ee02bf3cf07c44c3e837e4fd3ba4606cf8cd6d74 Mon Sep 17 00:00:00 2001 From: Till Wegmueller Date: Mon, 8 Dec 2025 22:49:35 +0100 Subject: [PATCH] Simplify config loading by replacing `match` with `unwrap_or_else` for improved readability. --- pkg6depotd/src/lib.rs | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/pkg6depotd/src/lib.rs b/pkg6depotd/src/lib.rs index 093c36f..aca880d 100644 --- a/pkg6depotd/src/lib.rs +++ b/pkg6depotd/src/lib.rs @@ -20,30 +20,27 @@ pub async fn run() -> Result<()> { // For M1, let's just create a dummy default if not found/failed for testing purposes // In a real scenario we'd want to be more specific about errors. - let config = match Config::load(args.config.clone()) { - Ok(c) => c, - Err(e) => { - eprintln!("Failed to load config: {}. Using default.", e); - Config { - server: config::ServerConfig { - bind: vec!["0.0.0.0:8080".to_string()], - workers: None, - max_connections: None, - reuseport: None, - tls_cert: None, - tls_key: None, - }, - repository: config::RepositoryConfig { - root: std::path::PathBuf::from("/tmp/pkg_repo"), - mode: Some("readonly".to_string()), - }, - telemetry: None, - publishers: None, - admin: None, - oauth2: None, - } + let config = Config::load(args.config.clone()).unwrap_or_else(|e| { + eprintln!("Failed to load config: {}. Using default.", e); + Config { + server: config::ServerConfig { + bind: vec!["0.0.0.0:8080".to_string()], + workers: None, + max_connections: None, + reuseport: None, + tls_cert: None, + tls_key: None, + }, + repository: config::RepositoryConfig { + root: std::path::PathBuf::from("/tmp/pkg_repo"), + mode: Some("readonly".to_string()), + }, + telemetry: None, + publishers: None, + admin: None, + oauth2: None, } - }; + }); // Init telemetry telemetry::init(&config);