chore: Rust to 1.89 and edition 2024 (#2659)

Signed-off-by: Jason Zhou <jasonzho@jasonzho-mlt.client.nvidia.com>

Author: grahamking

Cargo.toml

@@ -18,7 +18,7 @@ resolver = "3"
 
 [workspace.package]
 version = "0.4.1"
-edition = "2021"
+edition = "2024"
 description = "Dynamo Inference Framework"
 authors = ["NVIDIA Inc. <sw-dl-dynamo@nvidia.com>"]
 license = "Apache-2.0"

Earthfile

@@ -91,13 +91,13 @@ rust-base:
     ENV RUSTUP_HOME=/usr/local/rustup
     ENV CARGO_HOME=/usr/local/cargo
     ENV PATH=/usr/local/cargo/bin:$PATH
-    ENV RUST_VERSION=1.87.0
+    ENV RUST_VERSION=1.89.0
     ENV RUSTARCH=x86_64-unknown-linux-gnu
 
     RUN wget --tries=3 --waitretry=5 "https://static.rust-lang.org/rustup/archive/1.28.1/x86_64-unknown-linux-gnu/rustup-init" && \
         echo "a3339fb004c3d0bb9862ba0bce001861fe5cbde9c10d16591eb3f39ee6cd3e7f *rustup-init" | sha256sum -c - && \
         chmod +x rustup-init && \
-        ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.87.0 --default-host x86_64-unknown-linux-gnu && \
+        ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.89.0 --default-host x86_64-unknown-linux-gnu && \
         rm rustup-init && \
         chmod -R a+w $RUSTUP_HOME $CARGO_HOME
 

components/metrics/src/bin/mock_worker.rs

@@ -14,25 +14,25 @@
 // limitations under the License.
 
 use dynamo_llm::kv_router::{
+    KV_HIT_RATE_SUBJECT,
     protocols::{ForwardPassMetrics, KvStats, WorkerStats},
     scheduler::KVHitRateEvent,
-    KV_HIT_RATE_SUBJECT,
 };
 use dynamo_runtime::{
-    component::{service::EndpointStats, Namespace},
+    DistributedRuntime, Result, Runtime, Worker,
+    component::{Namespace, service::EndpointStats},
     logging,
     pipeline::{
-        async_trait, network::Ingress, AsyncEngine, AsyncEngineContextProvider, Error, ManyOut,
-        ResponseStream, SingleIn,
+        AsyncEngine, AsyncEngineContextProvider, Error, ManyOut, ResponseStream, SingleIn,
+        async_trait, network::Ingress,
     },
     protocols::annotated::Annotated,
     stream,
     traits::events::EventPublisher,
-    DistributedRuntime, Result, Runtime, Worker,
 };
 use rand::Rng;
 use std::sync::Arc;
-use tokio::time::{interval, Duration};
+use tokio::time::{Duration, interval};
 
 fn main() -> Result<()> {
     logging::init();

components/metrics/src/lib.rs

@@ -76,8 +76,8 @@
 //!     Ok(())
 //! }
 
-use axum::{routing::get, Router};
-use prometheus::{register_counter_vec, register_gauge_vec, Encoder, TextEncoder};
+use axum::{Router, routing::get};
+use prometheus::{Encoder, TextEncoder, register_counter_vec, register_gauge_vec};
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
@@ -88,7 +88,7 @@ use dynamo_llm::kv_router::scoring::Endpoint;
 use dynamo_llm::kv_router::scoring::ProcessedEndpoints;
 
 use dynamo_runtime::{
-    distributed::Component, error, service::EndpointInfo, utils::Duration, Result,
+    Result, distributed::Component, error, service::EndpointInfo, utils::Duration,
 };
 
 /// Configuration for metrics collection mode

components/metrics/src/main.rs

@@ -27,21 +27,20 @@
 //!   - ISL Blocks: Cumulative count of total blocks in all KV hit rate events
 //!   - Overlap Blocks: Cumulative count of blocks that were already in the KV cache
 use clap::Parser;
-use dynamo_llm::kv_router::scheduler::KVHitRateEvent;
 use dynamo_llm::kv_router::KV_HIT_RATE_SUBJECT;
+use dynamo_llm::kv_router::scheduler::KVHitRateEvent;
 use dynamo_runtime::{
-    error, logging,
+    DistributedRuntime, ErrorContext, Result, Runtime, Worker, error, logging,
     traits::events::{EventPublisher, EventSubscriber},
     utils::{Duration, Instant},
-    DistributedRuntime, ErrorContext, Result, Runtime, Worker,
 };
 use futures::stream::StreamExt;
 use std::sync::Arc;
 
 // Import from our library
 use metrics::{
-    collect_endpoints, extract_metrics, postprocess_metrics, LLMWorkerLoadCapacityConfig,
-    MetricsMode, PrometheusMetricsCollector,
+    LLMWorkerLoadCapacityConfig, MetricsMode, PrometheusMetricsCollector, collect_endpoints,
+    extract_metrics, postprocess_metrics,
 };
 
 /// CLI arguments for the metrics application
@@ -274,7 +273,7 @@ mod tests {
 
     #[test]
     fn test_namespace_from_env() {
-        env::set_var("DYN_NAMESPACE", "test-namespace");
+        unsafe { env::set_var("DYN_NAMESPACE", "test-namespace") };
         let args = Args::parse_from(["count", "--component", "comp", "--endpoint", "end"]);
         assert_eq!(args.namespace, "test-namespace");
     }

components/router/src/main.rs

@@ -26,13 +26,13 @@ use std::sync::Arc;
 use clap::Parser;
 
 use dynamo_llm::kv_router::{
+    KvRouter, WorkerSelector,
     protocols::WorkerSelectionResult,
     scheduler::{DefaultWorkerSelector, KvSchedulerError, SchedulingRequest},
-    KvRouter, WorkerSelector,
 };
 use dynamo_llm::local_model::runtime_config::ModelRuntimeConfig;
 use dynamo_runtime::{
-    logging, pipeline::network::Ingress, DistributedRuntime, Result, Runtime, Worker,
+    DistributedRuntime, Result, Runtime, Worker, logging, pipeline::network::Ingress,
 };
 
 #[derive(Parser)]

container/Dockerfile

@@ -53,7 +53,7 @@ COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.87.0
+    RUST_VERSION=1.89.0
 
 WORKDIR /opt/dynamo
 

container/Dockerfile.kvbm

@@ -220,7 +220,7 @@ RUN apt update -y && \
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.87.0
+    RUST_VERSION=1.89.0
 
 # Define Rust target based on ARCH_ALT ARG
 ARG RUSTARCH=${ARCH_ALT}-unknown-linux-gnu

container/Dockerfile.sglang

@@ -212,7 +212,7 @@ RUN apt update -y && \
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.87.0
+    RUST_VERSION=1.89.0
 
 # Define Rust target based on ARCH_ALT ARG
 ARG RUSTARCH=${ARCH_ALT}-unknown-linux-gnu

container/Dockerfile.sglang-wideep

@@ -1,17 +1,5 @@
 # SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
 ARG SGLANG_IMAGE_TAG="v0.5.0rc2-cu126"
 
@@ -23,7 +11,7 @@ ARG ARCH_ALT="x86_64"
 ARG NIXL_UCX_REF="v1.19.0"
 ARG NIXL_TAG="0.5.0"
 ARG CMAKE_VERSION="3.31.8"
-ARG RUST_VERSION="1.87.0"
+ARG RUST_VERSION="1.89.0"
 ARG CARGO_BUILD_JOBS="16"
 
 RUN apt-get update -y && \