Don't recurse, use loop instead

Return `Entry` instead of `EntryRef`. `EntryRef` needs the underlying
data to be kept by `TreeRef`, but `lookup_entry` only temporarily loads
sub-trees, so there is no data to return a reference to.

Author: cruessler

gix-object/src/tree/ref_iter.rs

@@ -59,23 +59,24 @@ impl<'a> TreeRef<'a> {
         odb: impl crate::Find + crate::FindExt,
         buffer: &'a mut Vec<u8>,
         path: I,
-    ) -> Result<Option<EntryRef<'a>>, Error>
+    ) -> Result<Option<tree::Entry>, Error>
     where
         I: IntoIterator<Item = P>,
         P: PartialEq<BStr>,
     {
         let mut path = path.into_iter().peekable();
+        let mut entries = self.entries.clone();
 
         while let Some(component) = path.next() {
-            match self.entries.iter().find(|entry| component.eq(entry.filename)) {
+            match entries.iter().find(|entry| component.eq(entry.filename)) {
                 Some(entry) => {
                     if path.peek().is_none() {
-                        return Ok(Some(*entry));
+                        return Ok(Some((*entry).into()));
                     } else {
                         let next_id = entry.oid.to_owned();
                         let obj = odb.find_tree(&next_id, buffer)?;
 
-                        return obj.lookup_entry(odb, buffer, path);
+                        entries = obj.entries;
                     }
                 }
                 None => return Ok(None),
@@ -95,7 +96,7 @@ impl<'a> TreeRef<'a> {
         odb: impl crate::Find,
         buffer: &'a mut Vec<u8>,
         relative_path: impl AsRef<std::path::Path>,
-    ) -> Result<Option<EntryRef<'a>>, Error> {
+    ) -> Result<Option<tree::Entry>, Error> {
         use crate::bstr::ByteSlice;
         self.lookup_entry(
             odb,

gix-object/tests/object/tree/iter.rs

@@ -1,6 +1,6 @@
 use gix_object::{
     bstr::ByteSlice,
-    tree::{self, EntryRef},
+    tree::{self, Entry, EntryRef},
     FindExt, TreeRefIter,
 };
 use pretty_assertions::assert_eq;
@@ -69,7 +69,7 @@ fn lookup_entry_toplevel() -> crate::Result {
     let mut buf = Vec::new();
     let entry = root_tree.lookup_entry_by_path(&odb, &mut buf, "bin").unwrap().unwrap();
 
-    assert!(matches!(entry, EntryRef { .. }));
+    assert!(matches!(entry, Entry { .. }));
     assert_eq!(entry.filename, "bin");
 
     Ok(())
@@ -89,7 +89,7 @@ fn lookup_entry_nested_path() -> crate::Result {
         .unwrap()
         .unwrap();
 
-    assert!(matches!(entry, EntryRef { .. }));
+    assert!(matches!(entry, Entry { .. }));
     assert_eq!(entry.filename, "a");
 
     Ok(())