replace unwrap with map_err and ok_or_else

solana-labs · Feb 24, 2023 · c572e68 · c572e68
1 parent 8ea6977
commit c572e68
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs
@@ -1611,10 +1611,10 @@ fn create_snapshot_meta_files_for_unarchived_snapshot(unpack_dir: impl AsRef<Pat
 
     // The unpacked dir has a single slot dir, which is the snapshot slot dir.
     let slot_dir = fs::read_dir(&snapshots_dir)
-        .unwrap()
+        .map_err(|_| SnapshotError::NoSnapshotSlotDir(snapshots_dir.clone()))?
         .find(|entry| entry.as_ref().unwrap().path().is_dir())
-        .unwrap()
-        .unwrap()
+        .ok_or_else(|| SnapshotError::NoSnapshotSlotDir(snapshots_dir.clone()))?
+        .map_err(|_| SnapshotError::NoSnapshotSlotDir(snapshots_dir.clone()))?
         .path();
 
     let version_file = unpack_dir.as_ref().join(SNAPSHOT_VERSION_FILENAME);