1 files changed, 7 insertions, 9 deletions
diff --git a/src/2021/9/mod.rs b/src/2021/9/mod.rs
index 184c245..a1c343b 100644
--- a/src/2021/9/mod.rs
+++ b/src/2021/9/mod.rs
@@ -1,12 +1,10 @@
-use crate::util::grid::*;
+use crate::prelude::*;
 
-pub fn parse(fh: std::fs::File) -> anyhow::Result<Grid<u8>> {
-    Ok(crate::util::parse::digit_grid(crate::util::parse::lines(
-        fh,
-    )))
+pub fn parse(fh: File) -> Result<Grid<u8>> {
+    Ok(parse::digit_grid(parse::lines(fh)))
 }
 
-pub fn part1(map: Grid<u8>) -> anyhow::Result<i64> {
+pub fn part1(map: Grid<u8>) -> Result<i64> {
     let mut risk = 0;
     for ((row, col), pos) in map.indexed_cells() {
         if map
@@ -20,7 +18,7 @@ pub fn part1(map: Grid<u8>) -> anyhow::Result<i64> {
     Ok(risk)
 }
 
-pub fn part2(map: Grid<u8>) -> anyhow::Result<i64> {
+pub fn part2(map: Grid<u8>) -> Result<i64> {
     let mut low = vec![];
     for ((row, col), pos) in map.indexed_cells() {
         if map
@@ -63,11 +61,11 @@ pub fn part2(map: Grid<u8>) -> anyhow::Result<i64> {
 #[test]
 fn test() {
     assert_eq!(
-        part1(parse(crate::util::data(2021, 9).unwrap()).unwrap()).unwrap(),
+        part1(parse(parse::data(2021, 9).unwrap()).unwrap()).unwrap(),
         570
     );
     assert_eq!(
-        part2(parse(crate::util::data(2021, 9).unwrap()).unwrap()).unwrap(),
+        part2(parse(parse::data(2021, 9).unwrap()).unwrap()).unwrap(),
         899392
     );
 }