Optimize some functions to reduce verbosity

Signed-off-by: Sayan Nandan <nandansayan@outlook.com>

server/src/config/mod.rs

@@ -278,11 +278,7 @@ impl ParsedConfig {
     /// TOML file (represented as an object)
     fn from_config(cfg_info: Config) -> Self {
         ParsedConfig {
-            noart: if let Some(noart) = cfg_info.server.noart {
-                noart
-            } else {
-                false
-            },
+            noart: cfg_info.server.noart.unwrap_or(false),
             bgsave: if let Some(bgsave) = cfg_info.bgsave {
                 match (bgsave.enabled, bgsave.every) {
                     // TODO: Show a warning that there are unused keys
@@ -294,11 +290,12 @@ impl ParsedConfig {
             } else {
                 BGSave::default()
             },
-            snapshot: if let Some(snapshot) = cfg_info.snapshot {
-                SnapshotConfig::Enabled(SnapshotPref::new(snapshot.every, snapshot.atmost))
-            } else {
-                SnapshotConfig::default()
-            },
+            snapshot: cfg_info
+                .snapshot
+                .map(|snapshot| {
+                    SnapshotConfig::Enabled(SnapshotPref::new(snapshot.every, snapshot.atmost))
+                })
+                .unwrap_or(SnapshotConfig::default()),
             ports: if let Some(sslopts) = cfg_info.ssl {
                 if sslopts.only.is_some() {
                     PortConfig::SecureOnly {

server/src/coredb/mod.rs

@@ -282,11 +282,9 @@ impl CoreDB {
             background_tasks += 1;
             snap_count = Some(atmost);
         }
-        let snapcfg = if let Some(max) = snap_count {
-            Arc::new(Some(SnapshotStatus::new(max)))
-        } else {
-            Arc::new(None)
-        };
+        let snapcfg = snap_count
+            .map(|max| Arc::new(Some(SnapshotStatus::new(max))))
+            .unwrap_or(Arc::new(None));
         let db = if let Some(coretable) = coretable {
             CoreDB {
                 shared: Arc::new(Shared {

server/src/diskstore/mod.rs

@@ -53,15 +53,11 @@ lazy_static::lazy_static! {
 /// Try to get the saved data from disk. This returns `None`, if the `data.bin` wasn't found
 /// otherwise the `data.bin` file is deserialized and parsed into a `HashMap`
 pub fn get_saved(location: Option<PathBuf>) -> TResult<Option<HashMap<String, Data>>> {
-    let file = match fs::read(if let Some(loc) = location {
-        log::info!(
-            "Attempting to restore data from file: '{}'",
-            loc.to_string_lossy()
-        );
-        loc
-    } else {
-        PERSIST_FILE.to_path_buf()
-    }) {
+    let file = match fs::read(
+        location
+            .map(|loc| loc.to_path_buf())
+            .unwrap_or(PERSIST_FILE.to_path_buf()),
+    ) {
         Ok(f) => f,
         Err(e) => match e.kind() {
             ErrorKind::NotFound => return Ok(None),

server/src/diskstore/snapshot.rs

@@ -83,11 +83,7 @@ impl<'a> SnapshotEngine<'a> {
         } else {
             (maxtop, false)
         };
-        let snap_dir = if let Some(dir) = snap_dir {
-            dir
-        } else {
-            DIR_SNAPSHOT
-        };
+        let snap_dir = snap_dir.unwrap_or(DIR_SNAPSHOT);
         match fs::create_dir(snap_dir) {
             Ok(_) => (),
             Err(e) => match e.kind() {

server/src/tests/mod.rs

@@ -50,11 +50,7 @@ macro_rules! __func__ {
 async fn start_test_server(port: u16, db: Option<CoreDB>) -> SocketAddr {
     let mut socket = String::from("127.0.0.1:");
     socket.push_str(&port.to_string());
-    let db = if let Some(db) = db {
-        db
-    } else {
-        CoreDB::new(BGSave::Disabled, SnapshotConfig::default(), None).unwrap()
-    };
+    let db = db.unwrap_or(CoreDB::new(BGSave::Disabled, SnapshotConfig::default(), None).unwrap());
     let listener = TcpListener::bind(socket)
         .await
         .expect(&format!("Failed to bind to port {}", port));