From 36b5d69929d15212f5845f42d0239ba50e46a69c Mon Sep 17 00:00:00 2001
From: Eskil Queseth <eskilq@kth.se>
Date: Mon, 2 Nov 2020 23:01:08 +0100
Subject: cargo fmt

---
 mumlib/src/config.rs | 16 +++++++++++-----
 mumlib/src/error.rs  |  4 +++-
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'mumlib')

diff --git a/mumlib/src/config.rs b/mumlib/src/config.rs
index 210dc7b..2eca104 100644
--- a/mumlib/src/config.rs
+++ b/mumlib/src/config.rs
@@ -137,9 +137,13 @@ impl From<Config> for TOMLConfig {
             } else {
                 None
             },
-            servers: Some(config.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(),
+            ),
         }
     }
 }
@@ -149,6 +153,8 @@ pub fn read_default_cfg() -> Config {
         toml::from_str::<TOMLConfig>(&match fs::read_to_string(get_cfg_path()) {
             Ok(f) => f,
             Err(_) => return Config::default(),
-        }).expect("invalid TOML in config file"), //TODO
-    ).expect("invalid config in TOML") //TODO
+        })
+        .expect("invalid TOML in config file"), //TODO
+    )
+    .expect("invalid config in TOML") //TODO
 }
diff --git a/mumlib/src/error.rs b/mumlib/src/error.rs
index eaf517c..1e79b9c 100644
--- a/mumlib/src/error.rs
+++ b/mumlib/src/error.rs
@@ -19,7 +19,9 @@ impl Display for Error {
             Error::DisconnectedError => write!(f, "Not connected to a server"),
             Error::AlreadyConnectedError => write!(f, "Already connected to a server"),
             Error::ChannelIdentifierError(id, kind) => write!(f, "{}: {}", kind, id),
-            Error::InvalidServerAddrError(addr, port) => write!(f, "Invalid server address: {}: {}", addr, port),
+            Error::InvalidServerAddrError(addr, port) => {
+                write!(f, "Invalid server address: {}: {}", addr, port)
+            }
             Error::InvalidUsernameError(username) => write!(f, "Invalid username: {}", username),
         }
     }
-- 
cgit v1.2.1