Implemented ValueInput for IterInput

Author: zesterer

src/inspector.rs

@@ -92,9 +92,13 @@ impl<'src, T: Clone, I: Input<'src>> Inspector<'src, I> for RollbackState<T> {
     #[inline(always)]
     fn on_token(&mut self, _: &<I as Input<'src>>::Token) {}
     #[inline(always)]
-    fn on_save<'parse>(&self, _: &Cursor<'src, 'parse, I>) -> Self::Checkpoint { self.0.clone() }
+    fn on_save<'parse>(&self, _: &Cursor<'src, 'parse, I>) -> Self::Checkpoint {
+        self.0.clone()
+    }
     #[inline(always)]
-    fn on_rewind<'parse>(&mut self, cp: &Checkpoint<'src, 'parse, I, Self::Checkpoint>) { self.0 = cp.inspector.clone(); }
+    fn on_rewind<'parse>(&mut self, cp: &Checkpoint<'src, 'parse, I, Self::Checkpoint>) {
+        self.0 = cp.inspector.clone();
+    }
 }
 
 impl<T> Deref for RollbackState<T> {
@@ -127,9 +131,13 @@ impl<'src, T: Clone, I: Input<'src>> Inspector<'src, I> for TruncateState<T> {
     #[inline(always)]
     fn on_token(&mut self, _: &<I as Input<'src>>::Token) {}
     #[inline(always)]
-    fn on_save<'parse>(&self, _: &Cursor<'src, 'parse, I>) -> Self::Checkpoint { self.0.len() }
+    fn on_save<'parse>(&self, _: &Cursor<'src, 'parse, I>) -> Self::Checkpoint {
+        self.0.len()
+    }
     #[inline(always)]
-    fn on_rewind<'parse>(&mut self, cp: &Checkpoint<'src, 'parse, I, Self::Checkpoint>) { self.0.truncate(cp.inspector); }
+    fn on_rewind<'parse>(&mut self, cp: &Checkpoint<'src, 'parse, I, Self::Checkpoint>) {
+        self.0.truncate(cp.inspector);
+    }
 }
 
 impl<T> Deref for TruncateState<T> {

src/stream.rs

@@ -63,7 +63,7 @@ pub type BoxedStream<'a, T> = Stream<Box<dyn Iterator<Item = T> + 'a>>;
 pub type BoxedExactSizeStream<'a, T> = Stream<Box<dyn ExactSizeIterator<Item = T> + 'a>>;
 
 impl<I: Iterator> Sealed for Stream<I> {}
-impl<'a, I: Iterator + 'a> Input<'a> for Stream<I>
+impl<'src, I: Iterator + 'src> Input<'src> for Stream<I>
 where
     I::Item: Clone,
 {
@@ -100,7 +100,7 @@ where
     }
 }
 
-impl<'a, I: ExactSizeIterator + 'a> ExactSizeInput<'a> for Stream<I>
+impl<'src, I: ExactSizeIterator + 'src> ExactSizeInput<'src> for Stream<I>
 where
     I::Item: Clone,
 {
@@ -110,7 +110,7 @@ where
     }
 }
 
-impl<'a, I: Iterator + 'a> ValueInput<'a> for Stream<I>
+impl<'src, I: Iterator + 'src> ValueInput<'src> for Stream<I>
 where
     I::Item: Clone,
 {
@@ -191,6 +191,28 @@ where
     }
 }
 
+// impl<'src, I, S> ExactSizeInput<'src> for IterInput<I, S>
+// where
+//     I: Iterator<Item = (T, S)> + Clone + 'src,
+//     S: Span + 'src,
+// {
+//     #[inline(always)]
+//     unsafe fn span_from(this: &mut Self::Cache, range: RangeFrom<&Self::Cursor>) -> Self::Span {
+//         (*range.start..this.tokens.len() + cursor.0.len()).into()
+//     }
+// }
+
+impl<'src, I, T: 'src, S> ValueInput<'src> for IterInput<I, S>
+where
+    I: Iterator<Item = (T, S)> + Clone + 'src,
+    S: Span + 'src,
+{
+    #[inline]
+    unsafe fn next(this: &mut Self::Cache, cursor: &mut Self::Cursor) -> Option<Self::Token> {
+        Self::next_maybe(this, cursor)
+    }
+}
+
 #[test]
 fn map_tuple() {
     fn parser<'src, I: Input<'src, Token = char>>() -> impl Parser<'src, I, char> {