Skip to content

Commit 796427c

Browse files
renovate[bot]epage
andauthored
chore(deps): Update compatible (dev) (#86)
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [divan](https://redirect.github.com/nvzqz/divan) | dev-dependencies | patch | `0.1.14` -> `0.1.17` | | [snapbox](https://redirect.github.com/assert-rs/trycmd/tree/main/crates/snapbox) ([source](https://redirect.github.com/assert-rs/snapbox)) | dev-dependencies | patch | `0.6.19` -> `0.6.21` | --- ### Release Notes <details> <summary>nvzqz/divan (divan)</summary> ### [`v0.1.17`](https://redirect.github.com/nvzqz/divan/blob/HEAD/CHANGELOG.md#0117---2024-12-04) [Compare Source](https://redirect.github.com/nvzqz/divan/compare/v0.1.16...v0.1.17) ##### Changed - Set \[MSRV] to 1.80 for \[`LazyLock`] and new `size_of` prelude import. - Reduced thread pool memory usage by many kilobytes by using rendezvous channels instead of array-based channels. ### [`v0.1.16`](https://redirect.github.com/nvzqz/divan/blob/HEAD/CHANGELOG.md#0116---2024-11-25) [Compare Source](https://redirect.github.com/nvzqz/divan/compare/v0.1.15...v0.1.16) ##### Added - Thread pool for reusing threads across multi-threaded benchmarks. The result is that when running Divan benchmarks under a sampling profiler, the profiler's output will be cleaner and easier to understand. (\[[#&#8203;37](https://redirect.github.com/nvzqz/divan/issues/37)]) - Track the maximum number of allocations during a benchmark. ##### Changed - Make private `Arg::get` trait method not take `self`, so that text editors don't recommend using it. (\[[#&#8203;59](https://redirect.github.com/nvzqz/divan/issues/59)]) - Cache `BenchOptions` using `LazyLock` instead of `OnceLock`, saving space and simplifying the implementation. ### [`v0.1.15`](https://redirect.github.com/nvzqz/divan/blob/HEAD/CHANGELOG.md#0115---2024-10-31) [Compare Source](https://redirect.github.com/nvzqz/divan/compare/v0.1.14...v0.1.15) ##### Added - \[`CyclesCount`] counter to display cycle throughput as Hertz. - Track the maximum number of bytes allocated during a benchmark. ##### Removed - Remove `has_cpuid` polyfill due to it no longer being planned for Rust, since CPUID is assumed to be available on all old x86 Rust targets. ##### Fixed - List generic benchmark type parameter `A<4>` before `A<32>`. (\[[#&#8203;64](https://redirect.github.com/nvzqz/divan/issues/64)]) - Improve precision by using `f64` when calculating allocation count and sizes for the median samples. - Multi-thread allocation counting in `sum_alloc_tallies` on macOS was loading a null pointer instead of the pointer initialized by `sync_threads`. ##### Changes - Sort all output benchmark names [naturally](https://en.wikipedia.org/wiki/Natural_sort_order) instead of [lexicographically](https://en.wikipedia.org/wiki/Lexicographic_order). - Internally reuse \[`&[&str]` slice]\[slice] for \[`args`] names. - Subtract overhead of \[`AllocProfiler`] from timings. Now that Divan also tracks the maximum bytes allocated, the overhead was apparent in timings. - Simplify `ThreadAllocInfo::clear`. - Move measured loop overhead from `SharedContext` to global `OnceLock`. - Macros no longer rely on `std` being re-exported by Divan. Instead they use `::std` or `::core` to greatly simplify code. Although this is technically a breaking change, it is extremely unlikely to do `extern crate std as x`. </details> <details> <summary>assert-rs/snapbox (snapbox)</summary> ### [`v0.6.21`](https://redirect.github.com/assert-rs/snapbox/compare/snapbox-v0.6.20...snapbox-v0.6.21) [Compare Source](https://redirect.github.com/assert-rs/snapbox/compare/snapbox-v0.6.20...snapbox-v0.6.21) ### [`v0.6.20`](https://redirect.github.com/assert-rs/snapbox/compare/snapbox-v0.6.19...snapbox-v0.6.20) [Compare Source](https://redirect.github.com/assert-rs/snapbox/compare/snapbox-v0.6.19...snapbox-v0.6.20) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 5am on the first day of the month" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/gitext-rs/git2-ext). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS44NS4wIiwidXBkYXRlZEluVmVyIjoiMzkuODUuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ed Page <[email protected]>
1 parent 7e0706b commit 796427c

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ resolver = "2"
55
repository = "https://github.com/gitext-rs/git2-ext.git"
66
license = "MIT OR Apache-2.0"
77
edition = "2021"
8-
rust-version = "1.74" # MSRV
8+
rust-version = "1.80" # MSRV
99
include = [
1010
"build.rs",
1111
"src/**/*",

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)