Gitbutler >:(

I don't understand this piece of software at all

orchid-base/src/join.rs

@@ -12,7 +12,11 @@ pub fn join_maps<K: Eq + Hash, V>(
   right: HashMap<K, V>,
   mut merge: impl FnMut(&K, V, V) -> V,
 ) -> HashMap<K, V> {
-  try_join_maps(left, right, |k, l, r| Ok(merge(k, l, r))).unwrap_or_else(|e: Never| match e {})
+  let (val, ev) = try_join_maps::<K, V, Never>(left, right, |k, l, r| Ok(merge(k, l, r)));
+  if let Some(e) = ev.first() {
+    match *e {}
+  }
+  val
 }
 
 /// Combine two hashmaps via a fallible value merger. See also [join_maps]
@@ -20,15 +24,22 @@ pub fn try_join_maps<K: Eq + Hash, V, E>(
   left: HashMap<K, V>,
   mut right: HashMap<K, V>,
   mut merge: impl FnMut(&K, V, V) -> Result<V, E>,
-) -> Result<HashMap<K, V>, E> {
+) -> (HashMap<K, V>, Vec<E>) {
   let mut mixed = HashMap::with_capacity(left.len() + right.len());
+  let mut errors = Vec::new();
   for (key, lval) in left {
     let val = match right.remove(&key) {
       None => lval,
-      Some(rval) => merge(&key, lval, rval)?,
+      Some(rval) => match merge(&key, lval, rval) {
+        Ok(v) => v,
+        Err(e) => {
+          errors.push(e);
+          continue;
+        },
+      },
     };
     mixed.insert(key, val);
   }
   mixed.extend(right);
-  Ok(mixed)
+  (mixed, errors)
 }