cleanup day 3

Author: prevostc

README.md

@@ -13,9 +13,9 @@ Solutions for [Advent of Code](https://adventofcode.com/) in [Rust](https://www.
 | :---: | :---: | :---:  |
 | [Day 1](./src/bin/01.rs) | `66.9µs` | `82.5µs` |
 | [Day 2](./src/bin/02.rs) | `128.2µs` | `224.5µs` |
-| [Day 3](./src/bin/03.rs) | `688.6µs` | `810.4µs` |
+| [Day 3](./src/bin/03.rs) | `717.8µs` | `830.1µs` |
 
-**Total: 2.00ms**
+**Total: 2.05ms**
 <!--- benchmarking table --->
 
 ---

src/bin/03.rs

@@ -7,8 +7,8 @@ pub fn part_one(input: &str) -> Option<u32> {
     let sum = regex
         .captures_iter(input)
         .map(|captures| {
-            let x = &captures["x"].parse::<u32>().unwrap();
-            let y = &captures["y"].parse::<u32>().unwrap();
+            let x = captures["x"].parse::<u32>().unwrap();
+            let y = captures["y"].parse::<u32>().unwrap();
             x * y
         })
         .sum();
@@ -20,18 +20,16 @@ pub fn part_two(input: &str) -> Option<u32> {
         Regex::new(r"((?P<op>do\(\)|don't\(\))|(mul\((?P<x>\d{1,3}),(?P<y>\d{1,3})\)))").unwrap();
     let (_, sum) = regex
         .captures_iter(input)
-        .fold((true, 0), |(on, sum), captures| {
+        .fold((true, 0), |(enabled, sum), captures| {
             if let Some(op) = captures.name("op") {
-                if op.as_str() == "don't()" {
-                    (false, sum)
-                } else if op.as_str() == "do()" {
-                    (true, sum)
-                } else {
-                    panic!("Unknown op: {}", op.as_str());
+                match op.as_str() {
+                    "don't()" => (false, sum),
+                    "do()" => (true, sum),
+                    _ => panic!("Unknown operation: {}", op.as_str()),
                 }
-            } else if on {
-                let x = &captures["x"].parse::<u32>().unwrap();
-                let y = &captures["y"].parse::<u32>().unwrap();
+            } else if enabled {
+                let x = captures["x"].parse::<u32>().unwrap();
+                let y = captures["y"].parse::<u32>().unwrap();
                 (true, sum + x * y)
             } else {
                 (false, sum)