From: alex <> Date: Fri, 6 Dec 2024 11:59:24 +0000 (+0100) Subject: Petite amélioration de la maquette X-Git-Url: https://aoc.elinar.fr/?a=commitdiff_plain;h=691058bd43613e48421cb211304af770122b6494;p=aoc_2024 Petite amélioration de la maquette --- diff --git a/Makefile b/Makefile index 09b3f87..6e6505d 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # - update the main to integrate the new day new-day%: if [ -f "src/$(subst new-,,$@).rs" ]; then return 1; fi - cp -v src/day00.rs src/$(subst new-,,$@).rs + cp -v src/template.rs src/$(subst new-,,$@).rs sed -i \ -e "$$(( $$(grep -n main src/main.rs | cut -d ':' -f 1) - 2 ))a\pub mod $(subst new-,,$@);" \ -e "/_ =>/i\ \"$(subst new-,,$@)\" => $(subst new-,,$@)::run(\&input)?," \ diff --git a/src/day00.rs b/src/day00.rs deleted file mode 100644 index f1a9a82..0000000 --- a/src/day00.rs +++ /dev/null @@ -1,47 +0,0 @@ -use std::error::Error; -use std::path::Path; - -pub fn run(input: &str) -> Result<(), Box> { - let res = run_part1(&input)?; - println!("{res}"); - - let res = run_part2(&input)?; - println!("{res}"); - - Ok(()) -} - -fn get_day() -> String { - let filename = file!(); - Path::new(filename).file_stem().unwrap().to_str().unwrap().to_string() -} - -fn run_part1(input: &str) -> Result> { - println!("Running {} - part 1", get_day()); - - Ok(0) -} - -fn run_part2(input: &str) -> Result> { - println!("Running {} - part 2", get_day()); - - Ok(0) -} - -#[cfg(test)] -mod tests { - use super::*; - - static TEXT_INPUT: &str = "\ -"; - - #[test] - fn test_part1() { - assert_eq!(0, run_part1(TEXT_INPUT).unwrap()); - } - - #[test] - fn test_part2() { - assert_eq!(0, run_part2(TEXT_INPUT).unwrap()); - } -} diff --git a/src/template.rs b/src/template.rs new file mode 100644 index 0000000..9bf5f24 --- /dev/null +++ b/src/template.rs @@ -0,0 +1,47 @@ +use std::error::Error; +use std::path::Path; + +fn run_part1(input: &str) -> Result> { + println!("Running {} - part 1", get_day()); + + Ok(0) +} + +fn run_part2(input: &str) -> Result> { + println!("Running {} - part 2", get_day()); + + Ok(0) +} + +pub fn run(input: &str) -> Result<(), Box> { + let res = run_part1(&input)?; + println!("{res}"); + + let res = run_part2(&input)?; + println!("{res}"); + + Ok(()) +} + +fn get_day() -> String { + let filename = file!(); + Path::new(filename).file_stem().unwrap().to_str().unwrap().to_string() +} + +#[cfg(test)] +mod tests { + use super::*; + + static TEXT_INPUT: &str = "\ +"; + + #[test] + fn test_part1() { + assert_eq!(0, run_part1(TEXT_INPUT).unwrap()); + } + + #[test] + fn test_part2() { + assert_eq!(0, run_part2(TEXT_INPUT).unwrap()); + } +}