Fix stuff

Author: BakerNet

aoc2025/src/bin/07.rs

@@ -35,13 +35,10 @@ pub fn part_two(input: &str) -> Option<u64> {
         skip -= 1;
         for c in skip..width - skip - 1 {
             let curr = row[c];
-            match curr {
-                b'^' => {
-                    map_counts[c - 1] += map_counts[c];
-                    map_counts[c + 1] += map_counts[c];
-                    map_counts[c] = 0;
-                }
-                _ => (),
+            if curr == b'^' {
+                map_counts[c - 1] += map_counts[c];
+                map_counts[c + 1] += map_counts[c];
+                map_counts[c] = 0;
             }
         }
     }
@@ -70,9 +67,7 @@ pub fn part_two_original(input: &str) -> Option<u64> {
                 _ => (),
             }
         }
-        let temp = map_counts;
-        map_counts = new_map_counts;
-        new_map_counts = temp;
+        std::mem::swap(&mut map_counts, &mut new_map_counts);
         if skip != 0 {
             skip -= 1;
             new_map_counts.iter_mut().for_each(|x| *x = 0);

aoc_utils/src/lib.rs

@@ -272,16 +272,16 @@ impl DirExt {
     }
 
     /// Move one step in this direction (unbounded, may underflow)
-    pub fn inext(&self, p: Point) -> Point {
+    pub fn inext(&self, p: IPoint) -> IPoint {
         match self {
-            DirExt::Up => Point(p.0 - 1, p.1),
-            DirExt::UpLeft => Point(p.0 - 1, p.1 - 1),
-            DirExt::UpRight => Point(p.0 - 1, p.1 + 1),
-            DirExt::Down => Point(p.0 + 1, p.1),
-            DirExt::DownLeft => Point(p.0 + 1, p.1 - 1),
-            DirExt::DownRight => Point(p.0 + 1, p.1 + 1),
-            DirExt::Left => Point(p.0, p.1 - 1),
-            DirExt::Right => Point(p.0, p.1 + 1),
+            DirExt::Up => IPoint(p.0 - 1, p.1),
+            DirExt::UpLeft => IPoint(p.0 - 1, p.1 - 1),
+            DirExt::UpRight => IPoint(p.0 - 1, p.1 + 1),
+            DirExt::Down => IPoint(p.0 + 1, p.1),
+            DirExt::DownLeft => IPoint(p.0 + 1, p.1 - 1),
+            DirExt::DownRight => IPoint(p.0 + 1, p.1 + 1),
+            DirExt::Left => IPoint(p.0, p.1 - 1),
+            DirExt::Right => IPoint(p.0, p.1 + 1),
         }
     }
 }
@@ -528,12 +528,12 @@ mod test {
 
     #[test]
     fn test_dir_inext() {
-        let point = Point(2, 2);
+        let point = IPoint(2, 2);
 
-        assert_eq!(Dir::Up.inext(point), Point(1, 2));
-        assert_eq!(Dir::Down.inext(point), Point(3, 2));
-        assert_eq!(Dir::Left.inext(point), Point(2, 1));
-        assert_eq!(Dir::Right.inext(point), Point(2, 3));
+        assert_eq!(Dir::Up.inext(point), IPoint(1, 2));
+        assert_eq!(Dir::Down.inext(point), IPoint(3, 2));
+        assert_eq!(Dir::Left.inext(point), IPoint(2, 1));
+        assert_eq!(Dir::Right.inext(point), IPoint(2, 3));
     }
 
     #[test]