Simplify input path handling

Author: ochsnerd

src/day01.rs

@@ -1,10 +1,8 @@
 use std::collections::HashMap;
 use std::fs;
 use std::iter::zip;
-use std::path::PathBuf;
 
-pub fn day01(mut input_path: PathBuf) {
-    input_path.push("01.txt");
+pub fn day01(input_path: String) {
     let input: String = fs::read_to_string(input_path).unwrap();
     let (mut left, mut right) = parse_input(&input);
 

src/day02.rs

@@ -1,10 +1,8 @@
 use std::collections::HashMap;
 use std::fs;
 use std::hash::Hash;
-use std::path::PathBuf;
 
-pub fn day02(mut input_path: PathBuf) {
-    input_path.push("02.txt");
+pub fn day02(input_path: String) {
     let content = fs::read_to_string(input_path).unwrap();
     let input = parse_input(&content);
 

src/day03.rs

@@ -1,8 +1,6 @@
 use std::fs;
-use std::path::PathBuf;
 
-pub fn day03(mut input_path: PathBuf) {
-    input_path.push("03.txt");
+pub fn day03(input_path: String) {
     let content = fs::read_to_string(input_path).unwrap();
 
     println!(

src/day04.rs

@@ -1,8 +1,6 @@
 use std::fs;
-use std::path::PathBuf;
 
-pub fn day04(mut input_path: PathBuf) {
-    input_path.push("04.txt");
+pub fn day04(input_path: String) {
     let input = fs::read_to_string(input_path).unwrap();
 
     let data = parse_input(&input);

src/day05.rs

@@ -1,11 +1,9 @@
 use std::collections::{HashMap, HashSet};
 use std::fs;
-use std::path::PathBuf;
 
 use itertools::Itertools;
 
-pub fn day05(mut input_path: PathBuf) {
-    input_path.push("05.txt");
+pub fn day05(input_path: String) {
     let input = fs::read_to_string(input_path).unwrap();
 
     let (rules, pages_list) = parse_input(&input);

src/day06.rs

@@ -11,11 +11,9 @@ use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::collections::HashSet;
 use std::fs;
-use std::path::PathBuf;
 use tailcall::tailcall;
 
-pub fn day06(mut input_path: PathBuf) {
-    input_path.push("06.txt");
+pub fn day06(input_path: String) {
     let content = fs::read_to_string(input_path).unwrap();
 
     let (field, guard) = read(&content);

src/day07.rs

@@ -1,10 +1,9 @@
-use std::{fs, iter::zip, num::ParseIntError, path::PathBuf, str::FromStr};
+use std::{fs, iter::zip, num::ParseIntError, str::FromStr};
 
 use itertools::Itertools;
 use rayon::prelude::*;
 
-pub fn day07(mut input_path: PathBuf) {
-    input_path.push("07.txt");
+pub fn day07(input_path: String) {
     let content = fs::read_to_string(input_path).unwrap();
 
     let equations: Vec<Equation> = content.lines().map(|l| l.parse().unwrap()).collect();

src/day08.rs

@@ -2,13 +2,11 @@ use std::{
     cmp,
     collections::{HashMap, HashSet},
     fs,
-    path::PathBuf,
 };
 
 use itertools::iproduct;
 
-pub fn day08(mut input_path: PathBuf) {
-    input_path.push("08.txt");
+pub fn day08(input_path: String) {
     let content = fs::read_to_string(input_path).unwrap();
 
     let (antennas, corner) = read(&content);

src/main.rs

@@ -1,7 +1,6 @@
 #![feature(cmp_minmax)]
 
 use clap::Parser;
-use std::path::PathBuf;
 
 mod day01;
 mod day02;
@@ -16,19 +15,21 @@ mod day08;
 struct Args {
     #[arg(short, long, default_value_t = 0)]
     day: u8,
+
+    #[arg(short, long, default_value = "input")]
+    input_path: String,
 }
 
 fn main() {
     let args = Args::parse();
-    let input = PathBuf::from("input");
     match args.day {
-        1 => day01::day01(input),
-        2 => day02::day02(input),
-        3 => day03::day03(input),
-        4 => day04::day04(input),
-        5 => day05::day05(input),
-        6 => day06::day06(input),
-        7 => day07::day07(input),
-        _ => day08::day08(input),
+        1 => day01::day01(args.input_path),
+        2 => day02::day02(args.input_path),
+        3 => day03::day03(args.input_path),
+        4 => day04::day04(args.input_path),
+        5 => day05::day05(args.input_path),
+        6 => day06::day06(args.input_path),
+        7 => day07::day07(args.input_path),
+        _ => day08::day08(args.input_path),
     }
 }