Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI 2024-12 (v0.12) #468

Merged
merged 3 commits into from
Dec 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ci_extras/pin-crate-vers-msrv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ cargo update -p actix-rt --precise 2.9.0
cargo update -p cc --precise 1.0.105
cargo update -p tokio-util --precise 0.7.11
cargo update -p tokio --precise 1.38.1
cargo update -p url --precise 2.5.2
1 change: 1 addition & 0 deletions .ci_extras/pin-crate-vers-nightly.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
set -eux

# Pin some dependencies to specific versions for the nightly toolchain.
# cargo update -p <crate> --precise <version>
# https://github.com/tkaitchuck/aHash/issues/200
cargo update -p ahash --precise 0.8.7
4 changes: 2 additions & 2 deletions src/future/base_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -565,13 +565,13 @@ where
(ins_op, ts)
}

async fn do_post_update_steps<'a>(
async fn do_post_update_steps(
&self,
ts: Instant,
key: Arc<K>,
old_info: OldEntryInfo<K, V>,
upd_op: WriteOp<K, V>,
interrupted_op_ch: &'a Sender<InterruptedOp<K, V>>,
interrupted_op_ch: &Sender<InterruptedOp<K, V>>,
) -> (WriteOp<K, V>, Instant) {
use futures_util::FutureExt;

Expand Down
Loading