Big clean-up and refactor

Makes most files a little bit shorter, because I removed the test module
around it. It was never really needed.

Also removed a bunch of the nightly dependencies, could run on stable if
we would remove the benchmark stuff (which is still nightly)

Author: marcdejonge

.github/cargo-test.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+execute_test() {
+    for day in "$@"; do
+        echo "Testing $day"
+        echo "# Test results for $day" >> $GITHUB_STEP_SUMMARY
+        cargo test --bin $day --no-fail-fast >> $GITHUB_STEP_SUMMARY
+    done
+}
+
+while IFS= read -r day; do
+    execute_test "$day";
+done < <(
+    (for filename in src/bin/*.rs; do
+        filename=${filename#*/*/} # Remove the directory prefix
+        filename=${filename%.rs}  # Remove the extension suffix
+        echo ${filename:3} $filename
+    done) | sort -n | cut -d' ' -f 2
+)

.github/workflows/rust.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        projects: ["2022", "2023", "2024", "shared"]
+        projects: ["2022", "2023", "2024"]
 
     steps:
       - uses: actions/checkout@v4
@@ -20,4 +20,16 @@ jobs:
         uses: Swatinem/rust-cache@v2
       - name: Run tests
         working-directory: ./${{ matrix.projects }}
+        run: ../.github/cargo-test.sh
+
+  test-shared:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Update Rust to nightly
+        run: rustup update nightly && rustup default nightly
+      - name: Setup Rust Cache
+        uses: Swatinem/rust-cache@v2
+      - name: Run tests
+        working-directory: ./shared
         run: cargo test --tests --no-fail-fast

2022/Cargo.toml

@@ -17,4 +17,4 @@ rayon = "1.10.0"
 strip = true
 lto = true
 panic = "abort"
-debug = "none"
+debug = "none"

2022/src/bin/day1.rs

@@ -1,7 +1,7 @@
 #![feature(test)]
 
-use advent_lib::day_main;
 use advent_lib::parsing::double_line_ending;
+use advent_lib::*;
 use nom_parse_macros::parse_from;
 use std::collections::BinaryHeap;
 
