go back to using SplitDigitIterator

Cargo.toml

@@ -8,10 +8,13 @@ license = "MIT"
 description = "library to parse and interpret poetic source code"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[profile.release]
+lto = true
 
 [dependencies]
 rand = "0.8.5"
 getrandom = { version = "0.2.15", features = ["js"], optional = true }
+split-digits = "0.2.2"
 
 [features]
 wasm = ["dep:getrandom"]
@@ -22,3 +25,4 @@ criterion = "0.5.1"
 [[bench]]
 name = "benchmarks"
 harness = false
+lto = true

benches/benchmarks.rs

@@ -1,4 +1,5 @@
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
+use split_digits::SplitDigitIterator;
 use std::collections::VecDeque;
 
 fn split_digits_vec_deque(d: usize) -> Vec<u8> {
@@ -36,26 +37,8 @@ fn split_digits_vec_push_reverse(d: usize) -> Vec<u8> {
     digits
 }
 
-fn split_digits(mut num: usize) -> impl Iterator<Item = usize> {
-    let mut divisor = 1;
-    while num >= divisor * 10 {
-        divisor *= 10;
-    }
-
-    std::iter::from_fn(move || {
-        if divisor == 0 {
-            None
-        } else {
-            let v = num / divisor;
-            num %= divisor;
-            divisor /= 10;
-            Some(v)
-        }
-    })
-}
-
 fn split_digits_iterator(d: usize) -> Vec<u8> {
-    split_digits(d).map(|x| x as u8).collect::<Vec<u8>>()
+    SplitDigitIterator::new(d).collect()
 }
 
 fn benchmark_split_digits(c: &mut Criterion) {

src/parser.rs

@@ -1,4 +1,5 @@
 use crate::instruction::Instruction;
+use split_digits::SplitDigitIterator;
 use std::{cmp::Ordering, fmt::Display};
 
 #[derive(Debug, Clone, PartialEq)]
@@ -39,22 +40,8 @@ impl Display for ParseError {
 pub struct Parser {}
 
 impl Parser {
-    fn split_digits(mut num: usize) -> impl Iterator<Item = usize> {
-        let mut divisor = 1;
-        while num >= divisor * 10 {
-            divisor *= 10;
-        }
-
-        std::iter::from_fn(move || {
-            if divisor == 0 {
-                None
-            } else {
-                let v = num / divisor;
-                num %= divisor;
-                divisor /= 10;
-                Some(v)
-            }
-        })
+    fn split_digits(d: usize) -> Vec<u8> {
+        SplitDigitIterator::new(d).collect()
     }
 
     /// Any character that is not an alphabetic character or apostrophe is ignored, and treated as whitespace
@@ -78,11 +65,7 @@ impl Parser {
             .for_each(|d| match d.cmp(&10) {
                 Ordering::Less => result.push(d as u8),
                 Ordering::Equal => result.push(0),
-                Ordering::Greater => result.append(
-                    &mut Parser::split_digits(d)
-                        .map(|x| x as u8)
-                        .collect::<Vec<u8>>(),
-                ),
+                Ordering::Greater => result.append(&mut Parser::split_digits(d)),
             });
 
         result
@@ -426,7 +409,7 @@ mod test {
 
     #[test]
     fn test_parser_split_digits() {
-        let digits = Parser::split_digits(568764567).collect::<Vec<usize>>();
+        let digits = Parser::split_digits(568764567);
         assert_eq!(digits, vec![5, 6, 8, 7, 6, 4, 5, 6, 7]);
     }