From cdc0225ca8c0ddcbf09d8b2109479fa867ee2757 Mon Sep 17 00:00:00 2001 From: Tyler Hallada Date: Wed, 3 Dec 2025 00:53:27 -0500 Subject: [PATCH] Better CLI with clap and day runner macro --- Cargo.lock | 176 ++++++++++++++++++++++++++++++++++++++++++++++- Cargo.toml | 1 + src/day01/mod.rs | 14 +--- src/day02/mod.rs | 14 +--- src/main.rs | 32 +++++++-- src/runner.rs | 57 +++++++++++++++ 6 files changed, 260 insertions(+), 34 deletions(-) create mode 100644 src/runner.rs diff --git a/Cargo.lock b/Cargo.lock index 35b2d33..f0215da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,6 +21,7 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" name = "advent-of-code-2025" version = "0.1.0" dependencies = [ + "clap", "color-eyre", "criterion", "itertools 0.14.0", @@ -45,12 +46,56 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "anstream" +version = "0.6.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + [[package]] name = "anstyle" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" +dependencies = [ + "windows-sys 0.60.2", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.60.2", +] + [[package]] name = "autocfg" version = "1.5.0" @@ -124,6 +169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" dependencies = [ "clap_builder", + "clap_derive", ] [[package]] @@ -132,8 +178,22 @@ version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" dependencies = [ + "anstream", "anstyle", "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -169,6 +229,12 @@ dependencies = [ "tracing-error", ] +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + [[package]] name = "criterion" version = "0.5.1" @@ -269,6 +335,12 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.5.2" @@ -289,9 +361,15 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys", + "windows-sys 0.61.2", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" + [[package]] name = "itertools" version = "0.10.5" @@ -374,7 +452,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -401,6 +479,12 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" + [[package]] name = "oorandom" version = "11.1.5" @@ -599,6 +683,12 @@ version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "syn" version = "2.0.111" @@ -727,6 +817,12 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "valuable" version = "0.1.1" @@ -804,7 +900,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -813,6 +909,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-sys" version = "0.61.2" @@ -822,6 +927,71 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + [[package]] name = "zerocopy" version = "0.8.31" diff --git a/Cargo.toml b/Cargo.toml index 9af39ab..73da406 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" edition = "2024" [dependencies] +clap = { version = "4.5", features = ["derive"] } color-eyre = "0.6" itertools = "0.14" tracing = "0.1" diff --git a/src/day01/mod.rs b/src/day01/mod.rs index 0d92ddd..ba8a002 100644 --- a/src/day01/mod.rs +++ b/src/day01/mod.rs @@ -4,7 +4,7 @@ use color_eyre::{ Result, eyre::{Error, eyre}, }; -use tracing::{debug, info, instrument}; +use tracing::{debug, instrument}; pub const INPUT: &str = include_str!("input/input.txt"); @@ -98,18 +98,6 @@ pub fn part2(input: &str) -> Result { Ok(visited_zero_count) } -pub fn solve() -> Result<()> { - info!("Day 1"); - { - let _span = tracing::info_span!("day01").entered(); - let p1 = part1(INPUT)?; - info!("Part 1: {}", p1); - let p2 = part2(INPUT)?; - info!("Part 2: {}", p2); - } - Ok(()) -} - #[cfg(test)] mod tests { use super::*; diff --git a/src/day02/mod.rs b/src/day02/mod.rs index 0dee14d..5e42335 100644 --- a/src/day02/mod.rs +++ b/src/day02/mod.rs @@ -5,7 +5,7 @@ use color_eyre::{ eyre::{Error, OptionExt, eyre}, }; use itertools::Itertools; -use tracing::{debug, debug_span, info, info_span, instrument}; +use tracing::{debug, debug_span, instrument}; pub const INPUT: &str = include_str!("input/input.txt"); @@ -141,18 +141,6 @@ pub fn part2(input: &str) -> Result { Ok(total_invalid) } -pub fn solve() -> Result<()> { - info!("Day 2"); - { - let _span = info_span!("day02").entered(); - let p1 = part1(INPUT)?; - info!("Part 1: {}", p1); - let p2 = part2(INPUT)?; - info!("Part 2: {}", p2); - } - Ok(()) -} - #[cfg(test)] mod tests { use super::*; diff --git a/src/main.rs b/src/main.rs index 1832392..23dcd11 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,9 @@ +mod runner; + pub mod day01; pub mod day02; +use clap::Parser; use color_eyre::Result; use tracing::info; use tracing_error::ErrorLayer; @@ -8,6 +11,24 @@ use tracing_subscriber::EnvFilter; use tracing_subscriber::fmt::format::FmtSpan; use tracing_subscriber::prelude::*; +#[derive(Parser, Debug)] +#[command(name = "Advent of Code 2025")] +#[command(about = "Solutions for Advent of Code 2025", long_about = None)] +struct Args { + /// Day to run (1-25). If not specified, runs all days. + #[arg(short, long)] + day: Option, + + /// Part to run (1 or 2). If not specified, runs all parts. + #[arg(short, long)] + part: Option, +} + +runner::days! { + 1 => day01, + 2 => day02, +} + fn main() -> Result<()> { color_eyre::install()?; @@ -21,11 +42,12 @@ fn main() -> Result<()> { ) .init(); + let args = Args::parse(); + info!("Advent of Code 2025"); - { - let _span = tracing::info_span!("aoc").entered(); - day01::solve()?; - day02::solve()?; - } + let _span = tracing::info_span!("aoc").entered(); + + run_days(args.day, args.part)?; + Ok(()) } diff --git a/src/runner.rs b/src/runner.rs new file mode 100644 index 0000000..58df572 --- /dev/null +++ b/src/runner.rs @@ -0,0 +1,57 @@ +use color_eyre::Result; +use tracing::info; + +macro_rules! days { + ($($day_num:literal => $day_mod:ident),* $(,)?) => { + pub fn run_days(day: Option, part: Option) -> Result<()> { + match day { + $( + Some($day_num) => $crate::runner::run_day($day_num, part, $day_mod::part1, $day_mod::part2, $day_mod::INPUT)?, + )* + Some(d) => color_eyre::eyre::bail!("Day {} is not yet implemented", d), + None => { + $( + $crate::runner::run_day($day_num, None, $day_mod::part1, $day_mod::part2, $day_mod::INPUT)?; + )* + } + } + Ok(()) + } + }; +} + +pub(crate) use days; + +pub fn run_day( + day: u8, + part: Option, + part1_fn: fn(&str) -> Result, + part2_fn: fn(&str) -> Result, + input: &str, +) -> Result<()> +where + T1: std::fmt::Display, + T2: std::fmt::Display, +{ + info!("Day {}", day); + let day_name = format!("{:02}", day); + let _span = tracing::info_span!("day", day = %day_name).entered(); + + if part.is_none() || part == Some(1) { + let result = part1_fn(input)?; + info!("Part 1: {}", result); + } + + if part.is_none() || part == Some(2) { + let result = part2_fn(input)?; + info!("Part 2: {}", result); + } + + if let Some(p) = part { + if p != 1 && p != 2 { + color_eyre::eyre::bail!("Part {} is invalid. Must be 1 or 2.", p); + } + } + + Ok(()) +}