diff --git a/src/days/day1.rs b/src/days/day1.rs index 45d1c7b..b9a48f2 100644 --- a/src/days/day1.rs +++ b/src/days/day1.rs @@ -1,7 +1,7 @@ use aoc_runner_derive::{aoc, aoc_generator}; #[aoc_generator(day1)] -fn day1_generator(s: &str) -> Vec> { +fn generator(s: &str) -> Vec> { let mut iter = s.lines(); let mut res = Vec::new(); @@ -25,12 +25,12 @@ fn day1_generator(s: &str) -> Vec> { } #[aoc(day1, part1)] -fn day1_part1(input: &[Vec]) -> u32 { +fn part1(input: &[Vec]) -> u32 { input.iter().map(|v| v.iter().sum()).max().unwrap() } #[aoc(day1, part2)] -fn day1_part2(input: &[Vec]) -> u32 { +fn part2(input: &[Vec]) -> u32 { let mut res = (0, 0, 0); for mut item in input.iter().map(|v| v.iter().sum()) { if res.0 < item { diff --git a/src/days/day2.rs b/src/days/day2.rs index 29de3f0..e416b94 100644 --- a/src/days/day2.rs +++ b/src/days/day2.rs @@ -60,7 +60,7 @@ impl Rps { } #[aoc_generator(day2)] -fn day1_generator(s: &str) -> Vec<(Rps, Xyz)> { +fn generator(s: &str) -> Vec<(Rps, Xyz)> { s.lines() .map(|l| { ( @@ -82,7 +82,7 @@ fn day1_generator(s: &str) -> Vec<(Rps, Xyz)> { } #[aoc(day2, part1)] -fn day1_part1(input: &[(Rps, Xyz)]) -> u32 { +fn part1(input: &[(Rps, Xyz)]) -> u32 { input .iter() .map(|&(opp, me)| me.to_rps().score_against(opp)) @@ -90,7 +90,7 @@ fn day1_part1(input: &[(Rps, Xyz)]) -> u32 { } #[aoc(day2, part2)] -fn day1_part2(input: &[(Rps, Xyz)]) -> u32 { +fn part2(input: &[(Rps, Xyz)]) -> u32 { input .iter() .map(|&(opp, target_xyz)| target_xyz.part_two_stuff(opp))