Day 8

Author: prevostc

README.md

@@ -18,7 +18,7 @@ Solutions for [Advent of Code](https://adventofcode.com/) in [Rust](https://www.
 | [Day 5](./src/bin/05.rs) | `66.0µs` | `188.7µs` |
 | [Day 6](./src/bin/06.rs) | `48.5µs` | `4.2ms` |
 | [Day 7](./src/bin/07.rs) | `316.2µs` | `319.6µs` |
-| [Day 8](./src/bin/08.rs) | `7.3µs` | `15.6µs` |
+| [Day 8](./src/bin/08.rs) | `7.4µs` | `15.5µs` |
 
 **Total: 6.00ms**
 <!--- benchmarking table --->

src/bin/08.rs

@@ -12,7 +12,10 @@ const MAX_ANTENNA_PER_TYPE: usize = 16;
 type AntennaMap<'a> =
     HeaplessHashMap<&'a char, HeaplessVec<Point, MAX_ANTENNA_PER_TYPE>, MAX_ANTENNA_TYPES>;
 
-fn solve<const PART1: bool>(input: &str) -> Option<u32> {
+fn solve(
+    input: &str,
+    update_set: &mut impl FnMut(&Grid<char>, &mut HeaplessHashSet<Point, 2048>, (Point, Point)),
+) -> Option<u32> {
     let grid = Grid::new_char_grid_from_str(input);
 
     let antennas: AntennaMap = into_group_map_heapless(
@@ -24,33 +27,36 @@ fn solve<const PART1: bool>(input: &str) -> Option<u32> {
     let mut pos_set: HeaplessHashSet<Point, 2048> = HeaplessHashSet::new();
     for (_, vec) in antennas.iter() {
         for (a, b) in vec.iter().tuple_combinations() {
-            for (a, b) in [(a, b), (b, a)] {
-                let dir = b.as_vector_direction(a);
-                let mut p = *a + dir;
-                if PART1 {
-                    if grid.is_in_bounds(p) {
-                        pos_set.insert(p).unwrap();
-                    }
-                } else {
-                    pos_set.insert(*a).unwrap();
-                    pos_set.insert(*b).unwrap();
-                    while grid.is_in_bounds(p) {
-                        pos_set.insert(p).unwrap();
-                        p = p + dir;
-                    }
-                }
+            for (&a, &b) in [(a, b), (b, a)] {
+                update_set(&grid, &mut pos_set, (a, b));
             }
         }
     }
 
     Some(pos_set.len() as u32)
 }
+
 pub fn part_one(input: &str) -> Option<u32> {
-    solve::<true>(input)
+    solve(input, &mut |grid, pos_set, (a, b)| {
+        let dir = b.as_vector_direction(&a);
+        let p = a + dir;
+        if grid.is_in_bounds(p) {
+            pos_set.insert(p).unwrap();
+        }
+    })
 }
 
 pub fn part_two(input: &str) -> Option<u32> {
-    solve::<false>(input)
+    solve(input, &mut |grid, pos_set, (a, b)| {
+        let dir = b.as_vector_direction(&a);
+        let mut p = a + dir;
+        pos_set.insert(a).unwrap();
+        pos_set.insert(b).unwrap();
+        while grid.is_in_bounds(p) {
+            pos_set.insert(p).unwrap();
+            p = p + dir;
+        }
+    })
 }
 
 #[cfg(test)]