From 797c4a340e1941ecd276f0241f24bf90f63c7f00 Mon Sep 17 00:00:00 2001
From: Jeong YunWon <jeong@youknowone.org>
Date: Thu, 10 Jun 2021 13:10:16 +0900
Subject: [PATCH]  Remove trivially unnessessary unwrap() from od

---
 src/uu/od/src/parse_formats.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/uu/od/src/parse_formats.rs b/src/uu/od/src/parse_formats.rs
index abf05ea18..ccac44d72 100644
--- a/src/uu/od/src/parse_formats.rs
+++ b/src/uu/od/src/parse_formats.rs
@@ -275,17 +275,13 @@ fn parse_type_string(params: &str) -> Result<Vec<ParsedFormatterItemInfo>, Strin
     let mut chars = params.chars();
     let mut ch = chars.next();
 
-    while ch.is_some() {
-        let type_char = ch.unwrap();
-        let type_char = match format_type(type_char) {
-            Some(t) => t,
-            None => {
-                return Err(format!(
-                    "unexpected char '{}' in format specification '{}'",
-                    type_char, params
-                ));
-            }
-        };
+    while let Some(type_char) = ch {
+        let type_char = format_type(type_char).ok_or_else(|| {
+            format!(
+                "unexpected char '{}' in format specification '{}'",
+                type_char, params
+            )
+        })?;
 
         let type_cat = format_type_category(type_char);