repository!: rename ObjectIdExt::ancestors_iter() to *::ancestors() (#…

…164)
GitoxideLabs · Sep 13, 2021 · a19567e · a19567e
1 parent 1a1959f
commit a19567e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/experiments/diffing/src/main.rs b/experiments/diffing/src/main.rs
@@ -39,7 +39,7 @@ fn main() -> anyhow::Result<()> {
 
     let start = Instant::now();
     let all_commits = commit_id
-        .ancestors_iter(|oid, buf| db.find_commit_iter(oid, buf, &mut odb::pack::cache::Never).ok())
+        .ancestors(|oid, buf| db.find_commit_iter(oid, buf, &mut odb::pack::cache::Never).ok())
         .collect::<Result<Vec<_>, _>>()?;
     let num_diffs = all_commits.len();
     let elapsed = start.elapsed();

diff --git a/experiments/traversal/src/main.rs b/experiments/traversal/src/main.rs
@@ -37,7 +37,7 @@ fn main() -> anyhow::Result<()> {
 
     let start = Instant::now();
     let all_commits = commit_id
-        .ancestors_iter(|oid, buf| db.find_commit_iter(oid, buf, &mut odb::pack::cache::Never).ok())
+        .ancestors(|oid, buf| db.find_commit_iter(oid, buf, &mut odb::pack::cache::Never).ok())
         .collect::<Result<Vec<_>, _>>()?;
     let elapsed = start.elapsed();
     println!(
@@ -146,7 +146,7 @@ where
     C: odb::pack::cache::DecodeEntry,
 {
     let mut cache = new_cache();
-    let ancestors = tip.ancestors_iter(|oid, buf| db.find_commit_iter(oid, buf, &mut cache).ok());
+    let ancestors = tip.ancestors(|oid, buf| db.find_commit_iter(oid, buf, &mut cache).ok());
     let mut commits = 0;
     for commit_id in ancestors {
         let _ = commit_id?;

diff --git a/git-repository/src/ext/object_id.rs b/git-repository/src/ext/object_id.rs
@@ -7,7 +7,7 @@ use crate::easy;
 pub trait Sealed {}
 
 pub trait ObjectIdExt: Sealed {
-    fn ancestors_iter<Find>(self, find: Find) -> Ancestors<Find, fn(&git_hash::oid) -> bool, State>
+    fn ancestors<Find>(self, find: Find) -> Ancestors<Find, fn(&git_hash::oid) -> bool, State>
     where
         Find: for<'a> FnMut(&git_hash::oid, &'a mut Vec<u8>) -> Option<git_object::CommitRefIter<'a>>;
 
@@ -17,7 +17,7 @@ pub trait ObjectIdExt: Sealed {
 impl Sealed for ObjectId {}
 
 impl ObjectIdExt for ObjectId {
-    fn ancestors_iter<Find>(self, find: Find) -> Ancestors<Find, fn(&git_hash::oid) -> bool, State>
+    fn ancestors<Find>(self, find: Find) -> Ancestors<Find, fn(&git_hash::oid) -> bool, State>
     where
         Find: for<'a> FnMut(&git_hash::oid, &'a mut Vec<u8>) -> Option<git_object::CommitRefIter<'a>>,
     {

diff --git a/gitoxide-core/src/hours.rs b/gitoxide-core/src/hours.rs
@@ -66,7 +66,7 @@ where
         let mut pack_cache = odb::pack::cache::Never;
         let mut commits: Vec<Vec<u8>> = Vec::new();
         for c in interrupt::Iter::new(
-            commit_id.ancestors_iter(|oid, buf| {
+            commit_id.ancestors(|oid, buf| {
                 progress.inc();
                 repo.odb.find(oid, buf, &mut pack_cache).ok().map(|o| {
                     commits.push(o.data.to_owned());