From 7737aaf0cc1a2aac6580b1c101ac740cf4e271b1 Mon Sep 17 00:00:00 2001
From: Alain Emilia Anna Zscheile <fogti+devel@ytrizja.de>
Date: Fri, 6 Dec 2024 16:38:18 +0100
Subject: [PATCH] refactor(specctra-core/read): inline expect_leaf into only
 callsite

---
 crates/specctra-core/src/read.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/crates/specctra-core/src/read.rs b/crates/specctra-core/src/read.rs
index 61138f0..56700e0 100644
--- a/crates/specctra-core/src/read.rs
+++ b/crates/specctra-core/src/read.rs
@@ -21,14 +21,6 @@ impl InputToken {
         }
     }
 
-    pub fn expect_leaf(self) -> Result<String, ParseErrorContext> {
-        if let ListToken::Leaf { value } = self.token {
-            Ok(value)
-        } else {
-            Err(ParseError::ExpectedLeaf.add_context(self.context))
-        }
-    }
-
     pub fn expect_end(self) -> Result<(), ParseErrorContext> {
         if let ListToken::End = self.token {
             Ok(())
@@ -59,7 +51,12 @@ impl<R: std::io::BufRead> ReadDsn<R> for Parser {
 
 impl<R: std::io::BufRead> ReadDsn<R> for String {
     fn read_dsn(tokenizer: &mut ListTokenizer<R>) -> Result<Self, ParseErrorContext> {
-        tokenizer.consume_token()?.expect_leaf()
+        let inptoken = tokenizer.consume_token()?;
+        if let ListToken::Leaf { value } = inptoken.token {
+            Ok(value)
+        } else {
+            Err(ParseError::ExpectedLeaf.add_context(inptoken.context))
+        }
     }
 }