diff --git a/Cargo.lock b/Cargo.lock index 06e0a65..e104e52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -205,9 +205,9 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "divan" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d567df2c9c2870a43f3f2bd65aaeb18dbce1c18f217c3e564b4fbaeb3ee56c" +checksum = "e0583193020b29b03682d8d33bb53a5b0f50df6daacece12ca99b904cfdcb8c4" dependencies = [ "cfg-if", "clap", @@ -219,9 +219,9 @@ dependencies = [ [[package]] name = "divan-macros" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27540baf49be0d484d8f0130d7d8da3011c32a44d4fc873368154f1510e574a2" +checksum = "8dc51d98e636f5e3b0759a39257458b22619cac7e96d932da6eeb052891bb67c" dependencies = [ "proc-macro2", "quote", @@ -778,9 +778,9 @@ checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" [[package]] name = "snapbox" -version = "0.6.19" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881f1849454828a68363dd288b7a0a071e55e2a4356d2c38b567db18a9be0d9f" +checksum = "96dcfc4581e3355d70ac2ee14cfdf81dce3d85c85f1ed9e2c1d3013f53b3436b" dependencies = [ "anstream", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index c088193..c24054a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ resolver = "2" repository = "https://github.com/gitext-rs/git2-ext.git" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.74" # MSRV +rust-version = "1.80" # MSRV include = [ "build.rs", "src/**/*", diff --git a/src/ops.rs b/src/ops.rs index 84522dc..d1ea984 100644 --- a/src/ops.rs +++ b/src/ops.rs @@ -80,9 +80,8 @@ pub fn cherry_pick( let mut tip_id = head_id; while let Some(op) = rebase.next() { - op.map_err(|e| { + op.inspect_err(|_err| { let _ = rebase.abort(); - e })?; let inmemory_index = rebase.inmemory_index().unwrap(); if inmemory_index.has_conflicts() { @@ -122,9 +121,8 @@ pub fn cherry_pick( // For simple rebases, preserve the original commit time sig = git2::Signature::new(name, email, &cherry_commit.time())?.to_owned(); } - let commit_id = rebase.commit(None, &sig, None).map_err(|e| { + let commit_id = rebase.commit(None, &sig, None).inspect_err(|_err| { let _ = rebase.abort(); - e }); let commit_id = match commit_id { Ok(commit_id) => Ok(commit_id),