@@ -24,11 +24,5 @@ fn calculate_part1(input: &Input) -> i32 { sums(input).iter().rev().take(1).sum(
 fn calculate_part2(input: &Input) -> i32 { sums(input).iter().rev().take(3).sum() }
 
 day_main!();
-
-#[cfg(test)]
-mod tests {
-    use advent_lib::day_test;
-
-    day_test!( 1, example => 24000, 45000 );
-    day_test!( 1 => 68292, 203203);
-}
+day_test!( 1, example => 24000, 45000 );
+day_test!( 1 => 68292, 203203 );

2022/src/bin/day10.rs

@@ -1,6 +1,7 @@
 #![feature(test)]
+#![allow(clippy::ptr_arg)]
 
-use advent_lib::day_main;
+use advent_lib::*;
 use nom_parse_macros::parse_from;
 
 #[parse_from]
@@ -49,23 +50,17 @@ fn calculate_part2(additions: &Vec<i32>) -> String {
 }
 
 day_main!( additions => calculate_part1, calculate_part2 );
-
-#[cfg(test)]
-mod tests {
-    use advent_lib::day_test;
-
-    day_test!( 10, example => "13140".to_owned(), "
+day_test!( 10, example => "13140".to_owned(), "
 ##..##..##..##..##..##..##..##..##..##..
 ###...###...###...###...###...###...###.
 ####....####....####....####....####....
 #####.....#####.....#####.....#####.....
 ######......######......######......####
-#######.......#######.......#######.....".to_owned() ; additions );
-    day_test!( 10 => "15260".to_owned(), "
+#######.......#######.......#######.....".to_owned() ; crate::additions );
+day_test!( 10 => "15260".to_owned(), "
 ###...##..#..#.####..##..#....#..#..##..
 #..#.#..#.#..#.#....#..#.#....#..#.#..#.
 #..#.#....####.###..#....#....#..#.#....
 ###..#.##.#..#.#....#.##.#....#..#.#.##.
 #....#..#.#..#.#....#..#.#....#..#.#..#.
-#.....###.#..#.#.....###.####..##...###.".to_owned() ; additions );
-}
+#.....###.#..#.#.....###.####..##...###.".to_owned() ; crate::additions );

2022/src/bin/day11.rs

@@ -1,8 +1,8 @@
 #![feature(test)]
 #![allow(clippy::ptr_arg)]
 
-use advent_lib::day_main;
 use advent_lib::iter_utils::IteratorUtils;
+use advent_lib::*;
 use nom_parse_macros::parse_from;
 use std::cell::RefCell;
 
@@ -122,11 +122,5 @@ fn calculate(monkeys: &[Monkey], rounds: u32, div: u64) -> u64 {
 }
 
 day_main!();
-
-#[cfg(test)]
-mod tests {
-    use advent_lib::day_test;
-
-    day_test!( 11, example => 10605, 2713310158 );
-    day_test!( 11 => 108240, 25712998901 );
-}
+day_test!( 11, example => 10605, 2713310158 );
+day_test!( 11 => 108240, 25712998901 );

2022/src/bin/day12.rs

@@ -1,10 +1,10 @@
 #![feature(test)]
 
-use advent_lib::day_main;
 use advent_lib::direction::ALL_DIRECTIONS;
 use advent_lib::grid::{Grid, Location};
 use advent_lib::parsing::single_match;
 use advent_lib::search::{a_star_search, SearchGraph, SearchGraphWithGoal};
+use advent_lib::*;
 use nom_parse_macros::parse_from;
 
 #[parse_from(map(single_match(AsChar::is_alpha), |value: u8| (value, match value {
@@ -110,11 +110,5 @@ fn calculate_part2(grid: &Grid<Node>) -> usize {
 }
 
 day_main!();
-
-#[cfg(test)]
-mod tests {
-    use advent_lib::day_test;
-
-    day_test!( 12, example => 31, 29 );
-    day_test!( 12 => 383, 377 );
-}
+day_test!( 12, example => 31, 29 );
+day_test!( 12 => 383, 377 );

2022/src/bin/day13.rs

@@ -1,7 +1,7 @@
 #![feature(test)]
 
-use advent_lib::day_main;
 use advent_lib::parsing::single;
+use advent_lib::*;
 use nom::combinator::map;
 use nom::error::ParseError;
 use nom::multi::separated_list0;
@@ -125,11 +125,5 @@ impl Ord for Packet {
 }
 
 day_main!();
-
-#[cfg(test)]
-mod tests {
-    use advent_lib::day_test;
-
-    day_test!( 13, example => 13, 140 );
-    day_test!( 13 => 5843, 26289 );
-}
+day_test!( 13, example => 13, 140 );
+day_test!( 13 => 5843, 26289 );

2022/src/bin/day14.rs

@@ -1,11 +1,11 @@
 #![feature(test)]
 
-use advent_lib::day_main;
 use advent_lib::direction::Direction;
 use advent_lib::geometry::point2;
 use advent_lib::grid::Grid;
 use advent_lib::iter_utils::IteratorUtils;
 use advent_lib::lines::LineSegment;
+use advent_lib::*;
 use advent_macros::FromRepr;
 use nom_parse_macros::parse_from;
 use std::ops::Add;
@@ -55,10 +55,10 @@ fn draw_line(grid: &mut Grid<Place>, line: Line, value: Place) {
     }
 }
 
-fn calculate_part1(grid: &Grid<Place>) -> usize { SandDroppingGrid::new(&grid).count() }
+fn calculate_part1(grid: &Grid<Place>) -> usize { SandDroppingGrid::new(grid).count() }
 
 fn calculate_part2(grid: &Grid<Place>) -> usize {
-    let mut grid = SandDroppingGrid::new(&grid);
+    let mut grid = SandDroppingGrid::new(grid);
     let y = grid.grid.height() - 1;
     for x in grid.grid.x_range() {
         let place = grid.grid.get_mut(point2(x, y)).unwrap();
@@ -125,11 +125,5 @@ enum Place {
 }
 
 day_main!( generate_grid => calculate_part1, calculate_part2 );
-
-#[cfg(test)]
-mod tests {
-    use advent_lib::day_test;
-
-    day_test!( 14, example => 24, 93 ; generate_grid );
-    day_test!( 14 => 843, 27625 ; generate_grid );
-}
+day_test!( 14, example => 24, 93 ; crate::generate_grid );
+day_test!( 14 => 843, 27625 ; crate::generate_grid );

2022/src/bin/day15.rs

@@ -1,8 +1,8 @@
 #![feature(test)]
 #![allow(clippy::ptr_arg)]
 
-use advent_lib::day_main;
 use advent_lib::geometry::point2;
+use advent_lib::*;
 use nom_parse_macros::parse_from;
 use std::ops::RangeInclusive;
 
@@ -77,11 +77,5 @@ fn calculate_part2(sensors: &Vec<Sensor>) -> i64 {
 }
 
 day_main!();
-
-#[cfg(test)]
-mod tests {
-    use advent_lib::day_test;
-
-    day_test!( 15, example => 26, 56000011 );
-    day_test!( 15 => 4725496, 12051287042458 );
-}
+day_test!( 15, example => 26, 56000011 );
+day_test!( 15 => 4725496, 12051287042458 );