diff --git a/2016/01/src/main.rs b/2016/01/src/main.rs index 28847b3..24d7daf 100644 --- a/2016/01/src/main.rs +++ b/2016/01/src/main.rs @@ -19,7 +19,7 @@ fn main() { fn follow_instructions(input: &str) -> (Option<(i32, i32)>, Option<(i32, i32)>) { let instructions = input - .split(",") + .split(',') .map(|x| x.trim()) .map(|x| x.split_at(1)) .map(|(x, y)| (x, y.parse::().unwrap())); @@ -36,7 +36,7 @@ fn follow_instructions(input: &str) -> (Option<(i32, i32)>, Option<(i32, i32)>) delta = match direction { "R" => (delta.1, delta.0 * -1), "L" => (delta.1 * -1, delta.0), - _ => delta, + _ => unreachable!(), }; for _ in 0..steps { diff --git a/2016/03/src/main.rs b/2016/03/src/main.rs index c92adb1..88b321a 100644 --- a/2016/03/src/main.rs +++ b/2016/03/src/main.rs @@ -22,28 +22,27 @@ fn main() { let count_v = input .chunks(3) - .flat_map(|x| { - x[0] - .iter() - .zip(&x[1]) - .zip(&x[2]) + .flat_map(|rows| { + rows[0].iter() + .zip(&rows[1]) + .zip(&rows[2]) .map(|((x, y), z)| [x, y, z]) }) .filter(|x| is_triangle(*x[0], *x[1], *x[2])) .count(); - println!("count={}", count_h); - println!("count={}", count_v); + println!("count_h={}", count_h); + println!("count_v={}", count_v); } -fn is_triangle(a: i32, b: i32, c: i32) -> bool { +pub fn is_triangle(a: i32, b: i32, c: i32) -> bool { a + b > c && b + c > a && c + a > b } #[cfg(test)] mod tests { - use super::is_triangle; + use super::*; #[test] fn example_01() {