Skip to content

Commit 3a925c0

Browse files
committed
style: Make clippy happy
1 parent da78d3c commit 3a925c0

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/ops.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,8 @@ pub fn cherry_pick(
8080

8181
let mut tip_id = head_id;
8282
while let Some(op) = rebase.next() {
83-
op.map_err(|e| {
83+
op.inspect_err(|_err| {
8484
let _ = rebase.abort();
85-
e
8685
})?;
8786
let inmemory_index = rebase.inmemory_index().unwrap();
8887
if inmemory_index.has_conflicts() {
@@ -122,9 +121,8 @@ pub fn cherry_pick(
122121
// For simple rebases, preserve the original commit time
123122
sig = git2::Signature::new(name, email, &cherry_commit.time())?.to_owned();
124123
}
125-
let commit_id = rebase.commit(None, &sig, None).map_err(|e| {
124+
let commit_id = rebase.commit(None, &sig, None).inspect_err(|_err| {
126125
let _ = rebase.abort();
127-
e
128126
});
129127
let commit_id = match commit_id {
130128
Ok(commit_id) => Ok(commit_id),

0 commit comments

Comments
 (0)