2024.12

1 files changed, 14 insertions, 5 deletions

diff --git a/2024_rust/src/lib.rs b/2024_rust/src/lib.rs
index ea6f7d6..db67f27 100644
--- a/2024_rust/src/lib.rs
+++ b/2024_rust/src/lib.rs
@@ -60,15 +60,24 @@ pub mod matrix {
     }
 }
 
-pub fn run_day<S1, S2>(day: &str, p1: S1, p2: S2)
+pub fn read_input(day: &str) -> String {
+    let input_file = format!("inputs/{day}");
+    std::fs::read_to_string(input_file).unwrap()
+}
+
+pub fn run_day<S1, S2>(day: &str, p1: S1, p2: S2) -> (String, String)
 where
     S1: FnOnce(&str) -> String,
     S2: FnOnce(&str) -> String,
 {
-    let input_file = format!("inputs/{day}");
-    let input = std::fs::read_to_string(input_file).unwrap();
+    let input = read_input(day);
+
+    let p1r = p1(&input);
+    let p2r = p2(&input);
 
     println!("==== DAY {day}");
-    println!("Result (P1): {}", p1(&input));
-    println!("Result (P2): {}", p2(&input));
+    println!("Result (P1): {}", p1r);
+    println!("Result (P2): {}", p2r);
+
+    (p1r, p2r)
 }