cleanup

2023/day18/src/main.rs

@@ -1,12 +1,13 @@
 // Problem: https://adventofcode.com/2023/day/18
 
-use std::collections::HashSet;
-
-use itertools::Itertools;
+use itertools::{Itertools, MinMaxResult};
 use sscanf::sscanf;
+use std::collections::HashSet;
 
-type Result = usize;
+type Result = i64;
 type Point = (i64, i64);
+type Instruction = (Dir, i64, String);
+type Input = Vec<Instruction>;
 
 #[derive(Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 enum Dir {
@@ -27,10 +28,6 @@ impl Dir {
 }
 use Dir::*;
 
-type Instruction = (Dir, i64, String);
-
-type Input = Vec<Instruction>;
-
 fn parse_input(input: &str) -> Input {
     input
         .trim()
@@ -54,17 +51,17 @@ fn parse_input(input: &str) -> Input {
 
 // ------------------------------------------
 
-fn full_surface(map: &HashSet<Point>) -> usize {
-    let (min_r, max_r) = match map.iter().map(|(r, _)| r).minmax() {
-        itertools::MinMaxResult::NoElements => panic!(),
-        itertools::MinMaxResult::OneElement(v) => (*v, *v),
-        itertools::MinMaxResult::MinMax(min, max) => (*min, *max),
-    };
-    let (min_c, max_c) = match map.iter().map(|(_, c)| c).minmax() {
+fn unwrap_minmax<T: Copy>(mmr: MinMaxResult<&T>) -> (T, T) {
+    match mmr {
         itertools::MinMaxResult::NoElements => panic!(),
         itertools::MinMaxResult::OneElement(v) => (*v, *v),
         itertools::MinMaxResult::MinMax(min, max) => (*min, *max),
-    };
+    }
+}
+
+fn full_surface(map: &HashSet<Point>) -> usize {
+    let (min_r, max_r) = unwrap_minmax(map.iter().map(|(r, _)| r).minmax());
+    let (min_c, max_c) = unwrap_minmax(map.iter().map(|(_, c)| c).minmax());
     let mut fill_map = HashSet::new();
     let mut queue = vec![(min_r - 1, min_c - 1)];
     let lines = &((min_r - 1)..=(max_r + 1));
@@ -104,13 +101,12 @@ fn part1(input: &Input) -> Result {
         }
     }
 
-    full_surface(&map)
+    full_surface(&map) as i64
 }
 
 #[test]
 fn test_part1() {
     let input = parse_input(include_str!("test.txt"));
-    dbg!(&input);
     assert_eq!(part1(&input), 62);
 }
 
@@ -148,7 +144,7 @@ fn part2(input: &Input) -> Result {
             map.push(cur);
         }
     }
-    showlace(&map) as usize
+    showlace(&map)
 }
 
 #[test]