From c6f92eaedf197beafef461ee6c2bd067e7160c49 Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Tue, 21 Jun 2022 16:06:50 +0200
Subject: Refactor to improve a bunch of states
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*   Improve passing stuff around
*   Add traits to enums for markers and such
*   Fix “life time” stuff I didn’t understand
---
 src/construct/definition.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/construct/definition.rs')

diff --git a/src/construct/definition.rs b/src/construct/definition.rs
index 03baee6..61c4d34 100644
--- a/src/construct/definition.rs
+++ b/src/construct/definition.rs
@@ -144,16 +144,14 @@ fn marker_after(tokenizer: &mut Tokenizer, code: Code) -> StateFnResult {
 /// ```
 fn destination_before(tokenizer: &mut Tokenizer, code: Code) -> StateFnResult {
     let event = tokenizer.events.last().unwrap();
-    // Blank line not ok.
-    let char_nok = matches!(
-        code,
-        Code::None | Code::CarriageReturnLineFeed | Code::Char('\r' | '\n')
-    );
 
     // Whitespace.
     if (event.token_type == TokenType::LineEnding || event.token_type == TokenType::Whitespace)
-        && !char_nok
-    {
+    // Blank line not ok.
+        && !matches!(
+        code,
+        Code::None | Code::CarriageReturnLineFeed | Code::Char('\r' | '\n')
+    ) {
         tokenizer.go(destination, destination_after)(tokenizer, code)
     } else {
         (State::Nok, None)
-- 
cgit