From b0e4353aa3e3673134fb1e0eb2047c0af0636fae Mon Sep 17 00:00:00 2001
From: htiennv <tien.nv291997@gmail.com>
Date: Sun, 28 Sep 2025 13:36:08 +0000
Subject: [PATCH] Remove `once_cell` dependency from multiple Cargo.toml files
 and update usage in `validation.rs` to use `std::sync::LazyLock` instead of
 `once_cell::sync::Lazy`.

---
 Cargo.lock               | 4 ----
 backends/v2/Cargo.toml   | 1 -
 backends/v3/Cargo.toml   | 1 -
 launcher/Cargo.toml      | 1 -
 router/Cargo.toml        | 1 -
 router/src/validation.rs | 5 +++--
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cfe19dcdef3..ce2bcd580af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4716,7 +4716,6 @@ dependencies = [
  "float_eq",
  "hf-hub 0.4.2",
  "nix 0.28.0",
- "once_cell",
  "pyo3",
  "regex",
  "reqwest 0.11.27",
@@ -4754,7 +4753,6 @@ dependencies = [
  "minijinja-contrib",
  "ngrok",
  "nohash-hasher",
- "once_cell",
  "opentelemetry 0.20.0",
  "opentelemetry-otlp",
  "outlines-core",
@@ -4820,7 +4818,6 @@ dependencies = [
  "minijinja",
  "minijinja-contrib",
  "nohash-hasher",
- "once_cell",
  "opentelemetry 0.20.0",
  "opentelemetry-otlp",
  "prost 0.12.6",
@@ -4871,7 +4868,6 @@ dependencies = [
  "minijinja",
  "minijinja-contrib",
  "nohash-hasher",
- "once_cell",
  "opentelemetry 0.20.0",
  "opentelemetry-otlp",
  "prost 0.12.6",
diff --git a/backends/v2/Cargo.toml b/backends/v2/Cargo.toml
index 0decf41ad0d..0f727d3f348 100644
--- a/backends/v2/Cargo.toml
+++ b/backends/v2/Cargo.toml
@@ -57,7 +57,6 @@ minijinja = { workspace = true }
 minijinja-contrib = { workspace = true }
 futures-util = "0.3.30"
 regex = "1.10.3"
-once_cell = "1.19.0"
 image = "0.25.1"
 base64 = { workspace = true }
 prost = "^0.12"
diff --git a/backends/v3/Cargo.toml b/backends/v3/Cargo.toml
index 588a2716fe1..1ba201b8563 100644
--- a/backends/v3/Cargo.toml
+++ b/backends/v3/Cargo.toml
@@ -57,7 +57,6 @@ minijinja = { workspace = true }
 minijinja-contrib = { workspace = true }
 futures-util = "0.3.30"
 regex = "1.10.3"
-once_cell = "1.19.0"
 image = "0.25.1"
 base64 = { workspace = true }
 prost = "^0.12"
diff --git a/launcher/Cargo.toml b/launcher/Cargo.toml
index 2d2571ce257..eb6a173f406 100644
--- a/launcher/Cargo.toml
+++ b/launcher/Cargo.toml
@@ -11,7 +11,6 @@ clap = { version = "4.4.5", features = ["derive", "env"] }
 ctrlc = { version = "3.4.1", features = ["termination"] }
 hf-hub = "0.4.2"
 nix = { version = "0.28.0", features = ["signal"] }
-once_cell = "1.19.0"
 pyo3 = { workspace = true }
 serde = { version = "1.0.188", features = ["derive"] }
 serde_json = "1.0.107"
diff --git a/router/Cargo.toml b/router/Cargo.toml
index 9326258daa2..e64566f86b4 100644
--- a/router/Cargo.toml
+++ b/router/Cargo.toml
@@ -52,7 +52,6 @@ minijinja = { workspace = true, features = ["loop_controls"] }
 minijinja-contrib = { workspace = true }
 futures-util = "0.3.30"
 regex = "1.10.3"
-once_cell = "1.19.0"
 image = "0.25.1"
 base64 = { workspace = true }
 sysinfo = "0.30.13"
diff --git a/router/src/validation.rs b/router/src/validation.rs
index 7717f373e4f..47ae0cdebcf 100644
--- a/router/src/validation.rs
+++ b/router/src/validation.rs
@@ -20,7 +20,8 @@ use tokio::sync::mpsc;
 use tokio::sync::oneshot;
 use tracing::warn;
 use tracing::{instrument, Span};
-use {once_cell::sync::Lazy, regex::Regex};
+use regex::Regex;
+use std::sync::LazyLock;
 
 static DEFAULT_GENERATION_LENGTH: u32 = 1024;
 
@@ -789,7 +790,7 @@ fn prepare_input<T: TokenizerTrait>(
     preprocessor_config: Option<&HubPreprocessorConfig>,
 ) -> Result<(tokenizers::Encoding, Vec<Chunk>), ValidationError> {
     use Config::*;
-    static RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"!\[\]\([^\)]*\)").unwrap());
+    static RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"!\[\]\([^\)]*\)").unwrap());
     let (tokenizer_query, input_chunks) = match config {
         Some(
             config @ (Idefics | Mllama | Idefics2(_) | Idefics3(_) | Gemma3(_) | Llama4(_)