From: alex <> Date: Sun, 15 Dec 2024 12:51:11 +0000 (+0100) Subject: Follow clippy's advice X-Git-Url: https://aoc.elinar.fr/?a=commitdiff_plain;h=566dfcf5976e265c8a9a39b28d8738748410b7c8;p=aoc_2024 Follow clippy's advice --- diff --git a/src/day11.rs b/src/day11.rs index a68832c..240181d 100644 --- a/src/day11.rs +++ b/src/day11.rs @@ -6,10 +6,10 @@ fn split_in_two(value: u64) -> Option<(u64, u64)> { let n_digits = value.ilog10() + 1; if n_digits % 2 == 0 { let p = 10_u64.pow(n_digits / 2); - return Some((value / p, value % p)); + Some((value / p, value % p)) } else { - return None; + None } } @@ -22,15 +22,13 @@ fn count_stones(memo: &mut HashMap<(u64, u32), u64>, value: u64, blinks: u32) -> let tmp = count_stones(memo, 1, blinks - 1); memo.insert((value, blinks), tmp); } + else if let Some((r, l)) = split_in_two(value) { + let tmp = count_stones(memo, r, blinks - 1) + count_stones(memo, l, blinks - 1); + memo.insert((value, blinks), tmp); + } else { - if let Some((r, l)) = split_in_two(value) { - let tmp = count_stones(memo, r, blinks - 1) + count_stones(memo, l, blinks - 1); - memo.insert((value, blinks), tmp); - } - else { - let tmp = count_stones(memo, value * 2024, blinks - 1); - memo.insert((value, blinks), tmp); - } + let tmp = count_stones(memo, value * 2024, blinks - 1); + memo.insert((value, blinks), tmp); } } *memo.get(&(value, blinks)).unwrap() diff --git a/src/day12.rs b/src/day12.rs index e819537..32a7880 100644 --- a/src/day12.rs +++ b/src/day12.rs @@ -11,7 +11,7 @@ impl Puzzle { let mut map: Vec> = Vec::new(); input.lines() .for_each(|l| { - let mut row: Vec = l.as_bytes().iter().map(|v| *v).collect(); + let mut row: Vec = l.as_bytes().to_vec(); row.insert(0, b' '); row.push(b' '); map.push(row);