From 85d9ea912772018bc2f4cd8e7162fa84a076c286 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Wed, 6 Mar 2024 19:03:40 +0100
Subject: [PATCH] simplify a thing

---
 src/config.rs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index aafc236..b36ef24 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -165,14 +165,12 @@ where
     let file_name = FILES[config_type as usize];
     let maybe_override = config_io::load(file_name);
 
-    for yaml in [maybe_override.as_deref(), Some(fallback)].iter() {
-        if let Some(yaml_data) = yaml {
-            match serde_yaml::from_str::<T>(yaml_data) {
-                Ok(d) => return d,
-                Err(e) => {
-                    error!("Failed to parse {}, falling back to defaults.", file_name);
-                    error!("{}", e);
-                }
+    for yaml in [maybe_override.as_deref(), Some(fallback)].iter().flatten() {
+        match serde_yaml::from_str::<T>(yaml) {
+            Ok(d) => return d,
+            Err(e) => {
+                error!("Failed to parse {}, falling back to defaults.", file_name);
+                error!("{}", e);
             }
         }
     }