From: Ian Jackson Date: Wed, 26 Aug 2020 22:14:32 +0000 (+0100) Subject: formatting nfc X-Git-Tag: otter-0.2.0~1049 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0d9e6ca5a9aafc4ac59d9e642cf5d1844a5cb255;p=otter.git formatting nfc --- diff --git a/src/global.rs b/src/global.rs index 5dbe0674..7b91cced 100644 --- a/src/global.rs +++ b/src/global.rs @@ -941,15 +941,22 @@ impl TryFrom for ServerConfig { type Error = AE; #[throws(Self::Error)] fn try_from(spec: ServerConfigSpec) -> ServerConfig { - let ServerConfigSpec { save_directory, command_socket } = spec; + let ServerConfigSpec { + save_directory, command_socket, + } = spec; + let save_directory = save_directory .unwrap_or_else(|| DEFAULT_SAVE_DIRECTORY.to_owned()); + let mut command_socket = command_socket .unwrap_or_else(|| DEFAULT_COMMAND_SOCKET.to_owned()); if !command_socket.starts_with('/') { command_socket = format!("{}/{}", save_directory, command_socket); } - ServerConfig { save_directory, command_socket } + + ServerConfig { + save_directory, command_socket, + } } }