From 8372ec3aa87fa0c32bd44b0f71f3bdaf63d040e6 Mon Sep 17 00:00:00 2001 From: Jeremy Kaplan Date: Wed, 7 Dec 2022 23:36:17 -0800 Subject: [PATCH] More cleanup --- 2022/src/bin/day08.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/2022/src/bin/day08.rs b/2022/src/bin/day08.rs index 1040489..0b82eae 100644 --- a/2022/src/bin/day08.rs +++ b/2022/src/bin/day08.rs @@ -92,12 +92,11 @@ impl Grid { let mut scene: HashMap = HashMap::new(); for (r1, c1) in itertools::iproduct!(0..self.rows, 0..self.cols) { - let big = (r1, c1); - let h1 = self.map[&big]; + let height = self.map[&(r1, c1)]; let mut score = 1; - let blockage = |rc: &RC| -> bool { self.map[rc] >= h1 }; + let blockage = |rc: &RC| -> bool { self.map[rc] >= height }; let up = (0..r1).rev().map(|r| (r, c1)); score *= take_until(up, blockage).len(); @@ -111,7 +110,7 @@ impl Grid { let right = ((c1 + 1)..self.cols).map(|c| (r1, c)); score *= take_until(right, blockage).len(); - scene.insert(big, score); + scene.insert((r1, c1), score); } scene