prelude to reduce some typing

1 files changed, 22 insertions, 20 deletions

diff --git a/src/2020/mod.rs b/src/2020/mod.rs
index b4ea179..c8d45a0 100644
--- a/src/2020/mod.rs
+++ b/src/2020/mod.rs
@@ -1,3 +1,5 @@
+use crate::prelude::*;
+
 #[path = "1/mod.rs"]
 mod day1;
 #[path = "2/mod.rs"]
@@ -18,27 +20,27 @@ mod day8;
 mod day9;
 // NEXT MOD
 
-pub fn run(day: u8, puzzle: u8) -> anyhow::Result<i64> {
+pub fn run(day: u8, puzzle: u8) -> Result<i64> {
     match (day, puzzle) {
-        (1, 1) => day1::part1(day1::parse(crate::util::data(2020, 1)?)?),
-        (1, 2) => day1::part2(day1::parse(crate::util::data(2020, 1)?)?),
-        (2, 1) => day2::part1(day2::parse(crate::util::data(2020, 2)?)?),
-        (2, 2) => day2::part2(day2::parse(crate::util::data(2020, 2)?)?),
-        (3, 1) => day3::part1(day3::parse(crate::util::data(2020, 3)?)?),
-        (3, 2) => day3::part2(day3::parse(crate::util::data(2020, 3)?)?),
-        (4, 1) => day4::part1(day4::parse(crate::util::data(2020, 4)?)?),
-        (4, 2) => day4::part2(day4::parse(crate::util::data(2020, 4)?)?),
-        (5, 1) => day5::part1(day5::parse(crate::util::data(2020, 5)?)?),
-        (5, 2) => day5::part2(day5::parse(crate::util::data(2020, 5)?)?),
-        (6, 1) => day6::part1(day6::parse(crate::util::data(2020, 6)?)?),
-        (6, 2) => day6::part2(day6::parse(crate::util::data(2020, 6)?)?),
-        (7, 1) => day7::part1(day7::parse(crate::util::data(2020, 7)?)?),
-        (7, 2) => day7::part2(day7::parse(crate::util::data(2020, 7)?)?),
-        (8, 1) => day8::part1(day8::parse(crate::util::data(2020, 8)?)?),
-        (8, 2) => day8::part2(day8::parse(crate::util::data(2020, 8)?)?),
-        (9, 1) => day9::part1(day9::parse(crate::util::data(2020, 9)?)?),
-        (9, 2) => day9::part2(day9::parse(crate::util::data(2020, 9)?)?),
+        (1, 1) => day1::part1(day1::parse(parse::data(2020, 1)?)?),
+        (1, 2) => day1::part2(day1::parse(parse::data(2020, 1)?)?),
+        (2, 1) => day2::part1(day2::parse(parse::data(2020, 2)?)?),
+        (2, 2) => day2::part2(day2::parse(parse::data(2020, 2)?)?),
+        (3, 1) => day3::part1(day3::parse(parse::data(2020, 3)?)?),
+        (3, 2) => day3::part2(day3::parse(parse::data(2020, 3)?)?),
+        (4, 1) => day4::part1(day4::parse(parse::data(2020, 4)?)?),
+        (4, 2) => day4::part2(day4::parse(parse::data(2020, 4)?)?),
+        (5, 1) => day5::part1(day5::parse(parse::data(2020, 5)?)?),
+        (5, 2) => day5::part2(day5::parse(parse::data(2020, 5)?)?),
+        (6, 1) => day6::part1(day6::parse(parse::data(2020, 6)?)?),
+        (6, 2) => day6::part2(day6::parse(parse::data(2020, 6)?)?),
+        (7, 1) => day7::part1(day7::parse(parse::data(2020, 7)?)?),
+        (7, 2) => day7::part2(day7::parse(parse::data(2020, 7)?)?),
+        (8, 1) => day8::part1(day8::parse(parse::data(2020, 8)?)?),
+        (8, 2) => day8::part2(day8::parse(parse::data(2020, 8)?)?),
+        (9, 1) => day9::part1(day9::parse(parse::data(2020, 9)?)?),
+        (9, 2) => day9::part2(day9::parse(parse::data(2020, 9)?)?),
         // NEXT PART
-        _ => Err(anyhow::anyhow!("unknown puzzle {}-{}", day, puzzle)),
+        _ => Err(anyhow!("unknown puzzle {}-{}", day, puzzle)),
     }
 }