Merge branch 'push-oqpkttmvqxvx'

Author: Byron

gitoxide-core/src/repository/mailmap.rs

@@ -45,10 +45,7 @@ pub fn entries(
     }
 
     #[cfg(feature = "serde")]
-    serde_json::to_writer_pretty(
-        out,
-        &mailmap.entries().into_iter().map(JsonEntry::from).collect::<Vec<_>>(),
-    )?;
+    serde_json::to_writer_pretty(out, &mailmap.iter().map(JsonEntry::from).collect::<Vec<_>>())?;
 
     Ok(())
 }

gix-mailmap/src/snapshot/mod.rs

@@ -51,32 +51,40 @@ impl Snapshot {
         self
     }
 
-    /// Transform our acceleration structure into a list of entries.
+    /// Transform our acceleration structure into an iterator of entries.
     ///
     /// Note that the order is different from how they were obtained initially, and are explicitly ordered by
     /// (`old_email`, `old_name`).
-    pub fn entries(&self) -> Vec<crate::Entry<'_>> {
-        let mut out = Vec::with_capacity(self.entries_by_old_email.len());
-        for entry in &self.entries_by_old_email {
-            if entry.new_email.is_some() || entry.new_name.is_some() {
-                out.push(crate::Entry {
+    pub fn iter(&self) -> impl Iterator<Item = crate::Entry<'_>> {
+        self.entries_by_old_email.iter().flat_map(|entry| {
+            let initial = if entry.new_email.is_some() || entry.new_name.is_some() {
+                Some(crate::Entry {
                     new_name: entry.new_name.as_ref().map(|b| b.as_bstr()),
                     new_email: entry.new_email.as_ref().map(|b| b.as_bstr()),
                     old_name: None,
                     old_email: entry.old_email.as_bstr(),
-                });
-            }
+                })
+            } else {
+                None
+            };
 
-            for name_entry in &entry.entries_by_old_name {
-                out.push(crate::Entry {
-                    new_name: name_entry.new_name.as_ref().map(|b| b.as_bstr()),
-                    new_email: name_entry.new_email.as_ref().map(|b| b.as_bstr()),
-                    old_name: name_entry.old_name.as_bstr().into(),
-                    old_email: entry.old_email.as_bstr(),
-                });
-            }
-        }
-        out
+            let rest = entry.entries_by_old_name.iter().map(|name_entry| crate::Entry {
+                new_name: name_entry.new_name.as_ref().map(|b| b.as_bstr()),
+                new_email: name_entry.new_email.as_ref().map(|b| b.as_bstr()),
+                old_name: name_entry.old_name.as_bstr().into(),
+                old_email: entry.old_email.as_bstr(),
+            });
+
+            initial.into_iter().chain(rest)
+        })
+    }
+
+    /// Transform our acceleration structure into a list of entries.
+    ///
+    /// Note that the order is different from how they were obtained initially, and are explicitly ordered by
+    /// (`old_email`, `old_name`).
+    pub fn entries(&self) -> Vec<crate::Entry<'_>> {
+        self.iter().collect()
     }
 
     /// Try to resolve `signature` by its contained email and name and provide resolved/mapped names as reference.

gix-mailmap/tests/snapshot/mod.rs

@@ -1,4 +1,4 @@
-use gix_mailmap::Snapshot;
+use gix_mailmap::{Entry, Snapshot};
 use gix_testtools::fixture_bytes;
 
 #[test]
@@ -54,7 +54,22 @@ fn try_resolve() {
     );
     assert_eq!(snapshot.resolve(sig.to_ref()), sig);
 
-    assert_eq!(snapshot.entries().len(), 6);
+    assert_eq!(
+        snapshot.entries(),
+        &[
+            Entry::change_name_and_email_by_name_and_email("Jane Doe", "[email protected]", "Jane", "[email protected]"),
+            Entry::change_name_and_email_by_name_and_email(
+                "Joe R. Developer",
+                "[email protected]",
+                "Joe",
+                "[email protected]",
+            ),
+            Entry::change_name_and_email_by_email("Jane Doe", "[email protected]", "jane@desktop.(none)"),
+            Entry::change_email_by_name_and_email("[email protected]", "Jane", "Jane@ipad.(none)"),
+            Entry::change_name_and_email_by_email("Jane Doe", "[email protected]", "jane@laptop.(none)"),
+            Entry::change_name_by_email("Joe R. Developer", "[email protected]"),
+        ]
+    );
 }
 
 #[test]
@@ -84,7 +99,18 @@ fn non_name_and_name_mappings_will_not_clash() {
             "it can match by email and name as well"
         );
 
-        assert_eq!(snapshot.entries().len(), 2);
+        assert_eq!(
+            snapshot.entries(),
+            &[
+                Entry::change_name_by_email("new-name", "old-email"),
+                Entry::change_name_and_email_by_name_and_email(
+                    "other-new-name",
+                    "other-new-email",
+                    "old-name",
+                    "old-email"
+                )
+            ]
+        );
     }
 }
 
@@ -115,7 +141,20 @@ fn overwrite_entries() {
         "email by email"
     );
 
-    assert_eq!(snapshot.entries().len(), 4);
+    assert_eq!(
+        snapshot.entries(),
+        &[
+            Entry::change_name_by_email("A-overwritten", "old-a-email"),
+            Entry::change_name_and_email_by_email("B-overwritten", "new-b-email-overwritten", "old-b-email"),
+            Entry::change_name_and_email_by_name_and_email(
+                "C-overwritten",
+                "new-c-email-overwritten",
+                "old-C",
+                "old-c-email"
+            ),
+            Entry::change_email_by_email("new-d-email-overwritten", "old-d-email")
+        ]
+    );
 }
 
 fn signature(name: &str, email: &str) -> gix_actor::Signature {