From a42dc9c3efb52a74fc581835f585679e8a5e2bb1 Mon Sep 17 00:00:00 2001
From: Guillermo Ramos
Date: Tue, 3 Dec 2024 11:41:20 +0100
Subject: Refactor

---
 2024/3/src/main.rs | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to '2024/3/src')

diff --git a/2024/3/src/main.rs b/2024/3/src/main.rs
index cadc1fe..0775483 100644
--- a/2024/3/src/main.rs
+++ b/2024/3/src/main.rs
@@ -6,7 +6,7 @@ fn p1(input: &str) {
     let re = Regex::new(r"mul\(([0-9]{1,3}),([0-9]{1,3})\)").unwrap();
 
     let mut result: u32 = 0;
-    for (_, [x, y]) in re.captures_iter(input).map(|m| m.extract()) {
+    for (_, [x, y]) in re.captures_iter(input).map(|cs| cs.extract()) {
         result += x.parse::<u32>().unwrap() * y.parse::<u32>().unwrap();
     }
 
@@ -18,19 +18,14 @@ fn p2(input: &str) {
 
     let mut doing = true;
     let mut result: u32 = 0;
-    for m in re.captures_iter(input) {
-        let mut it = m.iter();
-        match it.next().unwrap().map(|m| m.as_str()) {
-            Some("do()") => doing = true,
-            Some("don't()") => doing = false,
-            Some(mul) if doing && mul.starts_with("mul") => {
-                if let [x, y] = it
-                    .flatten()
-                    .map(|m| m.as_str().parse::<u32>().unwrap())
-                    .collect::<Vec<u32>>()[..]
-                {
-                    result += x * y;
-                }
+    for cs in re.captures_iter(input) {
+        let mut it = cs.iter().flatten().map(|m| m.as_str());
+        match it.next().unwrap() {
+            "do()" => doing = true,
+            "don't()" => doing = false,
+            mul if doing && mul.starts_with("mul") => {
+                let mut next = || it.next().unwrap().parse::<u32>().unwrap();
+                result += next() * next();
             }
             _ => (),
         }
-- 
cgit v1.2.3