From 5a677ea222cda0148c4024c097d2458d1f85c636 Mon Sep 17 00:00:00 2001 From: Luke Else Date: Fri, 1 Dec 2023 16:13:54 +0000 Subject: [PATCH] Cleaned up AoC libs and main runner --- src/main.rs | 5 +++-- src/solutions/day01.rs | 2 +- src/solutions/day02.rs | 2 +- src/solutions/dayxx.rs | 7 ------- src/solutions/mod.rs | 10 ++++++++-- 5 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 src/solutions/dayxx.rs diff --git a/src/main.rs b/src/main.rs index 717043e..af6bb39 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,7 +3,7 @@ mod solutions; use std::error::Error; -use solutions::{dayxx::Solution, *}; +use solutions::*; use crate::utils::get_input; @@ -14,7 +14,8 @@ fn main() -> Result<(), Box>{ Box::new(day02::Day02{}) ]; - for day in days { + // Run through and generate solutions + for day in days.iter().rev() { println!("Day{} Part1 Test: {}", day.get_day(), day.part1(get_input(day.get_day(), utils::InputType::Test1)?.as_mut())?); println!("Day{} Part1 Result: {}", day.get_day(), day.part1(get_input(day.get_day(), utils::InputType::Actual)?.as_mut())?); diff --git a/src/solutions/day01.rs b/src/solutions/day01.rs index 32fc099..1de95e1 100644 --- a/src/solutions/day01.rs +++ b/src/solutions/day01.rs @@ -1,4 +1,4 @@ -use super::dayxx::Solution; +use super::Solution; use std::str::FromStr; use fancy_regex::Regex; use strum_macros::EnumString; diff --git a/src/solutions/day02.rs b/src/solutions/day02.rs index 9910aae..4048635 100644 --- a/src/solutions/day02.rs +++ b/src/solutions/day02.rs @@ -1,4 +1,4 @@ -use super::dayxx::Solution; +use super::Solution; pub struct Day02 {} diff --git a/src/solutions/dayxx.rs b/src/solutions/dayxx.rs deleted file mode 100644 index ff16b29..0000000 --- a/src/solutions/dayxx.rs +++ /dev/null @@ -1,7 +0,0 @@ -use std::{error::Error, fmt::Display}; - -pub trait Solution { - fn part1(&self, input: &mut Vec) -> Result, Box>; - fn part2(&self, input: &mut Vec) -> Result, Box>; - fn get_day(&self) -> u8; -} diff --git a/src/solutions/mod.rs b/src/solutions/mod.rs index 1dd63a2..99abab7 100644 --- a/src/solutions/mod.rs +++ b/src/solutions/mod.rs @@ -1,4 +1,10 @@ -pub mod dayxx; - pub mod day01; pub mod day02; + +use std::{error::Error, fmt::Display}; + +pub trait Solution { + fn part1(&self, input: &mut Vec) -> Result, Box>; + fn part2(&self, input: &mut Vec) -> Result, Box>; + fn get_day(&self) -> u8; +}