From 6d0027c14f7f92d9f895c60aebc84e4db8478d70 Mon Sep 17 00:00:00 2001
From: Mick Grove <mick.grove@mongodb.com>
Date: Fri, 15 Aug 2025 09:07:25 -0700
Subject: [PATCH] code cleanup'

---
 .gitignore                 |  1 +
 src/git_commit_metadata.rs | 11 +++++-
 src/git_metadata_graph.rs  | 79 +++++++++++++++++++++++++-------------
 src/git_repo_enumerator.rs | 79 +++++++++++++++++---------------------
 src/lib.rs                 | 28 --------------
 5 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/.gitignore b/.gitignore
index fb40dee..8cd8f36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 .prettierrc
 custom.py
 logs/*
+*.patch
 
 ### macOS ###
 # General
diff --git a/src/git_commit_metadata.rs b/src/git_commit_metadata.rs
index 390e1f8..75540d3 100644
--- a/src/git_commit_metadata.rs
+++ b/src/git_commit_metadata.rs
@@ -5,7 +5,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::serde_utils::BStringLossyUtf8;
 
-#[derive(Serialize, Deserialize)]
+#[repr(transparent)]
+#[derive(Serialize, Deserialize, Copy, Clone)]
 #[serde(remote = "Time")]
 struct TextTime(
     #[serde(
@@ -27,10 +28,13 @@ impl From<Time> for TextTime {
 }
 mod text_time {
     use super::*;
+
+    #[inline]
     pub fn getter(v: &Time) -> &Time {
         v
     }
 
+    #[inline]
     pub fn serialize<S: serde::Serializer>(v: &Time, serializer: S) -> Result<S::Ok, S::Error> {
         serializer.collect_str(v)
     }
@@ -59,7 +63,8 @@ impl JsonSchema for TextTime {
     }
 }
 
-#[derive(Serialize, Deserialize)]
+#[repr(transparent)]
+#[derive(Serialize, Deserialize, Copy, Clone)]
 #[serde(remote = "ObjectId")]
 struct HexObjectId(
     #[serde(
@@ -82,11 +87,13 @@ impl From<HexObjectId> for ObjectId {
 mod hex_object_id {
     use super::*;
 
+    #[inline]
     pub fn getter(v: &ObjectId) -> &ObjectId {
         v
     }
 
     // Use `collect_str` to avoid intermediate string allocations:
+    #[inline]
     pub fn serialize<S: serde::Serializer>(v: &ObjectId, serializer: S) -> Result<S::Ok, S::Error> {
         serializer.collect_str(&v.to_hex())
     }
diff --git a/src/git_metadata_graph.rs b/src/git_metadata_graph.rs
index 4a45940..bf51b96 100644
--- a/src/git_metadata_graph.rs
+++ b/src/git_metadata_graph.rs
@@ -19,7 +19,7 @@ use roaring::RoaringBitmap;
 use smallvec::SmallVec;
 use tracing::{debug, error_span, warn};
 
-use crate::{bstring_table::BStringTable, unwrap_ok_or_continue, unwrap_some_or_continue};
+use crate::bstring_table::BStringTable;
 
 type Symbol = crate::bstring_table::Symbol<u32>;
 
@@ -140,15 +140,25 @@ impl RepositoryIndex {
         let mut num_blobs = 0;
         let mut num_commits = 0;
 
-        for oid in odb
+        for oid_result in odb
             .iter()
             .context("Failed to iterate object database")?
             .with_ordering(Ordering::PackLexicographicalThenLooseLexicographical)
         {
-            let oid = unwrap_ok_or_continue!(oid, |e| debug!("Failed to read object id: {e}"));
-            let hdr = unwrap_ok_or_continue!(odb.header(oid), |e| {
-                debug!("Failed to read object header for {oid}: {e}")
-            });
+            let oid = match oid_result {
+                Ok(oid) => oid,
+                Err(e) => {
+                    debug!("Failed to read object id: {e}");
+                    continue;
+                }
+            };
+            let hdr = match odb.header(oid) {
+                Ok(hdr) => hdr,
+                Err(e) => {
+                    debug!("Failed to read object header for {oid}: {e}");
+                    continue;
+                }
+            };
             match hdr.kind() {
                 Kind::Tree => num_trees += 1,
                 Kind::Blob => num_blobs += 1,
@@ -161,15 +171,25 @@ impl RepositoryIndex {
         let mut commits = ObjectIdBimap::with_capacity(num_commits);
         let mut blobs = ObjectIdBimap::with_capacity(num_blobs);
         let mut tags = ObjectIdBimap::with_capacity(num_tags);
-        for oid in odb
+        for oid_result in odb
             .iter()
             .context("Failed to iterate object database")?
             .with_ordering(Ordering::PackAscendingOffsetThenLooseLexicographical)
         {
-            let oid = unwrap_ok_or_continue!(oid, |e| debug!("Failed to read object id: {e}"));
-            let hdr = unwrap_ok_or_continue!(odb.header(oid), |e| {
-                debug!("Failed to read object header for {oid}: {e}")
-            });
+            let oid = match oid_result {
+                Ok(oid) => oid,
+                Err(e) => {
+                    debug!("Failed to read object id: {e}");
+                    continue;
+                }
+            };
+            let hdr = match odb.header(oid) {
+                Ok(hdr) => hdr,
+                Err(e) => {
+                    debug!("Failed to read object header for {oid}: {e}");
+                    continue;
+                }
+            };
             match hdr.kind() {
                 Kind::Tree => trees.insert(oid),
                 Kind::Blob => blobs.insert(oid),
@@ -400,22 +420,29 @@ fn visit_tree(
 ) -> Result<()> {
     blobs_encountered.clear();
     while let Some((name_path, tree_oid)) = tree_worklist.pop() {
-        let tree_iter = unwrap_ok_or_continue!(
-            repo.objects.find_tree_iter(&tree_oid, tree_buf),
-            |e| debug!("Failed to find tree {tree_oid}: {e}")
-        );
+        let tree_iter = match repo.objects.find_tree_iter(&tree_oid, tree_buf) {
+            Ok(iter) => iter,
+            Err(e) => {
+                debug!("Failed to find tree {tree_oid}: {e}");
+                continue;
+            }
+        };
         *num_trees_introduced += 1;
         for child_res in tree_iter {
-            let child = unwrap_ok_or_continue!(child_res, |e| {
-                debug!("Failed reading entry from {tree_oid}: {e}")
-            });
+            let child = match child_res {
+                Ok(child) => child,
+                Err(e) => {
+                    debug!("Failed reading entry from {tree_oid}: {e}");
+                    continue;
+                }
+            };
             match child.mode.kind() {
                 EntryKind::Link | EntryKind::Commit => {}
                 EntryKind::Tree => {
-                    let child_idx =
-                        unwrap_some_or_continue!(repo_index.get_tree_index(child.oid), || {
-                            debug!("No index for {} in tree {tree_oid}", child.oid)
-                        });
+                    let Some(child_idx) = repo_index.get_tree_index(child.oid) else {
+                        debug!("No index for {} in tree {tree_oid}", child.oid);
+                        continue;
+                    };
                     if seen.insert_tree(child_idx)? {
                         let mut new_path = name_path.clone();
                         new_path.push(symbols.get_or_intern(child.filename.into()));
@@ -423,10 +450,10 @@ fn visit_tree(
                     }
                 }
                 EntryKind::Blob | EntryKind::BlobExecutable => {
-                    let child_idx =
-                        unwrap_some_or_continue!(repo_index.get_blob_index(child.oid), || {
-                            debug!("No blob index for {} in tree {tree_oid}", child.oid)
-                        });
+                    let Some(child_idx) = repo_index.get_blob_index(child.oid) else {
+                        debug!("No blob index for {} in tree {tree_oid}", child.oid);
+                        continue;
+                    };
                     if !seen.contains_blob(child_idx)? {
                         blobs_encountered.push(child_idx);
                         *num_blobs_introduced += 1;
diff --git a/src/git_repo_enumerator.rs b/src/git_repo_enumerator.rs
index 9b3151e..3f3d93d 100644
--- a/src/git_repo_enumerator.rs
+++ b/src/git_repo_enumerator.rs
@@ -21,36 +21,8 @@ use crate::{
     git_metadata_graph::{GitMetadataGraph, RepositoryIndex},
 };
 
-// Macros unchanged:
-macro_rules! unwrap_some_or_continue {
-    ($arg:expr, $on_error:expr $(,)?) => {
-        match $arg {
-            Some(v) => v,
-            None => {
-                #[allow(clippy::redundant_closure_call)]
-                $on_error();
-                continue;
-            }
-        }
-    };
-}
-pub(crate) use unwrap_some_or_continue;
-
-macro_rules! unwrap_ok_or_continue {
-    ($arg:expr, $on_error:expr $(,)?) => {
-        match $arg {
-            Ok(v) => v,
-            Err(e) => {
-                #[allow(clippy::redundant_closure_call)]
-                $on_error(e);
-                continue;
-            }
-        }
-    };
-}
-pub(crate) use unwrap_ok_or_continue;
-
 // Convert "<seconds> <offset>" -- Time; fallback to the Unix-epoch on parse error
+#[inline]
 fn parse_sig_time<T: AsRef<[u8]>>(raw: T) -> Time {
     match std::str::from_utf8(raw.as_ref()) {
         Ok(s) => parse_time(s, None).unwrap_or_else(|_| Time::new(0, 0)),
@@ -106,13 +78,21 @@ impl<'a> GitRepoWithMetadataEnumerator<'a> {
 
         // Collect commit metadata and build commit graph
         for commit_oid in object_index.commits() {
-            let commit = unwrap_ok_or_continue!(odb.find_commit(commit_oid, &mut scratch), |e| {
-                debug!("Failed to find commit {commit_oid}: {e}");
-            });
+            let commit = match odb.find_commit(commit_oid, &mut scratch) {
+                Ok(commit) => commit,
+                Err(e) => {
+                    debug!("Failed to find commit {commit_oid}: {e}");
+                    continue;
+                }
+            };
             let tree_oid = commit.tree();
-            let tree_idx = unwrap_some_or_continue!(object_index.get_tree_index(&tree_oid), || {
-                debug!("Failed to find tree {tree_oid} for commit {commit_oid}");
-            });
+            let tree_idx = match object_index.get_tree_index(&tree_oid) {
+                Some(idx) => idx,
+                None => {
+                    debug!("Failed to find tree {tree_oid} for commit {commit_oid}");
+                    continue;
+                }
+            };
             let commit_idx = metadata_graph.get_commit_idx(*commit_oid, Some(tree_idx));
 
             for parent_oid in commit.parents() {
@@ -158,9 +138,13 @@ impl<'a> GitRepoWithMetadataEnumerator<'a> {
                     all_blobs.into_iter().map(|b| (b, SmallVec::new())).collect();
 
                 for e in metadata {
-                    let cm = unwrap_some_or_continue!(commit_metadata.get(&e.commit_oid), || {
-                        debug!("Missing commit metadata for {}", e.commit_oid);
-                    });
+                    let cm = match commit_metadata.get(&e.commit_oid) {
+                        Some(cm) => cm,
+                        None => {
+                            debug!("Missing commit metadata for {}", e.commit_oid);
+                            continue;
+                        }
+                    };
                     for (blob_oid, path) in e.introduced_blobs {
                         blob_map
                             .entry(blob_oid)
@@ -228,11 +212,20 @@ impl<'a> GitRepoEnumerator<'a> {
             .context("Failed to iterate object database")?
             .with_ordering(Ordering::PackAscendingOffsetThenLooseLexicographical)
         {
-            let oid =
-                unwrap_ok_or_continue!(oid_result, |e| debug!("Failed to read object id: {e}"));
-            let hdr = unwrap_ok_or_continue!(odb.header(oid), |e| {
-                debug!("Failed to read object header for {oid}: {e}")
-            });
+            let oid = match oid_result {
+                Ok(oid) => oid,
+                Err(e) => {
+                    debug!("Failed to read object id: {e}");
+                    continue;
+                }
+            };
+            let hdr = match odb.header(oid) {
+                Ok(hdr) => hdr,
+                Err(e) => {
+                    debug!("Failed to read object header for {oid}: {e}");
+                    continue;
+                }
+            };
 
             if hdr.kind() == Kind::Blob {
                 blobs.push(oid);
diff --git a/src/lib.rs b/src/lib.rs
index a531c4a..4c3763f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -54,34 +54,6 @@ use ignore::{DirEntry, WalkBuilder, WalkState};
 use tokio::time::Duration;
 use tracing::debug;
 
-macro_rules! unwrap_some_or_continue {
-    ($arg:expr, $on_error:expr $(,)?) => {
-        match $arg {
-            Some(v) => v,
-            None => {
-                #[allow(clippy::redundant_closure_call)]
-                $on_error();
-                continue;
-            }
-        }
-    };
-}
-pub(crate) use unwrap_some_or_continue;
-
-macro_rules! unwrap_ok_or_continue {
-    ($arg:expr, $on_error:expr $(,)?) => {
-        match $arg {
-            Ok(v) => v,
-            Err(e) => {
-                #[allow(clippy::redundant_closure_call)]
-                $on_error(e);
-                continue;
-            }
-        }
-    };
-}
-pub(crate) use unwrap_ok_or_continue;
-
 struct EnumeratorConfig {
     enumerate_git_history: bool,
     collect_git_metadata: bool,