Tidied AOC XXXX

Cargo.toml

@@ -4,10 +4,4 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-async-trait = "0.1.74"
-fancy-regex = "0.14.0"
-hashbrown = "0.15.1"
-itertools = "0.13.0"
-strum = "0.26.3"
-strum_macros = "0.26.4"
 tokio = {version = "1.41.1", features = ["full"]}

create.py

@@ -1,4 +1,5 @@
 
+
 for day in range(1, 26):
     boilerplate = open(".\\src\\solutions\\dayxx.rs", "r").read()
     boilerplate = boilerplate.replace("0", str(day))
@@ -7,6 +8,6 @@ for day in range(1, 26):
     new_code = open(f".\\src\\solutions\\day{day:02d}.rs", "w")
     new_code.write(boilerplate)
 
-    f = open(f".\\src\\input\\day{day:02d}", "x")
+    f = open(f".\\input\\day{day:02d}", "x")
-    f = open(f".\\src\\input\\day{day:02d}_test1", "x")
+    f = open(f".\\input\\day{day:02d}_test1", "x")
-    f = open(f".\\src\\input\\day{day:02d}_test2", "x")
+    f = open(f".\\input\\day{day:02d}_test2", "x")

src/main.rs

@@ -7,44 +7,47 @@ use solutions::*;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
-    let days: Vec<Box<dyn Solution + Sync>> = vec![
+    /* Uncomment these before the start of each day! */
+    let days: Vec<Box<dyn Solution>> = vec![
         Box::new(day01::Day01 {}),
-        Box::new(day02::Day02 {}),
+        // Box::new(day02::Day02 {}),
-        Box::new(day03::Day03 {}),
+        // Box::new(day03::Day03 {}),
-        Box::new(day04::Day04 {}),
+        // Box::new(day04::Day04 {}),
-        Box::new(day05::Day05 {}),
+        // Box::new(day05::Day05 {}),
-        Box::new(day06::Day06 {}),
+        // Box::new(day06::Day06 {}),
-        Box::new(day07::Day07 {}),
+        // Box::new(day07::Day07 {}),
-        Box::new(day08::Day08 {}),
+        // Box::new(day08::Day08 {}),
-        Box::new(day09::Day09 {}),
+        // Box::new(day09::Day09 {}),
-        Box::new(day10::Day10 {}),
+        // Box::new(day10::Day10 {}),
-        Box::new(day11::Day11 {}),
+        // Box::new(day11::Day11 {}),
-        Box::new(day12::Day12 {}),
+        // Box::new(day12::Day12 {}),
-        Box::new(day13::Day13 {}),
+        // Box::new(day13::Day13 {}),
-        Box::new(day14::Day14 {}),
+        // Box::new(day14::Day14 {}),
-        Box::new(day15::Day15 {}),
+        // Box::new(day15::Day15 {}),
-        Box::new(day16::Day16 {}),
+        // Box::new(day16::Day16 {}),
-        Box::new(day17::Day17 {}),
+        // Box::new(day17::Day17 {}),
-        Box::new(day18::Day18 {}),
+        // Box::new(day18::Day18 {}),
-        Box::new(day19::Day19 {}),
+        // Box::new(day19::Day19 {}),
-        Box::new(day20::Day20 {}),
+        // Box::new(day20::Day20 {}),
-        Box::new(day21::Day21 {}),
+        // Box::new(day21::Day21 {}),
-        Box::new(day22::Day22 {}),
+        // Box::new(day22::Day22 {}),
-        Box::new(day23::Day23 {}),
+        // Box::new(day23::Day23 {}),
-        Box::new(day24::Day24 {}),
+        // Box::new(day24::Day24 {}),
-        Box::new(day25::Day25 {}),
+        // Box::new(day25::Day25 {}),
     ];
 
+    // Vector to store every solution as a thread handle
     let mut t = vec![];
 
-    // Run through and generate solutions
+    // Run through and construct solution objects
-    for day in days.leak() {
+    for day in days {
-        let task = tokio::spawn(async { day.run().unwrap() });
+        let task = tokio::spawn(async move { day.run().unwrap() });
         t.push(task);
     }
 
     let start_time = SystemTime::now();
 
+    // When thread is awaited, the solution is run
     let mut days = vec![];
     for thread in t {
         days.push(thread.await?);

src/solutions/day01.rs

@@ -6,14 +6,14 @@ impl Solution for Day01 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day02.rs

@@ -6,14 +6,14 @@ impl Solution for Day02 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day03.rs

@@ -6,14 +6,14 @@ impl Solution for Day03 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day04.rs

@@ -6,14 +6,14 @@ impl Solution for Day04 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day05.rs

@@ -6,14 +6,14 @@ impl Solution for Day05 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day06.rs

@@ -6,14 +6,14 @@ impl Solution for Day06 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day07.rs

@@ -6,14 +6,14 @@ impl Solution for Day07 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day08.rs

@@ -6,14 +6,14 @@ impl Solution for Day08 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day09.rs

@@ -6,14 +6,14 @@ impl Solution for Day09 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day10.rs

@@ -6,14 +6,14 @@ impl Solution for Day10 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day11.rs

@@ -6,14 +6,14 @@ impl Solution for Day11 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day12.rs

@@ -6,14 +6,14 @@ impl Solution for Day12 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day13.rs

@@ -6,14 +6,14 @@ impl Solution for Day13 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day14.rs

@@ -6,14 +6,14 @@ impl Solution for Day14 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day15.rs

@@ -6,14 +6,14 @@ impl Solution for Day15 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day16.rs

@@ -6,14 +6,14 @@ impl Solution for Day16 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day17.rs

@@ -6,14 +6,14 @@ impl Solution for Day17 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day18.rs

@@ -6,14 +6,14 @@ impl Solution for Day18 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day19.rs

@@ -6,14 +6,14 @@ impl Solution for Day19 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day20.rs

@@ -6,14 +6,14 @@ impl Solution for Day20 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day21.rs

@@ -6,14 +6,14 @@ impl Solution for Day21 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 

src/solutions/day22.rs

@@ -6,14 +6,14 @@ impl Solution for Day22 {
     fn part1(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }
 
     fn part2(
         &self,
         _input: &mut Vec<String>,
-    ) -> Result<Box<dyn std::fmt::Display + Sync>, Box<dyn std::error::Error>> {
+    ) -> Result<Box<dyn std::fmt::Display>, Box<dyn std::error::Error>> {
         Ok(Box::new("Ready"))
     }