From 92805da89077f59a076ea41dbab7dd07a628f3f3 Mon Sep 17 00:00:00 2001 From: Graham King Date: Mon, 6 Jul 2026 12:45:38 -0400 Subject: [PATCH 1/2] chore: Upgrade Rust to latest stable, 1.96.1 New lints: - `zip` takes things that implement `IntoIter` so the `.into_iter()` calls were unnecessary. - `sort_by_key` is typically more efficient than `sort_by`. - Use `checked_div` removes the need to check divisor is not 0. - Use `while let ..` instead of `loop { let ..` Signed-off-by: Graham King --- container/templates/dynamo_base.Dockerfile | 2 +- deploy/inference-gateway/epp/Dockerfile | 2 +- deploy/inference-gateway/epp/Makefile | 2 +- deploy/inference-gateway/ext-proc/Dockerfile | 2 +- deploy/inference-gateway/ext-proc/Makefile | 2 +- docs/development/custom-containers.md | 2 +- docs/development/unified-backends.md | 2 +- .../vllm/connector/leader/slot.rs | 8 ++-- lib/kv-router/src/indexer/branch_sharded.rs | 25 ++++++----- lib/kv-router/src/indexer/pruning.rs | 24 +++++------ lib/kvbm-engine/CLAUDE.md | 2 +- .../src/leader/session/initiator.rs | 8 ++-- lib/kvbm-engine/src/worker/group/spmd.rs | 4 +- lib/kvbm-physical/src/layout/config.rs | 6 +-- .../block_manager/pool/managed/inactive.rs | 4 +- lib/llm/src/preprocessor.rs | 4 +- .../openai/chat_completions/aggregator.rs | 14 +++---- .../openai/completions/aggregator.rs | 4 +- lib/mocker/src/replay/offline/single.rs | 42 +++++++++---------- lib/mocker/src/scheduler/sglang/core.rs | 12 +----- lib/mocker/src/scheduler/sglang/decode.rs | 6 +-- lib/runtime/examples/rust-toolchain.toml | 2 +- .../system_metrics/tests/integration_test.rs | 1 - .../src/pipeline/network/egress/tcp_client.rs | 13 ++---- lib/runtime/src/transports/nats.rs | 1 + rust-toolchain.toml | 2 +- tests/parity/README.md | 2 +- 27 files changed, 82 insertions(+), 116 deletions(-) diff --git a/container/templates/dynamo_base.Dockerfile b/container/templates/dynamo_base.Dockerfile index f38d61cdda35..c66d32c35ec0 100644 --- a/container/templates/dynamo_base.Dockerfile +++ b/container/templates/dynamo_base.Dockerfile @@ -52,7 +52,7 @@ ENV PATH=/usr/local/bin/etcd/:$PATH ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.93.1 + RUST_VERSION=1.96.1 # Install Rust — ARCH_ALT (x86_64/aarch64) is derived from TARGETARCH at build time RUN ARCH_ALT=$([ "${TARGETARCH}" = "amd64" ] && echo "x86_64" || echo "aarch64") && \ diff --git a/deploy/inference-gateway/epp/Dockerfile b/deploy/inference-gateway/epp/Dockerfile index c3ad2b898ddf..ea1ca7115aa6 100644 --- a/deploy/inference-gateway/epp/Dockerfile +++ b/deploy/inference-gateway/epp/Dockerfile @@ -31,7 +31,7 @@ # --build-context dynamo=../../.. \ # -t dynamo/dynamo-epp:dev . -ARG RUST_IMAGE=rust:1.93.1 +ARG RUST_IMAGE=rust:1.96.1 ARG BUILDER_IMAGE=golang:1.26.3 ARG BASE_IMAGE=ubuntu:24.04 diff --git a/deploy/inference-gateway/epp/Makefile b/deploy/inference-gateway/epp/Makefile index 6d509042b269..c6558fb2877b 100644 --- a/deploy/inference-gateway/epp/Makefile +++ b/deploy/inference-gateway/epp/Makefile @@ -35,7 +35,7 @@ SCCACHE_REGION ?= DOCKER_BUILDX_CMD ?= docker buildx IMAGE_BUILD_CMD ?= $(DOCKER_BUILDX_CMD) build -RUST_IMAGE ?= $(DOCKER_PROXY)library/rust:1.93.1 +RUST_IMAGE ?= $(DOCKER_PROXY)library/rust:1.96.1 BUILDER_IMAGE ?= $(DOCKER_PROXY)library/golang:1.26.3 BASE_IMAGE ?= $(DOCKER_PROXY)library/ubuntu:24.04 diff --git a/deploy/inference-gateway/ext-proc/Dockerfile b/deploy/inference-gateway/ext-proc/Dockerfile index 10561e9cfa17..ef48ad131f28 100644 --- a/deploy/inference-gateway/ext-proc/Dockerfile +++ b/deploy/inference-gateway/ext-proc/Dockerfile @@ -15,7 +15,7 @@ # --build-context dynamo=../../.. \ # -t dynamo/dynamo-rust-epp:dev . -ARG RUST_IMAGE=rust:1.93.1 +ARG RUST_IMAGE=rust:1.96.1 ARG BASE_IMAGE=ubuntu:24.04 # ============================================================================= diff --git a/deploy/inference-gateway/ext-proc/Makefile b/deploy/inference-gateway/ext-proc/Makefile index db53f7364665..0e5df9e2d751 100644 --- a/deploy/inference-gateway/ext-proc/Makefile +++ b/deploy/inference-gateway/ext-proc/Makefile @@ -34,7 +34,7 @@ SCCACHE_REGION ?= DOCKER_BUILDX_CMD ?= docker buildx IMAGE_BUILD_CMD ?= $(DOCKER_BUILDX_CMD) build -RUST_IMAGE ?= $(DOCKER_PROXY)rust:1.93.1 +RUST_IMAGE ?= $(DOCKER_PROXY)rust:1.96.1 BASE_IMAGE ?= $(DOCKER_PROXY)ubuntu:24.04 # Container tool diff --git a/docs/development/custom-containers.md b/docs/development/custom-containers.md index aa1d817ced24..d4459702a73e 100644 --- a/docs/development/custom-containers.md +++ b/docs/development/custom-containers.md @@ -58,7 +58,7 @@ ENTRYPOINT ["my-backend"] For a Rust custom backend, build the backend binary in your own builder stage and copy it into the Dynamo runtime image: ```Dockerfile -FROM rust:1.93 AS backend-builder +FROM rust:1.96.1 AS backend-builder WORKDIR /src COPY . . RUN cargo build --release diff --git a/docs/development/unified-backends.md b/docs/development/unified-backends.md index 615c6b2de5c4..42db01aadf58 100644 --- a/docs/development/unified-backends.md +++ b/docs/development/unified-backends.md @@ -1090,7 +1090,7 @@ inside `dynamo-runtime`: ```toml [toolchain] - channel = "1.93.1" + channel = "1.96.1" ``` Older toolchains fail with `feature edition2024 is required`. diff --git a/lib/bindings/kvbm/src/block_manager/vllm/connector/leader/slot.rs b/lib/bindings/kvbm/src/block_manager/vllm/connector/leader/slot.rs index f9f4ce4037b0..6eb666388a49 100644 --- a/lib/bindings/kvbm/src/block_manager/vllm/connector/leader/slot.rs +++ b/lib/bindings/kvbm/src/block_manager/vllm/connector/leader/slot.rs @@ -1723,7 +1723,7 @@ where let block_pairs: Vec<(usize, usize)> = offload_req .block_ids .into_iter() - .zip(allocated_block_ids.into_iter()) + .zip(allocated_block_ids) .collect(); tracing::debug!( @@ -1737,10 +1737,8 @@ where let mut blocks_to_register = Vec::new(); let priorities = offload_req.priorities; - for ((mut mutable_block, token_block), priority) in blocks - .into_iter() - .zip(token_blocks.into_iter()) - .zip(priorities.into_iter()) + for ((mut mutable_block, token_block), priority) in + blocks.into_iter().zip(token_blocks).zip(priorities) { mutable_block .apply_token_block(token_block.clone()) diff --git a/lib/kv-router/src/indexer/branch_sharded.rs b/lib/kv-router/src/indexer/branch_sharded.rs index 7ca70b461e1d..22d836a81534 100644 --- a/lib/kv-router/src/indexer/branch_sharded.rs +++ b/lib/kv-router/src/indexer/branch_sharded.rs @@ -961,16 +961,21 @@ impl KvIndexerInterface for BranchShardedIndexer { let timing = { let calls = self.metrics.timing.calls.load(Ordering::Relaxed); - let avg_routing_ns = if calls > 0 { - self.metrics.timing.routing_ns.load(Ordering::Relaxed) / calls - } else { - 0 - }; - let avg_shard_us = if calls > 0 { - self.metrics.timing.shard_ns.load(Ordering::Relaxed) / calls / 1000 - } else { - 0 - }; + let avg_routing_ns = self + .metrics + .timing + .routing_ns + .load(Ordering::Relaxed) + .checked_div(calls) + .unwrap_or(0); + let avg_shard_us = self + .metrics + .timing + .shard_ns + .load(Ordering::Relaxed) + .checked_div(calls) + .unwrap_or(0) + / 1000; format!("\n avg routing = {avg_routing_ns}ns\n avg shard = {avg_shard_us}µs") }; diff --git a/lib/kv-router/src/indexer/pruning.rs b/lib/kv-router/src/indexer/pruning.rs index 774e86b1d596..ea057200ed94 100644 --- a/lib/kv-router/src/indexer/pruning.rs +++ b/lib/kv-router/src/indexer/pruning.rs @@ -580,19 +580,17 @@ impl WorkerPruneManagerInner { let mut expired = Vec::new(); loop { - let Some((Reverse(expiry), worker)) = ({ - let mut expiries = self - .next_expiries - .lock() - .expect("worker expiry index mutex poisoned"); - let Some((Reverse(expiry), _)) = expiries.peek().copied() else { - break; - }; - if expiry > now { - break; - } - expiries.pop() - }) else { + let mut expiries = self + .next_expiries + .lock() + .expect("worker expiry index mutex poisoned"); + let Some((Reverse(expiry), _)) = expiries.peek().copied() else { + break; + }; + if expiry > now { + break; + } + let Some((Reverse(expiry), worker)) = ({ expiries.pop() }) else { break; }; diff --git a/lib/kvbm-engine/CLAUDE.md b/lib/kvbm-engine/CLAUDE.md index d3d651827243..7592a87d5446 100644 --- a/lib/kvbm-engine/CLAUDE.md +++ b/lib/kvbm-engine/CLAUDE.md @@ -4,7 +4,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co ## Build & Test -This is a Rust crate (`kvbm-engine`) in the dynamo workspace. Rust edition 2024, requires rustc 1.93.1+. +This is a Rust crate (`kvbm-engine`) in the dynamo workspace. Rust edition 2024, requires rustc 1.96.1+. ```bash # Build diff --git a/lib/kvbm-engine/src/leader/session/initiator.rs b/lib/kvbm-engine/src/leader/session/initiator.rs index 272b8ced4454..3234e8f2b046 100644 --- a/lib/kvbm-engine/src/leader/session/initiator.rs +++ b/lib/kvbm-engine/src/leader/session/initiator.rs @@ -928,7 +928,7 @@ impl InitiatorSession { // Sort (block_id, seq_hash) pairs by position to ensure correct transfer order // This is a safety net in case responder sent blocks in wrong order let mut pairs: Vec<(BlockId, SequenceHash)> = - block_ids.into_iter().zip(seq_hashes.into_iter()).collect(); + block_ids.into_iter().zip(seq_hashes).collect(); pairs.sort_by_key(|(_, hash)| hash.position()); let block_ids: Vec = pairs.iter().map(|(id, _)| *id).collect(); @@ -1259,10 +1259,8 @@ impl InitiatorSession { let mut blocks = Vec::new(); // Iterate over results alongside the dst_blocks and hashes - for ((result, dst_block), seq_hash) in results - .into_iter() - .zip(dst_blocks.into_iter()) - .zip(hashes.iter()) + for ((result, dst_block), seq_hash) in + results.into_iter().zip(dst_blocks).zip(hashes.iter()) { match result { Ok(hash) => { diff --git a/lib/kvbm-engine/src/worker/group/spmd.rs b/lib/kvbm-engine/src/worker/group/spmd.rs index 628e15e8af1e..2b0ec1512bd3 100644 --- a/lib/kvbm-engine/src/worker/group/spmd.rs +++ b/lib/kvbm-engine/src/worker/group/spmd.rs @@ -151,9 +151,7 @@ impl WorkerTransfers for SpmdParallelWorkers { let mut new_handles = Vec::new(); let mut import_responses = Vec::new(); - for (worker_idx, (worker, meta)) in - self.workers.iter().zip(metadata.into_iter()).enumerate() - { + for (worker_idx, (worker, meta)) in self.workers.iter().zip(metadata).enumerate() { // Unpack to extract logical type info let unpacked = meta.unpack()?; diff --git a/lib/kvbm-physical/src/layout/config.rs b/lib/kvbm-physical/src/layout/config.rs index ac2ff740e977..6880576ad4f3 100644 --- a/lib/kvbm-physical/src/layout/config.rs +++ b/lib/kvbm-physical/src/layout/config.rs @@ -90,11 +90,7 @@ impl LayoutConfig { pub fn head_dim(&self) -> Option { self.num_heads.map(|nh| { let divisor = self.page_size * nh; - if divisor > 0 { - self.inner_dim / divisor - } else { - 0 - } + self.inner_dim.checked_div(divisor).unwrap_or(0) }) } diff --git a/lib/llm/src/block_manager/pool/managed/inactive.rs b/lib/llm/src/block_manager/pool/managed/inactive.rs index e7b208350b5f..8e0d9af8b5d4 100644 --- a/lib/llm/src/block_manager/pool/managed/inactive.rs +++ b/lib/llm/src/block_manager/pool/managed/inactive.rs @@ -711,7 +711,7 @@ pub(crate) mod tests { // Iterate through the generated TokenBlocks and the template Blocks, // setting the state and registering each one. - for (block, token_block) in blocks.iter_mut().zip(token_blocks.into_iter()) { + for (block, token_block) in blocks.iter_mut().zip(token_blocks) { assert!(block.state().is_reset()); // Start with empty blocks block.update_state(BlockState::Complete(CompleteState::new(token_block))); block @@ -779,7 +779,7 @@ pub(crate) mod tests { assert!(unmatched.state().is_reset()); } - for (unmatched, token_block) in unmatched_blocks.iter_mut().zip(token_blocks.into_iter()) { + for (unmatched, token_block) in unmatched_blocks.iter_mut().zip(token_blocks) { assert!(unmatched.state().is_reset()); unmatched.update_state(BlockState::Complete(CompleteState::new(token_block))); unmatched.register(&mut registry).unwrap(); diff --git a/lib/llm/src/preprocessor.rs b/lib/llm/src/preprocessor.rs index b19fdf6a7465..5cb3b7a12998 100644 --- a/lib/llm/src/preprocessor.rs +++ b/lib/llm/src/preprocessor.rs @@ -1124,9 +1124,7 @@ impl OpenAIPreprocessor { })) .await; - for ((type_str, _content_part), result) in - fetch_tasks.into_iter().zip(results.into_iter()) - { + for ((type_str, _content_part), result) in fetch_tasks.into_iter().zip(results) { // if one item fails, errors the whole request, other items will be cleaned up by Drop let rdma_descriptor = result?; diff --git a/lib/llm/src/protocols/openai/chat_completions/aggregator.rs b/lib/llm/src/protocols/openai/chat_completions/aggregator.rs index a26d21a1c463..4db807204379 100644 --- a/lib/llm/src/protocols/openai/chat_completions/aggregator.rs +++ b/lib/llm/src/protocols/openai/chat_completions/aggregator.rs @@ -430,7 +430,7 @@ impl DeltaAggregator { .map(dynamo_protocols::types::ChatChoice::from) .collect(); - choices.sort_by(|a, b| a.index.cmp(&b.index)); + choices.sort_by_key(|a| a.index); // Construct the final response object. let response = NvCreateChatCompletionResponse { @@ -568,8 +568,8 @@ mod tests { let tool_calls: Option = tool_calls.map(|tool_calls| serde_json::from_str(tool_calls).unwrap()); - let tool_call_chunks = if let Some(tool_calls) = tool_calls { - Some(vec![ + let tool_call_chunks = tool_calls.map(|tool_calls| { + vec![ dynamo_protocols::types::ChatCompletionMessageToolCallChunk { index: 0, id: Some("test_id".to_string()), @@ -579,10 +579,8 @@ mod tests { arguments: Some(serde_json::to_string(&tool_calls["arguments"]).unwrap()), }), }, - ]) - } else { - None - }; + ] + }); let delta = dynamo_protocols::types::ChatCompletionStreamResponseDelta { content: Some(ChatCompletionMessageContent::Text(text.to_string())), @@ -1210,7 +1208,7 @@ mod tests { // Verify the response fields assert_eq!(response.inner.choices.len(), 2); - response.inner.choices.sort_by(|a, b| a.index.cmp(&b.index)); // Ensure the choices are ordered + response.inner.choices.sort_by_key(|a| a.index); // Ensure the choices are ordered let choice0 = &response.inner.choices[0]; assert_eq!(choice0.index, 0); assert_eq!( diff --git a/lib/llm/src/protocols/openai/completions/aggregator.rs b/lib/llm/src/protocols/openai/completions/aggregator.rs index ac833ad4977d..e1ab80229b9d 100644 --- a/lib/llm/src/protocols/openai/completions/aggregator.rs +++ b/lib/llm/src/protocols/openai/completions/aggregator.rs @@ -155,7 +155,7 @@ impl DeltaAggregator { .map(dynamo_protocols::types::Choice::from) .collect(); - choices.sort_by(|a, b| a.index.cmp(&b.index)); + choices.sort_by_key(|a| a.index); let inner = dynamo_protocols::types::CreateCompletionResponse { id: aggregator.id, @@ -438,7 +438,7 @@ mod tests { // Verify the response fields assert_eq!(response.inner.choices.len(), 2); - response.inner.choices.sort_by(|a, b| a.index.cmp(&b.index)); // Ensure the choices are ordered + response.inner.choices.sort_by_key(|a| a.index); // Ensure the choices are ordered let choice0 = &response.inner.choices[0]; assert_eq!(choice0.index, 0); assert_eq!(choice0.text, "Choice 0".to_string()); diff --git a/lib/mocker/src/replay/offline/single.rs b/lib/mocker/src/replay/offline/single.rs index e16e90c46287..69abe8e5463a 100644 --- a/lib/mocker/src/replay/offline/single.rs +++ b/lib/mocker/src/replay/offline/single.rs @@ -114,25 +114,24 @@ impl SingleRuntime { fn enqueue_trace_arrivals(&mut self) { let mut ready_requests = Vec::new(); match &mut self.admission { - AdmissionSource::Requests(pending) => loop { - let Some(next_arrival_ms) = pending + AdmissionSource::Requests(pending) => { + while let Some(next_arrival_ms) = pending .front() .and_then(|request| request.arrival_timestamp_ms) - else { - break; - }; - if next_arrival_ms > self.current_time_ms { - break; - } + { + if next_arrival_ms > self.current_time_ms { + break; + } - let request = pending - .pop_front() - .expect("front request must exist when arrival is available"); - let arrival_ms = request - .arrival_timestamp_ms - .expect("trace replay requests must have an arrival timestamp"); - ready_requests.push((request, arrival_ms)); - }, + let request = pending + .pop_front() + .expect("front request must exist when arrival is available"); + let arrival_ms = request + .arrival_timestamp_ms + .expect("trace replay requests must have an arrival timestamp"); + ready_requests.push((request, arrival_ms)); + } + } AdmissionSource::Workload(driver) => { ready_requests.extend( driver @@ -356,13 +355,10 @@ mod tests { collector: &mut TraceCollector, current_time_ms: f64, ) { - loop { - let Some(next_arrival_ms) = pending - .front() - .and_then(|request| request.arrival_timestamp_ms) - else { - break; - }; + while let Some(next_arrival_ms) = pending + .front() + .and_then(|request| request.arrival_timestamp_ms) + { if next_arrival_ms > current_time_ms { break; } diff --git a/lib/mocker/src/scheduler/sglang/core.rs b/lib/mocker/src/scheduler/sglang/core.rs index 12d755b40b51..9f29f7467e6d 100644 --- a/lib/mocker/src/scheduler/sglang/core.rs +++ b/lib/mocker/src/scheduler/sglang/core.rs @@ -600,16 +600,8 @@ impl SglangCore { let prefill_fpm = admit.prefill_fpm; let batch_size = admit.can_run.len(); - let mean_isl = if batch_size > 0 { - admit.total_isl / batch_size - } else { - 0 - }; - let mean_prefix = if batch_size > 0 { - admit.total_prefix / batch_size - } else { - 0 - }; + let mean_isl = admit.total_isl.checked_div(batch_size).unwrap_or(0); + let mean_prefix = admit.total_prefix.checked_div(batch_size).unwrap_or(0); let prefill_time = simulate_prefill_duration(batch_size, mean_isl, mean_prefix, &self.config, true); diff --git a/lib/mocker/src/scheduler/sglang/decode.rs b/lib/mocker/src/scheduler/sglang/decode.rs index 22a73fe3da4f..5f97b43ddd0b 100644 --- a/lib/mocker/src/scheduler/sglang/decode.rs +++ b/lib/mocker/src/scheduler/sglang/decode.rs @@ -276,11 +276,7 @@ pub(super) fn simulate_decode_step_with_sampler( let mut output_signals = Vec::with_capacity(sampled_bursts.iter().copied().sum::()); let mut completed_indices = Vec::new(); - for (idx, (req, burst)) in running - .iter_mut() - .zip(sampled_bursts.into_iter()) - .enumerate() - { + for (idx, (req, burst)) in running.iter_mut().zip(sampled_bursts).enumerate() { for _ in 0..burst { let crossing_page_boundary = req.current_sequence_len() + 1 > req.allocated_tokens; let last_idx = req.kv_indices.last().copied(); diff --git a/lib/runtime/examples/rust-toolchain.toml b/lib/runtime/examples/rust-toolchain.toml index 535513300d5b..2d45363a5be0 100644 --- a/lib/runtime/examples/rust-toolchain.toml +++ b/lib/runtime/examples/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.93.1" +channel = "1.96.1" diff --git a/lib/runtime/examples/system_metrics/tests/integration_test.rs b/lib/runtime/examples/system_metrics/tests/integration_test.rs index 901d2e45ec3e..93a75d1a781c 100644 --- a/lib/runtime/examples/system_metrics/tests/integration_test.rs +++ b/lib/runtime/examples/system_metrics/tests/integration_test.rs @@ -9,7 +9,6 @@ use dynamo_runtime::{ }; use futures::StreamExt; use rand::Rng; -use reqwest; use system_metrics::{DEFAULT_COMPONENT, DEFAULT_ENDPOINT, DEFAULT_NAMESPACE, backend}; use tokio::time::{Duration, sleep}; diff --git a/lib/runtime/src/pipeline/network/egress/tcp_client.rs b/lib/runtime/src/pipeline/network/egress/tcp_client.rs index 360a5b860ede..ae19e88132d4 100644 --- a/lib/runtime/src/pipeline/network/egress/tcp_client.rs +++ b/lib/runtime/src/pipeline/network/egress/tcp_client.rs @@ -531,16 +531,9 @@ impl TcpConnection { total_batch_size += count as u64; if last_report.elapsed() >= Duration::from_secs(5) { - let avg_batch = if batch_count > 0 { - total_batch_size / batch_count - } else { - 0 - }; - let avg_write_ns = if batch_count > 0 { - total_batch_write_ns / batch_count - } else { - 0 - }; + let avg_batch = total_batch_size.checked_div(batch_count).unwrap_or(0); + let avg_write_ns = + total_batch_write_ns.checked_div(batch_count).unwrap_or(0); tracing::info!( batches = batch_count, avg_batch_size = avg_batch, diff --git a/lib/runtime/src/transports/nats.rs b/lib/runtime/src/transports/nats.rs index 669d6c69a8be..e935acf25e66 100644 --- a/lib/runtime/src/transports/nats.rs +++ b/lib/runtime/src/transports/nats.rs @@ -900,6 +900,7 @@ mod tests { } #[test] + #[allow(clippy::result_large_err)] fn test_client_options_builder() { Jail::expect_with(|_jail| { let opts = ClientOptions::builder().build(); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 535513300d5b..2d45363a5be0 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.93.1" +channel = "1.96.1" diff --git a/tests/parity/README.md b/tests/parity/README.md index 026412442e92..4b0d73120bcb 100644 --- a/tests/parity/README.md +++ b/tests/parity/README.md @@ -16,7 +16,7 @@ See `conformance/README.md` in frontend-crates for the full layout. Quick refere ## Running the conformance tests (from a frontend-crates checkout) -Use the repo's pinned toolchain (Rust 1.93.1 via rustup): +Use the repo's pinned toolchain (Rust 1.96.1 via rustup): ```bash # v1 batch tool-calling parity, all families: From a137bdacb5abe54ac90da1268862742e4e8d8c62 Mon Sep 17 00:00:00 2001 From: Graham King Date: Mon, 6 Jul 2026 15:21:28 -0400 Subject: [PATCH 2/2] Fix deadlock Thanks AI reviewers. We had to re-organize the code otherwise `cargo clippy` wants this to become `while let ..` which doesn't fit with the `break` statements. Signed-off-by: Graham King --- lib/kv-router/src/indexer/pruning.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/kv-router/src/indexer/pruning.rs b/lib/kv-router/src/indexer/pruning.rs index ea057200ed94..29df35a88818 100644 --- a/lib/kv-router/src/indexer/pruning.rs +++ b/lib/kv-router/src/indexer/pruning.rs @@ -593,6 +593,7 @@ impl WorkerPruneManagerInner { let Some((Reverse(expiry), worker)) = ({ expiries.pop() }) else { break; }; + drop(expiries); let (mut worker_expired, next_expiry) = { let Some(state) = self.workers.get(&worker) else {