diff --git a/2022/day1/Cargo.lock b/2022/day1/Cargo.lock new file mode 100644 index 0000000..ae5bfe8 --- /dev/null +++ b/2022/day1/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "day1" +version = "0.1.0" diff --git a/2022/day1/Cargo.toml b/2022/day1/Cargo.toml new file mode 100644 index 0000000..a3c4e52 --- /dev/null +++ b/2022/day1/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "day1" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/2022/aoc2022/data/day1-input.txt b/2022/day1/input.txt similarity index 100% rename from 2022/aoc2022/data/day1-input.txt rename to 2022/day1/input.txt diff --git a/2022/aoc2022/src/day1.rs b/2022/day1/src/main.rs similarity index 60% rename from 2022/aoc2022/src/day1.rs rename to 2022/day1/src/main.rs index 791b5af..2513bcd 100644 --- a/2022/aoc2022/src/day1.rs +++ b/2022/day1/src/main.rs @@ -1,16 +1,12 @@ -use std::io::BufRead; -use std::io::Lines; -use std::io::Read; -use std::io::Result; +use std::env; +use std::fs; +use std::str::Lines; -use crate::file::line_reader_for_file; - -fn get_calorie_totals(lines: Lines) -> Result> { +fn get_calorie_totals(lines: Lines) -> Vec { let mut elves: Vec = Vec::new(); let mut current_calorie_count: u32 = 0; for line in lines { - let line = line?; if line.is_empty() { elves.push(current_calorie_count); current_calorie_count = 0; @@ -23,13 +19,17 @@ fn get_calorie_totals(lines: Lines) -> Result> { } elves.sort_unstable_by(|a, b| b.cmp(a)); - Ok(elves) + elves } -pub fn main(input_filename: &str) -> Result<()> { - let line_reader = line_reader_for_file(input_filename) - .expect(format!("Unable to create line reader for file: {}", input_filename).as_str()); - let elves = get_calorie_totals(line_reader).expect("Unable to get knapsack calorie totals"); +fn main() { + let args: Vec = env::args().collect(); + + let filename = args.get(1).expect("Missing filename argument"); + + let file_contents = fs::read_to_string(&filename).expect("Unable to read file"); + let lines = file_contents.lines(); + let elves = get_calorie_totals(lines); println!( "Part 1: Elf with highest calorie count in knapsack: {}", @@ -41,6 +41,4 @@ pub fn main(input_filename: &str) -> Result<()> { "Part 2: Elves with top 3 highest calorie counts in their knapsacks: {}, {}, {} = {}", &elves[0], &elves[1], &elves[2], sum_of_top_three ); - - Ok(()) }