cleanup: address two Clippy unnecessary_unwrap warnings

Author: martinvonz

lib/src/default_index/mutable.rs

@@ -346,9 +346,14 @@ impl MutableCommitIndexSegment {
         squashed
     }
 
-    pub(super) fn save_in(self, dir: &Path) -> Result<Arc<ReadonlyCommitIndexSegment>, PathError> {
-        if self.num_local_commits() == 0 && self.parent_file.is_some() {
-            return Ok(self.parent_file.unwrap());
+    pub(super) fn save_in(
+        mut self,
+        dir: &Path,
+    ) -> Result<Arc<ReadonlyCommitIndexSegment>, PathError> {
+        if self.num_local_commits() == 0
+            && let Some(parent_file) = self.parent_file.take()
+        {
+            return Ok(parent_file);
         }
 
         let mut buf = Vec::new();

lib/src/stacked_table.rs

@@ -331,9 +331,11 @@ impl MutableTable {
         squashed
     }
 
-    fn save_in(self, store: &TableStore) -> TableStoreResult<Arc<ReadonlyTable>> {
-        if self.entries.is_empty() && self.parent_file.is_some() {
-            return Ok(self.parent_file.unwrap());
+    fn save_in(mut self, store: &TableStore) -> TableStoreResult<Arc<ReadonlyTable>> {
+        if self.entries.is_empty()
+            && let Some(parent_file) = self.parent_file.take()
+        {
+            return Ok(parent_file);
         }
 
         let buf = self.maybe_squash_with_ancestors().serialize();