fix: resolve option_if_let_else clippy lint on stable 1.93

Lint graduated from nursery to stable; apply map_or_else in 3 spots.

Author: damon

Cargo.lock

@@ -101,22 +101,23 @@ fn main() {
         }
     }
 
-    let buf: Vec<u8> = if let Some(path) = &file {
-        match std::fs::read(path) {
+    let buf: Vec<u8> = file.as_ref().map_or_else(
+        || {
+            let mut buf = Vec::new();
+            if let Err(e) = io::stdin().read_to_end(&mut buf) {
+                eprintln!("batdoc: stdin: {e}");
+                process::exit(1);
+            }
+            buf
+        },
+        |path| match std::fs::read(path) {
             Ok(b) => b,
             Err(e) => {
                 eprintln!("batdoc: {path}: {e}");
                 process::exit(1);
             }
-        }
-    } else {
-        let mut buf = Vec::new();
-        if let Err(e) = io::stdin().read_to_end(&mut buf) {
-            eprintln!("batdoc: stdin: {e}");
-            process::exit(1);
-        }
-        buf
-    };
+        },
+    );
 
     if buf.len() > MAX_INPUT_SIZE {
         #[allow(clippy::cast_precision_loss)] // only used in error message

src/main.rs

@@ -122,10 +122,7 @@ fn strip_trailing_empty_rows(rows: &[Vec<String>]) -> Vec<Vec<String>> {
     let last_nonempty = rows
         .iter()
         .rposition(|row| row.iter().any(|cell| !cell.trim().is_empty()));
-    match last_nonempty {
-        Some(idx) => rows[..=idx].to_vec(),
-        None => Vec::new(),
-    }
+    last_nonempty.map_or_else(Vec::new, |idx| rows[..=idx].to_vec())
 }
 
 /// Strip leading and trailing columns that are entirely empty.

src/sheet.rs

@@ -296,11 +296,11 @@ fn parse_cell(reader: &mut Reader<&[u8]>, cell_type: &str, shared_strings: &[Str
     match cell_type {
         "s" => {
             // Shared string reference
-            if let Ok(idx) = value.parse::<usize>() {
-                shared_strings.get(idx).cloned().unwrap_or_default()
-            } else {
-                String::new()
-            }
+            value
+                .parse::<usize>()
+                .ok()
+                .and_then(|idx| shared_strings.get(idx).cloned())
+                .unwrap_or_default()
         }
         "inlineStr" => inline_text,
         _ => value, // numbers, booleans, formula cached values, etc.