From b3f8118f0e6072382f9ceef229c87fdbd1ea1398 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sun, 18 Jan 2026 13:19:08 +0000
Subject: [PATCH] Re-export itertools from tuwunel_core crate.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 Cargo.lock                           | 3 ---
 src/api/Cargo.toml                   | 1 -
 src/api/server/send.rs               | 2 +-
 src/core/mod.rs                      | 1 +
 src/database/Cargo.toml              | 1 -
 src/database/engine/open.rs          | 5 +++--
 src/service/Cargo.toml               | 1 -
 src/service/migrations.rs            | 2 +-
 src/service/rooms/state_cache/via.rs | 2 +-
 9 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1e318fdc..802e050d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5151,7 +5151,6 @@ dependencies = [
  "http-body-util",
  "hyper",
  "ipaddress",
- "itertools 0.14.0",
  "log",
  "rand 0.8.5",
  "reqwest",
@@ -5237,7 +5236,6 @@ dependencies = [
  "criterion",
  "ctor",
  "futures",
- "itertools 0.14.0",
  "log",
  "minicbor",
  "minicbor-serde",
@@ -5309,7 +5307,6 @@ dependencies = [
  "http",
  "image",
  "ipaddress",
- "itertools 0.14.0",
  "ldap3",
  "log",
  "loole",
diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml
index 4914d8c3..a9f1c9b3 100644
--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@@ -88,7 +88,6 @@ http.workspace = true
 http-body-util.workspace = true
 hyper.workspace = true
 ipaddress.workspace = true
-itertools.workspace = true
 log.workspace = true
 rand.workspace = true
 reqwest.workspace = true
diff --git a/src/api/server/send.rs b/src/api/server/send.rs
index a0204da4..5e629080 100644
--- a/src/api/server/send.rs
+++ b/src/api/server/send.rs
@@ -3,7 +3,6 @@ use std::{collections::BTreeMap, net::IpAddr, time::Instant};
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
 use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
-use itertools::Itertools;
 use ruma::{
 	CanonicalJsonObject, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId, ServerName, UserId,
 	api::{
@@ -25,6 +24,7 @@ use tuwunel_core::{
 	Err, Error, Result, debug,
 	debug::INFO_SPAN_LEVEL,
 	debug_warn, err, error,
+	itertools::Itertools,
 	result::LogErr,
 	trace,
 	utils::{
diff --git a/src/core/mod.rs b/src/core/mod.rs
index fcda4f8c..9894a0b5 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -14,6 +14,7 @@ pub mod utils;
 
 pub use ::arrayvec;
 pub use ::http;
+pub use ::itertools;
 pub use ::jsonwebtoken as jwt;
 pub use ::ruma;
 pub use ::smallstr;
diff --git a/src/database/Cargo.toml b/src/database/Cargo.toml
index f1bd0bfa..89c63ca9 100644
--- a/src/database/Cargo.toml
+++ b/src/database/Cargo.toml
@@ -57,7 +57,6 @@ async-channel.workspace = true
 const-str.workspace = true
 ctor.workspace = true
 futures.workspace = true
-itertools.workspace = true
 log.workspace = true
 minicbor.workspace = true
 minicbor-serde.workspace = true
diff --git a/src/database/engine/open.rs b/src/database/engine/open.rs
index 12e8ce98..5491cfc2 100644
--- a/src/database/engine/open.rs
+++ b/src/database/engine/open.rs
@@ -4,9 +4,10 @@ use std::{
 	sync::{Arc, atomic::AtomicU32},
 };
 
-use itertools::Itertools;
 use rocksdb::{ColumnFamilyDescriptor, Options};
-use tuwunel_core::{Result, debug, debug_warn, implement, info, trace, warn};
+use tuwunel_core::{
+	Result, debug, debug_warn, implement, info, itertools::Itertools, trace, warn,
+};
 
 use super::{
 	Db, Engine, cf_opts::cf_options, context, db_opts::db_options, descriptor,
diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml
index b44af77c..78fd9b6d 100644
--- a/src/service/Cargo.toml
+++ b/src/service/Cargo.toml
@@ -97,7 +97,6 @@ http.workspace = true
 image.workspace = true
 image.optional = true
 ipaddress.workspace = true
-itertools.workspace = true
 ldap3.workspace = true
 ldap3.optional = true
 log.workspace = true
diff --git a/src/service/migrations.rs b/src/service/migrations.rs
index e41162e3..fd5c3e6a 100644
--- a/src/service/migrations.rs
+++ b/src/service/migrations.rs
@@ -1,7 +1,6 @@
 use std::cmp;
 
 use futures::{FutureExt, StreamExt};
-use itertools::Itertools;
 use ruma::{
 	OwnedUserId, RoomId, UserId,
 	events::{
@@ -11,6 +10,7 @@ use ruma::{
 };
 use tuwunel_core::{
 	Err, Result, debug, debug_info, debug_warn, error, info,
+	itertools::Itertools,
 	matrix::PduCount,
 	result::NotFound,
 	utils::{
diff --git a/src/service/rooms/state_cache/via.rs b/src/service/rooms/state_cache/via.rs
index 5c6a2171..94341107 100644
--- a/src/service/rooms/state_cache/via.rs
+++ b/src/service/rooms/state_cache/via.rs
@@ -1,5 +1,4 @@
 use futures::{Stream, StreamExt, stream::iter};
-use itertools::Itertools;
 use ruma::{
 	OwnedServerName, RoomId, ServerName,
 	events::{StateEventType, room::power_levels::RoomPowerLevelsEventContent},
@@ -7,6 +6,7 @@ use ruma::{
 };
 use tuwunel_core::{
 	Result, implement,
+	itertools::Itertools,
 	utils::{StreamTools, stream::TryIgnore},
 	warn,
 };