alarsyo/advent-of-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

2021: day09: fix neighbour iterator lifetime

Browse source
This commit is contained in:
Antoine Martin 2021-12-11 16:08:22 +01:00
parent fc3d23397b
commit d515ced9a0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aoc2021/src/day09.rs
View file

@ -88,10 +88,8 @@ impl HeightMap {
} }
self.filled_points.insert((x, y)); self.filled_points.insert((x, y));
let neighbours: Vec<_> = self.neighbours(x, y).collect(); self.neighbours(x, y)
neighbours .map(|(nx, ny)| self.fill_basin(nx, ny))
.iter()
.map(|&(nx, ny)| self.fill_basin(nx, ny))
.sum::<u64>() .sum::<u64>()
+ 1 + 1
} }
@ -105,11 +103,13 @@ impl HeightMap {
}) })
} }
fn neighbours(&self, x: usize, y: usize) -> impl Iterator<Item = (usize, usize)> + '_ { fn neighbours(&self, x: usize, y: usize) -> impl Iterator<Item = (usize, usize)> + 'static {
let width = self.width;
let height = self.height;
Neighbour::ALL Neighbour::ALL
.iter() .iter()
.copied() .copied()
.filter_map(move |neighbour| neighbour.apply(x, y, self.width, self.height)) .filter_map(move |neighbour| neighbour.apply(x, y, width, height))
} }
fn risk_level(&self, x: usize, y: usize) -> u64 { fn risk_level(&self, x: usize, y: usize) -> u64 {