prelude to reduce some typing

1 files changed, 10 insertions, 8 deletions

diff --git a/src/2020/1/mod.rs b/src/2020/1/mod.rs
index 31c4c5d..1ed3824 100644
--- a/src/2020/1/mod.rs
+++ b/src/2020/1/mod.rs
@@ -1,8 +1,10 @@
-pub fn parse(fh: std::fs::File) -> anyhow::Result<Vec<i64>> {
-    Ok(crate::util::parse::ints(crate::util::parse::lines(fh)).collect())
+use crate::prelude::*;
+
+pub fn parse(fh: File) -> Result<Vec<i64>> {
+    Ok(parse::ints(parse::lines(fh)).collect())
 }
 
-pub fn part1(ints: Vec<i64>) -> anyhow::Result<i64> {
+pub fn part1(ints: Vec<i64>) -> Result<i64> {
     for i in &ints {
         for j in &ints {
             if i + j == 2020 {
@@ -10,10 +12,10 @@ pub fn part1(ints: Vec<i64>) -> anyhow::Result<i64> {
             }
         }
     }
-    Err(anyhow::anyhow!("no numbers summing to 2020 found"))
+    Err(anyhow!("no numbers summing to 2020 found"))
 }
 
-pub fn part2(ints: Vec<i64>) -> anyhow::Result<i64> {
+pub fn part2(ints: Vec<i64>) -> Result<i64> {
     for i in &ints {
         for j in &ints {
             for k in &ints {
@@ -23,17 +25,17 @@ pub fn part2(ints: Vec<i64>) -> anyhow::Result<i64> {
             }
         }
     }
-    Err(anyhow::anyhow!("no numbers summing to 2020 found"))
+    Err(anyhow!("no numbers summing to 2020 found"))
 }
 
 #[test]
 fn test() {
     assert_eq!(
-        part1(parse(crate::util::data(2020, 1).unwrap()).unwrap()).unwrap(),
+        part1(parse(parse::data(2020, 1).unwrap()).unwrap()).unwrap(),
         445536
     );
     assert_eq!(
-        part2(parse(crate::util::data(2020, 1).unwrap()).unwrap()).unwrap(),
+        part2(parse(parse::data(2020, 1).unwrap()).unwrap()).unwrap(),
         138688160
     );
 }