aboutsummaryrefslogtreecommitdiffstats
path: root/mumlib/src
diff options
context:
space:
mode:
authorEskil Queseth <eskilq@kth.se>2020-11-02 23:01:08 +0100
committerEskil Queseth <eskilq@kth.se>2020-11-02 23:01:08 +0100
commit36b5d69929d15212f5845f42d0239ba50e46a69c (patch)
tree6d7500c995081b4c51c5bc15aebc839a861e0f04 /mumlib/src
parent9d60f06ae05c5de08a026c7f9067c1a339bc24be (diff)
downloadmum-36b5d69929d15212f5845f42d0239ba50e46a69c.tar.gz
cargo fmt
Diffstat (limited to 'mumlib/src')
-rw-r--r--mumlib/src/config.rs16
-rw-r--r--mumlib/src/error.rs4
2 files changed, 14 insertions, 6 deletions
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),
}
}