From a19567eceab0dd7f5478b83c2ff9ce79754db308 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 13 Sep 2021 14:50:36 +0800 Subject: [PATCH] repository!: rename ObjectIdExt::ancestors_iter() to *::ancestors() (#164) --- experiments/diffing/src/main.rs | 2 +- experiments/traversal/src/main.rs | 4 ++-- git-repository/src/ext/object_id.rs | 4 ++-- gitoxide-core/src/hours.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/experiments/diffing/src/main.rs b/experiments/diffing/src/main.rs index c8201c7081e..656c7853990 100644 --- 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::, _>>()?; let num_diffs = all_commits.len(); let elapsed = start.elapsed(); diff --git a/experiments/traversal/src/main.rs b/experiments/traversal/src/main.rs index e2867998c6e..399828568d5 100644 --- 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::, _>>()?; 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 index 232501440b2..f1066caa6ef 100644 --- 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(self, find: Find) -> Ancestors bool, State> + fn ancestors(self, find: Find) -> Ancestors bool, State> where Find: for<'a> FnMut(&git_hash::oid, &'a mut Vec) -> Option>; @@ -17,7 +17,7 @@ pub trait ObjectIdExt: Sealed { impl Sealed for ObjectId {} impl ObjectIdExt for ObjectId { - fn ancestors_iter(self, find: Find) -> Ancestors bool, State> + fn ancestors(self, find: Find) -> Ancestors bool, State> where Find: for<'a> FnMut(&git_hash::oid, &'a mut Vec) -> Option>, { diff --git a/gitoxide-core/src/hours.rs b/gitoxide-core/src/hours.rs index 6e0510d06f6..b82c435f50a 100644 --- 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::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());