Skip to content

Commit 82b01c2

Browse files
committed
thanks clippy
1 parent 5761a4d commit 82b01c2

File tree

9 files changed

+15
-24
lines changed

9 files changed

+15
-24
lines changed

gix-diff/tests/tree/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ mod changes {
6161
gix_diff::tree::Changes::from(lhs_tree).needed_to_obtain(
6262
rhs_tree,
6363
gix_diff::tree::State::default(),
64-
&db,
64+
db,
6565
&mut recorder,
6666
)?;
6767
Ok(recorder.records)
@@ -104,7 +104,7 @@ mod changes {
104104
gix_diff::tree::Changes::from(previous_tree).needed_to_obtain(
105105
current_tree,
106106
&mut gix_diff::tree::State::default(),
107-
&db,
107+
db,
108108
&mut recorder,
109109
)?;
110110
Ok(recorder.records)

gix-negotiate/tests/baseline/mod.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::cell::RefCell;
22

33
use gix_negotiate::Algorithm;
4+
use gix_object::FindExt;
45
use gix_object::{bstr, bstr::ByteSlice};
5-
use gix_object::{Find, FindExt};
66
use gix_ref::{file::ReferenceExt, store::WriteReflog};
77

88
#[test]
@@ -35,10 +35,7 @@ fn run() -> crate::Result {
3535
.iter()
3636
.filter_map(|name| {
3737
refs.try_find(*name).expect("one tag per commit").map(|mut r| {
38-
r.peel_to_id_in_place(&refs, &mut |id, buf| {
39-
store.try_find(&id, buf).map(|d| d.map(|d| (d.kind, d.data)))
40-
})
41-
.expect("works");
38+
r.peel_to_id_in_place(&refs, &store).expect("works");
4239
r.target.into_id()
4340
})
4441
})

gix-pack/src/data/output/count/objects/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ mod expand {
247247
let objects = CountingObjects::new(db);
248248
gix_diff::tree::Changes::from(Some(parent_tree))
249249
.needed_to_obtain(
250-
current_tree_iter.clone(),
250+
current_tree_iter,
251251
&mut tree_diff_state,
252252
&objects,
253253
&mut changes_delegate,

gix-revwalk/src/graph/mod.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,8 @@ impl<'find, T> Graph<'find, T> {
262262

263263
/// Lookup `id` and return a handle to it, or fail if it doesn't exist or is no commit.
264264
pub fn lookup(&mut self, id: &gix_hash::oid) -> Result<LazyCommit<'_>, gix_object::find::existing_iter::Error> {
265-
Ok(self
266-
.try_lookup(id)?
267-
.ok_or(gix_object::find::existing_iter::Error::NotFound { oid: id.to_owned() })?)
265+
self.try_lookup(id)?
266+
.ok_or(gix_object::find::existing_iter::Error::NotFound { oid: id.to_owned() })
268267
}
269268
}
270269

gix-worktree-state/src/checkout/entry.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ where
8686

8787
let object_size = match entry.mode {
8888
gix_index::entry::Mode::FILE | gix_index::entry::Mode::FILE_EXECUTABLE => {
89-
let obj = (&*objects)
89+
let obj = (*objects)
9090
.find_blob(&entry.id, buf)
9191
.map_err(|err| crate::checkout::Error::Find {
9292
err,
@@ -140,7 +140,7 @@ where
140140
num_bytes
141141
}
142142
gix_index::entry::Mode::SYMLINK => {
143-
let obj = (&*objects)
143+
let obj = (*objects)
144144
.find_blob(&entry.id, buf)
145145
.map_err(|err| crate::checkout::Error::Find {
146146
err,

gix/src/clone/fetch/util.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::{borrow::Cow, convert::TryInto, io::Write};
22

3-
use gix_object::Find;
43
use gix_ref::{
54
transaction::{LogChange, RefLog},
65
FullNameRef,
@@ -107,7 +106,7 @@ pub fn update_head(
107106
repo.refs
108107
.transaction()
109108
.packed_refs(gix_ref::file::transaction::PackedRefs::DeletionsAndNonSymbolicUpdates(
110-
Box::new(|oid, buf| repo.objects.try_find(&oid, buf).map(|obj| obj.map(|obj| obj.kind))),
109+
Box::new(&repo.objects),
111110
))
112111
.prepare(
113112
{

gix/src/ext/tree.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl<'d> TreeIterExt for TreeRefIter<'d> {
3838
StateMut: BorrowMut<breadthfirst::State>,
3939
V: gix_traverse::tree::Visit,
4040
{
41-
breadthfirst(self.clone(), state, objects, delegate)
41+
breadthfirst(*self, state, objects, delegate)
4242
}
4343
}
4444

gix/src/reference/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ impl<'repo> Reference<'repo> {
6868
///
6969
/// This is useful to learn where this reference is ultimately pointing to.
7070
pub fn peel_to_id_in_place(&mut self) -> Result<Id<'repo>, peel::Error> {
71-
let oid = self.inner.peel_to_id_in_place(&&self.repo.refs, &self.repo.objects)?;
72-
Ok(Id::from_id(oid, &self.repo))
71+
let oid = self.inner.peel_to_id_in_place(&self.repo.refs, &self.repo.objects)?;
72+
Ok(Id::from_id(oid, self.repo))
7373
}
7474

7575
/// Similar to [`peel_to_id_in_place()`][Reference::peel_to_id_in_place()], but consumes this instance.

gix/src/remote/connection/fetch/update_refs/mod.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![allow(clippy::result_large_err)]
22
use std::{collections::BTreeMap, convert::TryInto, path::PathBuf};
33

4-
use gix_object::{Exists, Find};
4+
use gix_object::Exists;
55
use gix_ref::{
66
transaction::{Change, LogChange, PreviousValue, RefEdit, RefLog},
77
Target, TargetRef,
@@ -325,11 +325,7 @@ pub(crate) fn update(
325325
.packed_refs(
326326
match write_packed_refs {
327327
fetch::WritePackedRefs::Only => {
328-
gix_ref::file::transaction::PackedRefs::DeletionsAndNonSymbolicUpdatesRemoveLooseSourceReference(Box::new(|oid, buf| {
329-
repo.objects
330-
.try_find(&oid, buf)
331-
.map(|obj| obj.map(|obj| obj.kind))
332-
}))},
328+
gix_ref::file::transaction::PackedRefs::DeletionsAndNonSymbolicUpdatesRemoveLooseSourceReference(Box::new(&repo.objects))},
333329
fetch::WritePackedRefs::Never => gix_ref::file::transaction::PackedRefs::DeletionsOnly
334330
}
335331
)

0 commit comments

Comments
 (0)