From 9d60f06ae05c5de08a026c7f9067c1a339bc24be Mon Sep 17 00:00:00 2001
From: Eskil Queseth <eskilq@kth.se>
Date: Mon, 2 Nov 2020 22:57:52 +0100
Subject: remove redundancy

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

(limited to 'mumlib')

diff --git a/mumlib/src/config.rs b/mumlib/src/config.rs
index a971b2d..210dc7b 100644
--- a/mumlib/src/config.rs
+++ b/mumlib/src/config.rs
@@ -14,7 +14,7 @@ struct TOMLConfig {
 #[derive(Clone, Debug, Default)]
 pub struct Config {
     pub audio: AudioConfig,
-    pub servers: Option<Vec<ServerConfig>>,
+    pub servers: Vec<ServerConfig>,
 }
 
 impl Config {
@@ -123,7 +123,8 @@ impl TryFrom<TOMLConfig> for Config {
                         .map(|s| s.try_into::<ServerConfig>())
                         .collect()
                 })
-                .transpose()?,
+                .transpose()?
+                .unwrap_or(Vec::new()),
         })
     }
 }
@@ -136,12 +137,9 @@ impl From<Config> for TOMLConfig {
             } else {
                 None
             },
-            servers: config.servers.map(|servers| {
-                servers
-                    .into_iter()
-                    .map(|s| Value::try_from::<ServerConfig>(s).unwrap())
-                    .collect()
-            }),
+            servers: Some(config.servers.into_iter()
+                .map(|s| Value::try_from::<ServerConfig>(s).unwrap())
+                .collect()),
         }
     }
 }
-- 
cgit v1.2.1