refactor

1 files changed, 9 insertions, 14 deletions

diff --git a/src/2020/3/mod.rs b/src/2020/3/mod.rs
index 825e31c..81d095a 100644
--- a/src/2020/3/mod.rs
+++ b/src/2020/3/mod.rs
@@ -51,7 +51,7 @@ impl Map {
         &self,
         x_incr: usize,
         y_incr: usize,
-    ) -> anyhow::Result<usize> {
+    ) -> anyhow::Result<i64> {
         let mut trees = 0;
         for r in 0..self.rows() / y_incr {
             let x = r * x_incr;
@@ -64,23 +64,18 @@ impl Map {
     }
 }
 
-pub fn part1() -> anyhow::Result<()> {
+pub fn part1() -> anyhow::Result<i64> {
     let map = read_map()?;
-    println!("{}", map.trees_for_slope(3, 1)?);
-    Ok(())
+    Ok(map.trees_for_slope(3, 1)?)
 }
 
-pub fn part2() -> anyhow::Result<()> {
+pub fn part2() -> anyhow::Result<i64> {
     let map = read_map()?;
-    println!(
-        "{}",
-        map.trees_for_slope(1, 1)?
-            * map.trees_for_slope(3, 1)?
-            * map.trees_for_slope(5, 1)?
-            * map.trees_for_slope(7, 1)?
-            * map.trees_for_slope(1, 2)?
-    );
-    Ok(())
+    Ok(map.trees_for_slope(1, 1)?
+        * map.trees_for_slope(3, 1)?
+        * map.trees_for_slope(5, 1)?
+        * map.trees_for_slope(7, 1)?
+        * map.trees_for_slope(1, 2)?)
 }
 
 fn read_map() -> anyhow::Result<Map> {