diff options
| -rw-r--r-- | 2024/3/src/main.rs | 23 |
1 files changed, 9 insertions, 14 deletions
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(); } _ => (), } |