From 474680a2d7ce1775444de030e4af5df474c0a05f Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Sun, 6 Dec 2020 11:13:52 -0800 Subject: [PATCH] comments and formating --- src/lib.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 31d5b33..d20d3dc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,9 +4,6 @@ use std::io::{prelude::*, BufReader}; use std::error::Error; use regex::Regex; - - - pub fn aoc_01_both(filename: &str) -> Result<(), Box> { let file = File::open(filename).expect("No file"); let br = BufReader::new(file); @@ -41,8 +38,6 @@ pub fn aoc_01_both(filename: &str) -> Result<(), Box> { pub fn aoc_02(filename: &str) -> Result<(), Box> { let contents = fs::read_to_string(filename)?; - - let pairs: Vec> = contents.lines().map(|line| { line.split(":").map(|s| String::from(s)).collect() }).collect(); @@ -77,12 +72,12 @@ fn aoc_02_02(pairs: &Vec>) -> Result<(), Box> { let first = rule[1].parse::().unwrap(); let sec = rule[2].parse::().unwrap(); + // the indexes are 1 based but the pairs[x][2] has a leading space so it works out... -_-; let m1 = pairs[i][1].as_bytes()[first] == rule[3].as_bytes()[0]; let m2 = pairs[i][1].as_bytes()[sec] == rule[3].as_bytes()[0]; if (m1 || m2) && !(m1 && m2) { valid += 1; } - } println!("2_2 had {}/{} valid passwords", valid, pairs.len());