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 { - 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 ReadDsn for Parser { impl ReadDsn for String { fn read_dsn(tokenizer: &mut ListTokenizer) -> Result { - 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)) + } } }