From 0a862a7e5f38e1455c80fc937ce53e635082dabd Mon Sep 17 00:00:00 2001
From: Alain Emilia Anna Zscheile <fogti+devel@ytrizja.de>
Date: Mon, 2 Dec 2024 22:58:37 +0100
Subject: [PATCH] refactor(specctra/structure): get rid of code duplication in
 Vec<Point>

---
 src/specctra/structure.rs | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/specctra/structure.rs b/src/specctra/structure.rs
index cc56ebb..40cce8c 100644
--- a/src/specctra/structure.rs
+++ b/src/specctra/structure.rs
@@ -395,19 +395,9 @@ pub struct Point {
 // Custom impl for the case described above
 impl<R: std::io::BufRead> ReadDsn<R> for Vec<Point> {
     fn read_dsn(tokenizer: &mut ListTokenizer<R>) -> Result<Self, ParseErrorContext> {
-        let mut array = Vec::<Point>::new();
-        loop {
-            let input = tokenizer.consume_token()?;
-            if let ListToken::Leaf { value: ref x } = input.token {
-                let x = x
-                    .parse::<f64>()
-                    .map_err(|_| ParseError::Expected("f64").add_context(input.context))?;
-                let y = tokenizer.read_value::<f64>()?;
-                array.push(Point { x, y });
-            } else {
-                tokenizer.return_token(input);
-                break;
-            }
+        let mut array = Vec::new();
+        while let Some(x) = tokenizer.read_value::<Option<Point>>()? {
+            array.push(x);
         }
         Ok(array)
     }
@@ -416,16 +406,16 @@ impl<R: std::io::BufRead> ReadDsn<R> for Vec<Point> {
 impl<R: std::io::BufRead> ReadDsn<R> for Option<Point> {
     fn read_dsn(tokenizer: &mut ListTokenizer<R>) -> Result<Self, ParseErrorContext> {
         let input = tokenizer.consume_token()?;
-        if let ListToken::Leaf { value: ref x } = input.token {
+        Ok(if let ListToken::Leaf { value: ref x } = input.token {
             let x = x
                 .parse::<f64>()
                 .map_err(|_| ParseError::Expected("f64").add_context(input.context))?;
             let y = tokenizer.read_value::<f64>()?;
-            Ok(Some(Point { x, y }))
+            Some(Point { x, y })
         } else {
             tokenizer.return_token(input);
-            Ok(None)
-        }
+            None
+        })
     }
 }