bert/adventofcode
1
0
Fork 0
mirror of https://github.com/bertptrs/adventofcode.git synced 2025-12-25 21:00:31 +01:00
Code Issues Projects Releases Wiki Activity

Implement clippy warnings.

Browse Source
This commit is contained in:
Bert Peters
2020-12-21 09:35:28 +01:00
parent 74e089cecc
commit e06e77dbad
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
2020/src/day20.rs
View File

@@ -50,6 +50,8 @@ fn read_input(input: &mut dyn Read) -> HashMap<u64, Tile> {
let mut grid: Vec<Vec<_>> = Vec::new(); let mut grid: Vec<Vec<_>> = Vec::new();
// Clippy gets it wrong, this cannot be a for loop
#[allow(clippy::while_let_on_iterator)]
while let Some(line) = lines.next() { while let Some(line) = lines.next() {
if line.is_empty() { if line.is_empty() {
break; break;
@@ -150,7 +152,7 @@ fn complete_row(
} }
for _ in 0..4 { for _ in 0..4 {
if &tiles[&last].sides[1] == &tiles[n].sides[3] { if tiles[&last].sides[1] == tiles[n].sides[3] {
break; break;
} else if rev_eq(&tiles[&last].sides[1], &tiles[n].sides[3]) { } else if rev_eq(&tiles[&last].sides[1], &tiles[n].sides[3]) {
let tile = tiles.get_mut(n).unwrap(); let tile = tiles.get_mut(n).unwrap();
@@ -165,7 +167,7 @@ fn complete_row(
} }
} }
if &tiles[&last].sides[1] == &tiles[n].sides[3] { if tiles[&last].sides[1] == tiles[n].sides[3] {
// This tile matches, add it // This tile matches, add it
next = Some(*n); next = Some(*n);
break; break;
@@ -226,12 +228,11 @@ fn compute_image(
// Should be just one tile that can go there. // Should be just one tile that can go there.
let next = neighbours[&prev] let next = neighbours[&prev]
.iter() .iter()
.filter(|&n| !used_tiles.contains(n)) .find(|&n| !used_tiles.contains(n))
.next()
.unwrap(); .unwrap();
for _ in 0..4 { for _ in 0..4 {
if &tiles[&prev].sides[2] == &tiles[next].sides[0] { if tiles[&prev].sides[2] == tiles[next].sides[0] {
break; break;
} else if rev_eq(&tiles[&prev].sides[2], &tiles[next].sides[0]) { } else if rev_eq(&tiles[&prev].sides[2], &tiles[next].sides[0]) {
tiles.get_mut(next).unwrap().flip(); tiles.get_mut(next).unwrap().flip();
@@ -373,7 +374,7 @@ impl Solution for Day20 {
neighbours neighbours
.into_iter() .into_iter()
.filter_map(|(i, n)| if n.len() == 2 { Some(i) } else { None }) .filter_map(|(i, n)| if n.len() == 2 { Some(i) } else { None })
.fold(1, |a, b| a * b) .product::<u64>()
.to_string() .to_string()
} }