From d2ecca394d8e099b60e81b055f4ab57d957a972c Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Sat, 3 Dec 2022 16:07:06 -0500
Subject: [PATCH] Use include_str for input files

---
 day1/{ => src}/input.txt | 0
 day1/src/main.rs         | 9 ++-------
 day2/{ => src}/input.txt | 0
 day2/src/main.rs         | 9 ++-------
 4 files changed, 4 insertions(+), 14 deletions(-)
 rename day1/{ => src}/input.txt (100%)
 rename day2/{ => src}/input.txt (100%)

diff --git a/day1/input.txt b/day1/src/input.txt
similarity index 100%
rename from day1/input.txt
rename to day1/src/input.txt
diff --git a/day1/src/main.rs b/day1/src/main.rs
index d5c75ea..4f7964b 100644
--- a/day1/src/main.rs
+++ b/day1/src/main.rs
@@ -1,6 +1,3 @@
-use std::error::Error;
-use std::fs;
-
 fn get_elves(raw: &str) -> Vec<Vec<u32>> {
     raw.split("\n\n")
         .map(|raw_elf| {
@@ -25,8 +22,8 @@ fn get_elf_totals(elves: &Vec<Vec<u32>>) -> Vec<u32> {
         .collect()
 }
 
-fn main() -> Result<(), Box<dyn Error>> {
-    let file_str = fs::read_to_string("input.txt")?;
+fn main() {
+    let file_str = include_str!("input.txt"); //fs::read_to_string("input.txt")?;
     let elves = get_elves(&file_str);
 
     let mut totals: Vec<u32> = get_elf_totals(&elves);
@@ -38,6 +35,4 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     println!("Part 1: Most calories for one elf: {}", most);
     println!("Part 2: Calories for top three elves: {}", top3);
-
-    Ok(())
 }
diff --git a/day2/input.txt b/day2/src/input.txt
similarity index 100%
rename from day2/input.txt
rename to day2/src/input.txt
diff --git a/day2/src/main.rs b/day2/src/main.rs
index 828542d..8012e36 100644
--- a/day2/src/main.rs
+++ b/day2/src/main.rs
@@ -1,6 +1,3 @@
-use std::error::Error;
-use std::fs;
-
 #[derive(Debug, Copy, Clone)]
 enum Calculation {
     ByMove,
@@ -137,8 +134,8 @@ fn get_total(lines: &Vec<&str>, score_type: Calculation) -> u32 {
         .unwrap()
 }
 
-fn main() -> Result<(), Box<dyn Error>> {
-    let file_str = fs::read_to_string("input.txt")?;
+fn main() {
+    let file_str = include_str!("input.txt");
     let lines: Vec<&str> = file_str.lines().collect();
 
     let part1_total = get_total(&lines, ByMove);
@@ -146,6 +143,4 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     println!("Part 1: Final score: {}", part1_total);
     println!("Part 2: Final score: {}", part2_total);
-
-    Ok(())
 }