From 4301930b1bdc7c97eb09a911fff0e71634d0da5f Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Fri, 23 Apr 2021 16:58:46 +0200
Subject: [PATCH] Remove second arg from parse functions again

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 Cargo.toml              |  2 +-
 src/lexer.rs            |  2 +-
 src/tests/test_lexer.rs | 10 +++++-----
 src/token.rs            |  1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index fdb47a9..4dedf75 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "charred"
-version = "2.1.0"
+version = "2.1.1"
 authors = ["trivernis <trivernis@protonmail.com>"]
 edition = "2018"
 license-file = "LICENSE"
diff --git a/src/lexer.rs b/src/lexer.rs
index fdfe1df..41d8f76 100644
--- a/src/lexer.rs
+++ b/src/lexer.rs
@@ -22,7 +22,7 @@ impl Lexer {
             let mut found = false;
 
             for checker_fn in &self.checkers {
-                if let Some(token) = checker_fn.as_ref()(&mut self.reader, tokens.last()).await? {
+                if let Some(token) = checker_fn.as_ref()(&mut self.reader).await? {
                     tokens.push(token);
                     found = true;
                     break;
diff --git a/src/tests/test_lexer.rs b/src/tests/test_lexer.rs
index 606c04c..b1362de 100644
--- a/src/tests/test_lexer.rs
+++ b/src/tests/test_lexer.rs
@@ -52,9 +52,9 @@ async fn parse_string_token(reader: &mut InputReader) -> TapeResult<Option<Token
 #[tokio::test]
 async fn it_scans() {
     let checkers: Vec<TokenCheckerFn> = vec![
-        Arc::new(|reader, _| Box::pin(parse_number_token(reader))),
-        Arc::new(|reader, _| Box::pin(parse_whitespace_token(reader))),
-        Arc::new(|reader, _| Box::pin(parse_string_token(reader))),
+        Arc::new(|reader| Box::pin(parse_number_token(reader))),
+        Arc::new(|reader| Box::pin(parse_whitespace_token(reader))),
+        Arc::new(|reader| Box::pin(parse_string_token(reader))),
     ];
     let input_reader = InputReader::new(Cursor::new("The Alphabet 12 ok"));
     let mut lexer = Lexer::new(input_reader, checkers);
@@ -75,8 +75,8 @@ async fn it_scans() {
 #[tokio::test]
 async fn it_falls_back_to_unknown() {
     let checkers: Vec<TokenCheckerFn> = vec![
-        Arc::new(|reader, _| Box::pin(parse_number_token(reader))),
-        Arc::new(|reader, _| Box::pin(parse_string_token(reader))),
+        Arc::new(|reader| Box::pin(parse_number_token(reader))),
+        Arc::new(|reader| Box::pin(parse_string_token(reader))),
     ];
     let input_reader = InputReader::new(Cursor::new("The Alphabet 12 ok"));
     let mut lexer = Lexer::new(input_reader, checkers);
diff --git a/src/token.rs b/src/token.rs
index 0eebbd0..affe0af 100644
--- a/src/token.rs
+++ b/src/token.rs
@@ -8,7 +8,6 @@ use std::sync::Arc;
 pub type TokenCheckerFn = Arc<
     dyn for<'a> Fn(
             &'a mut InputReader,
-            Option<&'a Token>, // last token
         ) -> Pin<Box<dyn Future<Output = TapeResult<Option<Token>>> + Send + 'a>>
         + Send
         + Sync,