Day 8

Author: prevostc

src/bin/08.rs

@@ -22,7 +22,8 @@ fn solve(
         grid.iter_item_and_position()
             .filter(|(_, &c)| c != '.')
             .map(|(point, c)| (c, point)),
-    );
+    )
+    .unwrap();
 
     let mut pos_set: HeaplessHashSet<Point, 2048> = HeaplessHashSet::new();
     for (_, vec) in antennas.iter() {

src/lib.rs

@@ -7,25 +7,33 @@ use heapless::Vec as HeaplessVec;
 
 // Use this file to add helper functions and additional modules.
 
+#[derive(Debug)]
+pub enum GroupMapError<V, K> {
+    VecInsertError(V),
+    HashMapInsertError(K),
+}
+
 pub fn into_group_map_heapless<const M: usize, const N: usize, I, K, V>(
     iter: I,
-) -> HeaplessHashMap<K, HeaplessVec<V, M>, N>
+) -> Result<HeaplessHashMap<K, HeaplessVec<V, M>, N>, GroupMapError<V, K>>
 where
     V: Clone + Debug,
     I: Iterator<Item = (K, V)>,
     K: Hash + Eq + Debug,
 {
     let mut lookup: HeaplessHashMap<K, HeaplessVec<V, M>, N> = HeaplessHashMap::new();
 
-    iter.for_each(|(key, val)| {
+    for (key, val) in iter {
         if let Some(vec) = lookup.get_mut(&key) {
-            vec.push(val).unwrap();
+            vec.push(val).map_err(GroupMapError::VecInsertError)?;
         } else {
             let mut vec = HeaplessVec::new();
-            vec.push(val).unwrap();
-            lookup.insert(key, vec).unwrap();
+            vec.push(val).map_err(GroupMapError::VecInsertError)?;
+            lookup
+                .insert(key, vec)
+                .map_err(|(k, _)| GroupMapError::HashMapInsertError(k))?;
         }
-    });
+    }
 
-    lookup
+    Ok(lookup)
 }