Tidy main method

Author: maneatingape

src/main.rs

@@ -4,22 +4,17 @@ use aoc::*;
 use std::env::args;
 use std::fs::read_to_string;
 use std::iter::empty;
-use std::path::{Path, PathBuf};
 use std::time::{Duration, Instant};
 
 fn main() {
     // Parse command line options
-    let (year, day) = match args().nth(1) {
-        Some(arg) => {
-            let str = arg.as_str();
-            let mut iter = str.iter_unsigned();
-            (iter.next(), iter.next())
-        }
-        None => (None, None),
-    };
+    let args: Vec<_> = args().collect();
+    let args: Vec<_> = args.iter().map(String::as_str).collect();
+    let mut iter = args.iter().flat_map(|arg| arg.iter_unsigned::<u32>());
+    let (year, day) = (iter.next(), iter.next());
 
-    // Filter solutions
-    let solutions: Vec<_> = empty()
+    // Filter solutions then pretty print output.
+    let (stars, duration) = empty()
         .chain(year2015())
         .chain(year2016())
         .chain(year2017())
@@ -30,51 +25,49 @@ fn main() {
         .chain(year2022())
         .chain(year2023())
         .chain(year2024())
-        .filter(|solution| year.is_none_or(|y: u32| y == solution.year))
-        .filter(|solution| day.is_none_or(|d: u32| d == solution.day))
-        .collect();
-
-    // Pretty print output for each solution.
-    let mut duration = Duration::ZERO;
-
-    for Solution { year, day, path, wrapper } in &solutions {
-        if let Ok(data) = read_to_string(path) {
-            let instant = Instant::now();
-            let (part1, part2) = wrapper(data);
-            duration += instant.elapsed();
-
-            println!("{BOLD}{YELLOW}{year} Day {day:02}{RESET}");
-            println!("    Part 1: {part1}");
-            println!("    Part 2: {part2}");
-        } else {
-            eprintln!("{BOLD}{RED}{year} Day {day:02}{RESET}");
-            eprintln!("    Missing input!");
-            eprintln!("    Place input file in {BOLD}{WHITE}{}{RESET}", path.display());
-        }
-    }
+        .filter(|solution| year.is_none_or(|y| y == solution.year))
+        .filter(|solution| day.is_none_or(|d| d == solution.day))
+        .fold((0, Duration::ZERO), |(stars, duration), Solution { year, day, wrapper }| {
+            let path = format!("input/year{year}/day{day:02}.txt");
+
+            if let Ok(data) = read_to_string(&path) {
+                let instant = Instant::now();
+                let (part1, part2) = wrapper(data);
+                let elapsed = instant.elapsed();
+
+                println!("{BOLD}{YELLOW}{year} Day {day}{RESET}");
+                println!("    Part 1: {part1}");
+                println!("    Part 2: {part2}");
+
+                (stars + 2, duration + elapsed)
+            } else {
+                eprintln!("{BOLD}{RED}{year} Day {day}{RESET}");
+                eprintln!("    Missing input!");
+                eprintln!("    Place input file in {BOLD}{WHITE}{path}{RESET}");
+
+                (stars, duration)
+            }
+        });
 
     // Optionally print totals.
-    if args().any(|a| a == "--totals") {
-        println!("{BOLD}{YELLOW}⭐ {}{RESET}", 2 * solutions.len());
+    if args.contains(&"--totals") {
+        println!("{BOLD}{YELLOW}⭐ {}{RESET}", stars);
         println!("{BOLD}{WHITE}🕓 {} ms{RESET}", duration.as_millis());
     }
 }
 
 struct Solution {
     year: u32,
     day: u32,
-    path: PathBuf,
     wrapper: fn(String) -> (String, String),
 }
 
 macro_rules! run {
     ($year:tt $($day:tt),*) => {
         fn $year() -> Vec<Solution> {
             vec![$({
-                let year = stringify!($year);
-                let day = stringify!($day);
-                let path = Path::new("input").join(year).join(day).with_extension("txt");
-
+                let year = stringify!($year).unsigned();
+                let day = stringify!($day).unsigned();
                 let wrapper = |data: String| {
                     use $year::$day::*;
 
@@ -85,7 +78,7 @@ macro_rules! run {
                     (part1.to_string(), part2.to_string())
                 };
 
-                Solution { year: year.unsigned(), day: day.unsigned(), path, wrapper }
+                Solution { year, day, wrapper }
             },)*]
         }
     }