From d38746c3b68f139fb2f6df78a219c2577fc0338c Mon Sep 17 00:00:00 2001 From: Tom Smeding Date: Wed, 5 Dec 2018 13:15:03 +0100 Subject: Day 5 + benchmarking --- 2018/src/day2.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to '2018/src/day2.rs') diff --git a/2018/src/day2.rs b/2018/src/day2.rs index 6564938..38fd4ba 100644 --- a/2018/src/day2.rs +++ b/2018/src/day2.rs @@ -15,7 +15,7 @@ fn close_enough(a: &str, b: &str) -> bool { return num == 1; } -pub fn main(reader: T) -> io::Result<()> { +pub fn main(reader: T) -> io::Result<(String, String)> { let lines: Vec = reader.lines().map(|l| l.unwrap()).collect(); let mut num2: i64 = 0; @@ -40,7 +40,7 @@ pub fn main(reader: T) -> io::Result<()> { num3 += have3 as i64; } - println!("{}", num2 * num3); + let part1 = num2 * num3; // TODO: Can this be faster than n^2? for line1 in &lines { @@ -55,10 +55,9 @@ pub fn main(reader: T) -> io::Result<()> { } } - println!("{}", ans); - return Ok(()) + return Ok((part1.to_string(), ans)); } } - Ok(()) + Err(io::Error::new(io::ErrorKind::Other, "Invalid input")) } -- cgit v1.2.3-54-g00ecf