Replace match with function chaining

This fixes clippy lint `clippy::try_err` by replacing the match block
with function chaining and thus reduces boilerplate in the good-case
where no conversion happens.

Signed-off-by: Matthias Beyer <matthias.beyer@ifm.com>

1 files changed, 9 insertions, 10 deletions

diff --git a/crates/core/c8y_smartrest/src/smartrest_deserializer.rs b/crates/core/c8y_smartrest/src/smartrest_deserializer.rs
index 52be56b9..b634b07d 100644
--- a/crates/core/c8y_smartrest/src/smartrest_deserializer.rs
+++ b/crates/core/c8y_smartrest/src/smartrest_deserializer.rs
@@ -223,11 +223,11 @@ impl SmartRestLogRequest {
             .flexible(true)
             .from_reader(smartrest.as_bytes());
 
-        match rdr.deserialize().next() {
-            Some(Ok(record)) => Ok(record),
-            Some(Err(err)) => Err(err)?,
-            None => panic!("empty request"),
-        }
+        rdr.deserialize()
+            .next()
+            .ok_or_else(|| panic!("empty request"))
+            .unwrap() // does already panic before this, so this unwrap is only required for type lineup
+            .map_err(SmartRestDeserializerError::from)
     }
 }
 
@@ -244,11 +244,10 @@ impl SmartRestRestartRequest {
             .flexible(true)
             .from_reader(smartrest.as_bytes());
 
-        match rdr.deserialize().next() {
-            Some(Ok(record)) => Ok(record),
-            Some(Err(err)) => Err(err)?,
-            None => Err(SmartRestDeserializerError::EmptyRequest),
-        }
+        rdr.deserialize()
+            .next()
+            .ok_or(SmartRestDeserializerError::EmptyRequest)?
+            .map_err(SmartRestDeserializerError::from)
     }
 }