qol

README.md

@@ -1,3 +1,3 @@
 # My Advent of Code solutions, written as an exercise to learn Rust.
 
-To run, simply edit ´src/main.rs´ and run it. Optionally, set the year and day via ´ADVENT_YEAR´ and ´ADVENT_DAY´ environment variables. By setting ´ADVENT_TOKEN´ to your browser session token, your personal input can optionally be fetched automatically.
+To run, simply edit `src/main.rs` and run it. Optionally, set the year and day via `ADVENT_YEAR` and `ADVENT_DAY` environment variables. By setting `ADVENT_TOKEN` to your browser session token, your personal input can optionally be fetched automatically.

aoc2023/src/day01.rs

@@ -22,7 +22,7 @@ impl Solution for Day01 {
                 }
             }
 
-            sum += 10 * first.unwrap() + last.unwrap()
+            sum += 10 * first.expect(word) + last.expect(word)
         }
 
         Answer::from(sum)

aoc2024/src/day01.rs

@@ -37,7 +37,7 @@ impl Solution for Day01 {
 fn parse(input: &str) -> (Vec<u32>, Vec<u32>) {
     input.lines()
         .map(|line| line.split_once("   ")
-            .unwrap()
+            .expect(line)
         )
         .map(|(x, y)| (x.parse::<u32>().unwrap(), y.parse::<u32>().unwrap()))
         .unzip()

data/README.md

@@ -1 +1,14 @@
 ## The author of adventofcode.com, Eric Wastl, does not want puzzle input to be shared: https://adventofcode.com/about
+
+Either manually place it here, with the folder structure
+
+```
+data/
+  2024/
+    day01
+    day02
+    day03
+    ...
+```
+
+or set ADVENT_TOKEN to your session cookie to automatically fetch your input at runtime.

src/input_data.rs

@@ -5,7 +5,8 @@ pub fn load_actual(year: usize, day: usize) -> io::Result<String> {
     fs::read_to_string(path)
 }
 
-pub fn load_test(year: usize, day: usize) -> io::Result<String> {
+pub fn load_test(year: usize, day: usize) -> (io::Result<String>, io::Result<String>) {
-    let path = format!("./examples/{year}/day{:02}", day);
+    let input_path = format!("./examples/{year}/day{:02}", day);
-    fs::read_to_string(path)
+    let result_path = format!("./examples/{year}/day{:02}_solution", day);
+    (fs::read_to_string(input_path), fs::read_to_string(result_path))
 }

src/main.rs

@@ -24,23 +24,31 @@ fn main() {
         fetch_input(year, day).expect("Set ADVENT_TOKEN to the correct session cookie to fetch input automatically");
     }
 
-    println!("Attempting to run {year}/{day}");
+    run_all();
-    
+}
-    let Ok(data) = load_actual(year, day)
+
-        else { panic!("No Input Data"); };
+fn run_all() {
-        
+    let years_to_run = [2023, 2024];
-    let now = Instant::now();
+    
-
+    if env::var("ADVENT_TOKEN").is_ok() {
-    let part1 = solution(&data, year, day, 1).unwrap();
+        for year in years_to_run {
-
+            for day in 1..=25 {
-    let elapsed1 = now.elapsed();
+                println!("Pre-fetching input for {year}/{:02}", day);
-
+                fetch_input(year, day).expect("Set ADVENT_TOKEN to the correct session cookie to fetch input automatically");
-    let now = Instant::now();
+            }
-    
+        }
-    let part2 = solution(&data, year, day, 2).unwrap();
+    }
-
+    
-    let elapsed2 = now.elapsed();
+    for year in years_to_run {
-
+        for day in 1..=25 {
-    println!("Part 1 result is {}, took {}ms", part1, elapsed1.as_millis());
+            for part in [1, 2] {
-    println!("Part 2 result is {}, took {}ms", part2, elapsed2.as_millis());
+                let input = load_actual(year, day).unwrap_or_else(|_| panic!("Missing input for {}/{:02}", year, day));
+                
+                let now = Instant::now();
+                let result = solution(&input, year, day, part).unwrap_or_else(|| panic!("No solution at {}/{:02}", year, day));
+                let time_passed = now.elapsed().as_millis();
+                println!("Running Year {}, Day {:02}, Part {} - Result {} - took {}ms", year, day, part, result, time_passed);
+            }
+        }
+    }
 }

src/solution.rs

@@ -3,7 +3,7 @@ use shared::Answer;
 
 pub fn solution(input: &str, year: usize, day: usize, part: usize) -> Option<Answer> {
     match year {
-        2023 => aoc2024::solution(input, day, part),
+        2023 => aoc2023::solution(input, day, part),
         2024 => aoc2024::solution(input, day, part),
         _ => None,
     }