From 82b01c28bbbcd3b8ce346d1977fe7d8587273be6 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sat, 4 Nov 2023 20:33:26 +0100 Subject: [PATCH] thanks clippy --- gix-diff/tests/tree/mod.rs | 4 ++-- gix-negotiate/tests/baseline/mod.rs | 7 ++----- gix-pack/src/data/output/count/objects/mod.rs | 2 +- gix-revwalk/src/graph/mod.rs | 5 ++--- gix-worktree-state/src/checkout/entry.rs | 4 ++-- gix/src/clone/fetch/util.rs | 3 +-- gix/src/ext/tree.rs | 2 +- gix/src/reference/mod.rs | 4 ++-- gix/src/remote/connection/fetch/update_refs/mod.rs | 8 ++------ 9 files changed, 15 insertions(+), 24 deletions(-) diff --git a/gix-diff/tests/tree/mod.rs b/gix-diff/tests/tree/mod.rs index f697def58f1..f853ff259dd 100644 --- a/gix-diff/tests/tree/mod.rs +++ b/gix-diff/tests/tree/mod.rs @@ -61,7 +61,7 @@ mod changes { gix_diff::tree::Changes::from(lhs_tree).needed_to_obtain( rhs_tree, gix_diff::tree::State::default(), - &db, + db, &mut recorder, )?; Ok(recorder.records) @@ -104,7 +104,7 @@ mod changes { gix_diff::tree::Changes::from(previous_tree).needed_to_obtain( current_tree, &mut gix_diff::tree::State::default(), - &db, + db, &mut recorder, )?; Ok(recorder.records) diff --git a/gix-negotiate/tests/baseline/mod.rs b/gix-negotiate/tests/baseline/mod.rs index 4a4620e98cc..0026ce7cc8d 100644 --- a/gix-negotiate/tests/baseline/mod.rs +++ b/gix-negotiate/tests/baseline/mod.rs @@ -1,8 +1,8 @@ use std::cell::RefCell; use gix_negotiate::Algorithm; +use gix_object::FindExt; use gix_object::{bstr, bstr::ByteSlice}; -use gix_object::{Find, FindExt}; use gix_ref::{file::ReferenceExt, store::WriteReflog}; #[test] @@ -35,10 +35,7 @@ fn run() -> crate::Result { .iter() .filter_map(|name| { refs.try_find(*name).expect("one tag per commit").map(|mut r| { - r.peel_to_id_in_place(&refs, &mut |id, buf| { - store.try_find(&id, buf).map(|d| d.map(|d| (d.kind, d.data))) - }) - .expect("works"); + r.peel_to_id_in_place(&refs, &store).expect("works"); r.target.into_id() }) }) diff --git a/gix-pack/src/data/output/count/objects/mod.rs b/gix-pack/src/data/output/count/objects/mod.rs index fd4fff52d7f..f40cf29c97f 100644 --- a/gix-pack/src/data/output/count/objects/mod.rs +++ b/gix-pack/src/data/output/count/objects/mod.rs @@ -247,7 +247,7 @@ mod expand { let objects = CountingObjects::new(db); gix_diff::tree::Changes::from(Some(parent_tree)) .needed_to_obtain( - current_tree_iter.clone(), + current_tree_iter, &mut tree_diff_state, &objects, &mut changes_delegate, diff --git a/gix-revwalk/src/graph/mod.rs b/gix-revwalk/src/graph/mod.rs index 8cd62a7506a..692b53c3258 100644 --- a/gix-revwalk/src/graph/mod.rs +++ b/gix-revwalk/src/graph/mod.rs @@ -262,9 +262,8 @@ impl<'find, T> Graph<'find, T> { /// Lookup `id` and return a handle to it, or fail if it doesn't exist or is no commit. pub fn lookup(&mut self, id: &gix_hash::oid) -> Result, gix_object::find::existing_iter::Error> { - Ok(self - .try_lookup(id)? - .ok_or(gix_object::find::existing_iter::Error::NotFound { oid: id.to_owned() })?) + self.try_lookup(id)? + .ok_or(gix_object::find::existing_iter::Error::NotFound { oid: id.to_owned() }) } } diff --git a/gix-worktree-state/src/checkout/entry.rs b/gix-worktree-state/src/checkout/entry.rs index 6603bf15735..b913c3bbda3 100644 --- a/gix-worktree-state/src/checkout/entry.rs +++ b/gix-worktree-state/src/checkout/entry.rs @@ -86,7 +86,7 @@ where let object_size = match entry.mode { gix_index::entry::Mode::FILE | gix_index::entry::Mode::FILE_EXECUTABLE => { - let obj = (&*objects) + let obj = (*objects) .find_blob(&entry.id, buf) .map_err(|err| crate::checkout::Error::Find { err, @@ -140,7 +140,7 @@ where num_bytes } gix_index::entry::Mode::SYMLINK => { - let obj = (&*objects) + let obj = (*objects) .find_blob(&entry.id, buf) .map_err(|err| crate::checkout::Error::Find { err, diff --git a/gix/src/clone/fetch/util.rs b/gix/src/clone/fetch/util.rs index ca8330f4fb8..627201301de 100644 --- a/gix/src/clone/fetch/util.rs +++ b/gix/src/clone/fetch/util.rs @@ -1,6 +1,5 @@ use std::{borrow::Cow, convert::TryInto, io::Write}; -use gix_object::Find; use gix_ref::{ transaction::{LogChange, RefLog}, FullNameRef, @@ -107,7 +106,7 @@ pub fn update_head( repo.refs .transaction() .packed_refs(gix_ref::file::transaction::PackedRefs::DeletionsAndNonSymbolicUpdates( - Box::new(|oid, buf| repo.objects.try_find(&oid, buf).map(|obj| obj.map(|obj| obj.kind))), + Box::new(&repo.objects), )) .prepare( { diff --git a/gix/src/ext/tree.rs b/gix/src/ext/tree.rs index bf3c3e5ac6e..9aacc9d5808 100644 --- a/gix/src/ext/tree.rs +++ b/gix/src/ext/tree.rs @@ -38,7 +38,7 @@ impl<'d> TreeIterExt for TreeRefIter<'d> { StateMut: BorrowMut, V: gix_traverse::tree::Visit, { - breadthfirst(self.clone(), state, objects, delegate) + breadthfirst(*self, state, objects, delegate) } } diff --git a/gix/src/reference/mod.rs b/gix/src/reference/mod.rs index 5dd71b7dd4d..ebdbf66a717 100644 --- a/gix/src/reference/mod.rs +++ b/gix/src/reference/mod.rs @@ -68,8 +68,8 @@ impl<'repo> Reference<'repo> { /// /// This is useful to learn where this reference is ultimately pointing to. pub fn peel_to_id_in_place(&mut self) -> Result, peel::Error> { - let oid = self.inner.peel_to_id_in_place(&&self.repo.refs, &self.repo.objects)?; - Ok(Id::from_id(oid, &self.repo)) + let oid = self.inner.peel_to_id_in_place(&self.repo.refs, &self.repo.objects)?; + Ok(Id::from_id(oid, self.repo)) } /// Similar to [`peel_to_id_in_place()`][Reference::peel_to_id_in_place()], but consumes this instance. diff --git a/gix/src/remote/connection/fetch/update_refs/mod.rs b/gix/src/remote/connection/fetch/update_refs/mod.rs index 6f45727f95c..c487e7f5c2c 100644 --- a/gix/src/remote/connection/fetch/update_refs/mod.rs +++ b/gix/src/remote/connection/fetch/update_refs/mod.rs @@ -1,7 +1,7 @@ #![allow(clippy::result_large_err)] use std::{collections::BTreeMap, convert::TryInto, path::PathBuf}; -use gix_object::{Exists, Find}; +use gix_object::Exists; use gix_ref::{ transaction::{Change, LogChange, PreviousValue, RefEdit, RefLog}, Target, TargetRef, @@ -325,11 +325,7 @@ pub(crate) fn update( .packed_refs( match write_packed_refs { fetch::WritePackedRefs::Only => { - gix_ref::file::transaction::PackedRefs::DeletionsAndNonSymbolicUpdatesRemoveLooseSourceReference(Box::new(|oid, buf| { - repo.objects - .try_find(&oid, buf) - .map(|obj| obj.map(|obj| obj.kind)) - }))}, + gix_ref::file::transaction::PackedRefs::DeletionsAndNonSymbolicUpdatesRemoveLooseSourceReference(Box::new(&repo.objects))}, fetch::WritePackedRefs::Never => gix_ref::file::transaction::PackedRefs::DeletionsOnly } )