From 50ef279286a6b90d5ff749409b4efecb96e16470 Mon Sep 17 00:00:00 2001
From: Alain Emilia Anna Zscheile <fogti+devel@ytrizja.de>
Date: Fri, 6 Dec 2024 16:25:54 +0100
Subject: [PATCH] refactor(specctra-core/read): reuse String::read_dsn where
 possible

---
 crates/specctra-core/src/read.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/crates/specctra-core/src/read.rs b/crates/specctra-core/src/read.rs
index 9b94b02..b77680d 100644
--- a/crates/specctra-core/src/read.rs
+++ b/crates/specctra-core/src/read.rs
@@ -66,7 +66,7 @@ impl<R: std::io::BufRead> ReadDsn<R> for String {
 impl<R: std::io::BufRead> ReadDsn<R> for char {
     fn read_dsn(tokenizer: &mut ListTokenizer<R>) -> Result<Self, ParseErrorContext> {
         let err = tokenizer.add_context(ParseError::Expected("a single character"));
-        let string = tokenizer.consume_token()?.expect_leaf()?;
+        let string = String::read_dsn(tokenizer)?;
         let mut it = string.chars();
         let first = match it.next() {
             None => return Err(err),
@@ -81,7 +81,7 @@ impl<R: std::io::BufRead> ReadDsn<R> for char {
 
 impl<R: std::io::BufRead> ReadDsn<R> for bool {
     fn read_dsn(tokenizer: &mut ListTokenizer<R>) -> Result<Self, ParseErrorContext> {
-        match tokenizer.consume_token()?.expect_leaf()?.as_str() {
+        match String::read_dsn(tokenizer)?.as_str() {
             "on" => Ok(true),
             "off" => Ok(false),
             _ => Err(tokenizer.add_context(ParseError::Expected("boolean"))),
@@ -94,9 +94,7 @@ macro_rules! impl_ReadDsn_via_FromStr {
     ($(($t:ty, $name:expr));* $(;)?) => {
         $( impl<R: std::io::BufRead> ReadDsn<R> for $t {
             fn read_dsn(tokenizer: &mut ListTokenizer<R>) -> Result<Self, ParseErrorContext> {
-                tokenizer
-                    .consume_token()?
-                    .expect_leaf()?
+                String::read_dsn(tokenizer)?
                     .parse()
                     .map_err(|_| tokenizer.add_context(ParseError::Expected($name)))
             }