Remove calculation from parse method

Author: maneatingape

README.md

@@ -77,10 +77,10 @@ Performance is reasonable even on older hardware, for example a 2011 MacBook Pro
 
 | Day | Problem | Solution | Benchmark (μs) |
 | --- | --- | --- | --: |
-| 1 | [Secret Entrance](https://adventofcode.com/2025/day/1) | [Source](src/year2025/day01.rs) | 25 |
+| 1 | [Secret Entrance](https://adventofcode.com/2025/day/1) | [Source](src/year2025/day01.rs) | 24 |
 | 2 | [Gift Shop](https://adventofcode.com/2025/day/2) | [Source](src/year2025/day02.rs) | 1 |
-| 3 | [Lobby](https://adventofcode.com/2025/day/3) | [Source](src/year2025/day03.rs) | 18 |
-| 4 | [Printing Department](https://adventofcode.com/2025/day/4) | [Source](src/year2025/day04.rs) | 244 |
+| 3 | [Lobby](https://adventofcode.com/2025/day/3) | [Source](src/year2025/day03.rs) | 21 |
+| 4 | [Printing Department](https://adventofcode.com/2025/day/4) | [Source](src/year2025/day04.rs) | 177 |
 | 5 | [Cafeteria](https://adventofcode.com/2025/day/5) | [Source](src/year2025/day05.rs) | 20 |
 
 ## 2024

src/year2025/day02.rs

@@ -9,22 +9,19 @@ const FIRST: [Range; 5] = [[2, 1], [4, 2], [6, 3], [8, 4], [10, 5]];
 const SECOND: [Range; 6] = [[3, 1], [5, 1], [6, 2], [7, 1], [9, 3], [10, 2]];
 const THIRD: [Range; 2] = [[6, 1], [10, 1]];
 
-pub fn parse(input: &str) -> Pair {
-    let ranges: Vec<_> = input.iter_unsigned::<u64>().chunk::<2>().collect();
-    let part_one = sum(&FIRST, &ranges);
-    let part_two = part_one + sum(&SECOND, &ranges) - sum(&THIRD, &ranges);
-    [part_one, part_two]
+pub fn parse(input: &str) -> Vec<Pair> {
+    input.iter_unsigned::<u64>().chunk::<2>().collect()
 }
 
-pub fn part1(input: &Pair) -> u64 {
-    input[0]
+pub fn part1(input: &[Pair]) -> u64 {
+    sum(&FIRST, input)
 }
 
-pub fn part2(input: &Pair) -> u64 {
-    input[1]
+pub fn part2(input: &[Pair]) -> u64 {
+    sum(&FIRST, input) + sum(&SECOND, input) - sum(&THIRD, input)
 }
 
-fn sum(ranges: &[Range], ids: &[Pair]) -> u64 {
+fn sum(ranges: &[Range], input: &[Pair]) -> u64 {
     let mut result = 0;
 
     for &[digits, size] in ranges {
@@ -35,7 +32,7 @@ fn sum(ranges: &[Range], ids: &[Pair]) -> u64 {
         let start = step * (size_power / 10);
         let end = step * (size_power - 1);
 
-        for &[from, to] in ids {
+        for &[from, to] in input {
             let lower = from.next_multiple_of(step).max(start);
             let upper = to.min(end);
 

src/year2025/day04.rs

@@ -2,7 +2,7 @@
 use crate::util::grid::*;
 use crate::util::point::*;
 
-type Input = (usize, usize);
+type Input = (Vec<Point>, Grid<u8>);
 
 pub fn parse(input: &str) -> Input {
     let grid = Grid::parse(input);
@@ -29,11 +29,20 @@ pub fn parse(input: &str) -> Input {
         }
     }
 
-    let part_one = todo.len();
-    let mut part_two = 0;
+    (todo, padded)
+}
+
+pub fn part1(input: &Input) -> usize {
+    let (todo, _) = input;
+    todo.len()
+}
+
+pub fn part2(input: &Input) -> usize {
+    let (mut todo, mut padded) = input.clone();
+    let mut removed = 0;
 
     while let Some(point) = todo.pop() {
-        part_two += 1;
+        removed += 1;
 
         for next in DIAGONAL.map(|d| point + d) {
             if padded[next] == 4 {
@@ -43,13 +52,5 @@ pub fn parse(input: &str) -> Input {
         }
     }
 
-    (part_one, part_two)
-}
-
-pub fn part1(input: &Input) -> usize {
-    input.0
-}
-
-pub fn part2(input: &Input) -> usize {
-    input.1
+    removed
 }

src/year2025/day05.rs

@@ -34,7 +34,7 @@ pub fn part1(input: &Input) -> usize {
     merged.iter().map(|range| position(range.end) - position(range.start)).sum()
 }
 
-pub fn part2(input: &Input) -> usize {
+pub fn part2(input: &Input) -> u64 {
     let (merged, _) = input;
-    merged.iter().cloned().flatten().count()
+    merged.iter().map(|range| range.end - range.start).sum()
 }