cleanup

2023/day2/Cargo.toml

@@ -7,3 +7,4 @@ edition = "2021"
 
 [dependencies]
 nom.workspace = true
+helper.workspace = true

2023/day2/src/main.rs

@@ -1,7 +1,6 @@
 use nom::{
     branch::alt,
     bytes::complete::tag,
-    character::complete::digit1,
     combinator::{all_consuming, map},
     multi::separated_list0,
     sequence::{preceded, tuple},
@@ -40,16 +39,11 @@ fn parse_line(line: &str) -> (u64, Vec<Vec<(u64, Color)>>) {
             map(tag("green"), |_| Color::Green),
         ))(i)
     };
-    let parse_cubes = map(
+    let parse_cubes = tuple((helper::integer, preceded(tag(" "), parse_color)));
-        tuple((digit1, preceded(tag(" "), parse_color))),
-        |(a, c)| (a.parse::<u64>().unwrap(), c),
-    );
     let parse_round = separated_list0(tag(", "), parse_cubes);
     let parse_game = separated_list0(tag("; "), parse_round);
     let parse_line = tuple((
-        map(preceded(tag("Game "), digit1), |d: &str| {
+        preceded(tag("Game "), helper::integer),
-            d.parse::<u64>().unwrap()
-        }),
         preceded(tag(": "), parse_game),
     ));
 

Cargo.lock

@@ -13,12 +13,16 @@ dependencies = [
 name = "day2"
 version = "0.1.0"
 dependencies = [
+ "helper",
  "nom",
 ]
 
 [[package]]
 name = "helper"
 version = "0.1.0"
+dependencies = [
+ "nom",
+]
 
 [[package]]
 name = "memchr"

helper/Cargo.toml

@@ -6,3 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+nom.workspace = true

helper/src/lib.rs

@@ -0,0 +1,5 @@
+use nom::{character::complete::digit1, combinator::map, IResult};
+
+pub fn integer(input: &str) -> IResult<&str, u64> {
+    map(digit1, |d: &str| d.parse::<u64>().unwrap())(input)
+}