From d3faa5ed874736b1c84b3dbbdd7aa6fe5f1b3d2b Mon Sep 17 00:00:00 2001
From: Falk Woldmann <52786457+FalkWoldmann@users.noreply.github.com>
Date: Wed, 24 Sep 2025 21:44:18 +0200
Subject: [PATCH 1/3] Remove unused dependencies

---
 Cargo.lock            | 95 -------------------------------------------
 Cargo.toml            | 14 +------
 benchmarks/Cargo.lock |  5 ---
 3 files changed, 1 insertion(+), 113 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7832890bd..2a8bd992c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -837,17 +837,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "ctrlc"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881c5d0a13b2f1498e2306e82cbada78390e152d4b1378fb28a84f4dcd0dc4f3"
-dependencies = [
- "dispatch",
- "nix",
- "windows-sys 0.61.0",
-]
-
 [[package]]
 name = "darling"
 version = "0.21.3"
@@ -970,12 +959,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -2040,11 +2023,9 @@ version = "3.3.0"
 dependencies = [
  "anyhow",
  "approx",
- "async-trait",
  "aws-config",
  "aws-credential-types",
  "aws-sigv4",
- "aws-types",
  "backtrace",
  "base64 0.13.1",
  "bitflags 1.3.2",
@@ -2052,14 +2033,12 @@ dependencies = [
  "bson 3.0.0",
  "chrono",
  "cross-krb5",
- "ctrlc",
  "derive-where",
  "derive_more",
  "flate2",
  "function_name",
  "futures",
  "futures-core",
- "futures-executor",
  "futures-io",
  "futures-util",
  "hex",
@@ -2108,9 +2087,7 @@ dependencies = [
  "tokio",
  "tokio-openssl",
  "tokio-rustls",
- "tokio-util",
  "tracing",
- "tracing-subscriber",
  "typed-builder",
  "uuid",
  "webpki-roots 0.26.11",
@@ -2145,18 +2122,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "nix"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
-dependencies = [
- "bitflags 2.9.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -2173,15 +2138,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nu-ansi-term"
-version = "0.50.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -3100,15 +3056,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -3344,15 +3291,6 @@ dependencies = [
  "syn 2.0.101",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "time"
 version = "0.3.44"
@@ -3499,7 +3437,6 @@ checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
 dependencies = [
  "bytes",
  "futures-core",
- "futures-io",
  "futures-sink",
  "pin-project-lite",
  "tokio",
@@ -3604,32 +3541,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
-dependencies = [
- "nu-ansi-term",
- "sharded-slab",
- "smallvec 1.15.0",
- "thread_local",
- "tracing-core",
- "tracing-log",
 ]
 
 [[package]]
@@ -3733,12 +3644,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "valuable"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
diff --git a/Cargo.toml b/Cargo.toml
index 4c199e2e2..9a74d90c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,7 @@ dns-resolver = ["dep:hickory-resolver", "dep:hickory-proto"]
 cert-key-password = ["dep:pem", "dep:pkcs8"]
 
 # Enable support for MONGODB-AWS authentication.
-aws-auth = ["dep:aws-config", "dep:aws-types", "dep:aws-credential-types", "dep:aws-sigv4", "dep:http"]
+aws-auth = ["dep:aws-config", "dep:aws-credential-types", "dep:aws-sigv4", "dep:http"]
 
 # Enable support for on-demand Azure KMS credentials.
 azure-kms = ["dep:reqwest"]
@@ -73,7 +73,6 @@ in-use-encryption-unstable = ["in-use-encryption"]
 tracing-unstable = ["dep:tracing", "dep:log", "bson3?/serde_json-1"]
 
 [dependencies]
-async-trait = "0.1.42"
 base64 = "0.13.0"
 bitflags = "1.1.0"
 chrono = { version = "0.4.7", default-features = false, features = [
@@ -86,7 +85,6 @@ flate2 = { version = "1.0", optional = true }
 futures-io = "0.3.21"
 futures-core = "0.3.14"
 futures-util = { version = "0.3.14", features = ["io"] }
-futures-executor = "0.3.14"
 hex = "0.4.0"
 hickory-proto = { version = "0.24.2", optional = true }
 hickory-resolver = { version = "0.24.2", optional = true }
@@ -126,10 +124,6 @@ optional = true
 default-features = false
 features = ["default-https-client", "rt-tokio"]
 
-[dependencies.aws-types]
-version = "1.3.7"
-optional = true
-default-features = false
 
 [dependencies.aws-credential-types]
 version = "1.2.4"
@@ -202,10 +196,6 @@ optional = true
 default-features = false
 features = ["logging", "ring", "tls12"]
 
-[dependencies.tokio-util]
-version = "0.7.0"
-features = ["io", "compat"]
-
 [dependencies.uuid]
 version = "1.1.2"
 features = ["v4"]
@@ -214,7 +204,6 @@ features = ["v4"]
 anyhow = { version = "1.0", features = ["backtrace"] }
 approx = "0.5.1"
 backtrace = { version = "0.3.68" }
-ctrlc = "3.2.2"
 function_name = "0.2.1"
 futures = "0.3"
 hex = "0.4"
@@ -227,7 +216,6 @@ serde_json = "1.0.64"
 semver = "1.0.0"
 time = "0.3.9"
 tokio = { version = ">= 0.0.0", features = ["fs", "parking_lot"] }
-tracing-subscriber = "0.3.16"
 regex = "1.6.0"
 reqwest = { version = "0.12.2", features = ["rustls-tls"] }
 serde-hex = "0.1.0"
diff --git a/benchmarks/Cargo.lock b/benchmarks/Cargo.lock
index cd472004a..4888a65a3 100644
--- a/benchmarks/Cargo.lock
+++ b/benchmarks/Cargo.lock
@@ -1088,7 +1088,6 @@ source = "git+https://github.com/mongodb/libmongocrypt-rust.git?branch=main#1327
 name = "mongodb"
 version = "3.3.0"
 dependencies = [
- "async-trait",
  "base64 0.13.1",
  "bitflags 1.3.2",
  "bson",
@@ -1096,7 +1095,6 @@ dependencies = [
  "derive-where",
  "derive_more",
  "futures-core",
- "futures-executor",
  "futures-io",
  "futures-util",
  "hex",
@@ -1114,7 +1112,6 @@ dependencies = [
  "rustls",
  "rustversion",
  "serde",
- "serde_bytes",
  "serde_with",
  "sha1",
  "sha2",
@@ -1125,7 +1122,6 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-rustls",
- "tokio-util",
  "typed-builder",
  "uuid",
  "webpki-roots 0.26.11",
@@ -1905,7 +1901,6 @@ checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
- "futures-io",
  "futures-sink",
  "pin-project-lite",
  "tokio",

From 3cae912dc6e8c1dee3b05b7a47cceb6a5afdb924 Mon Sep 17 00:00:00 2001
From: Falk Woldmann <52786457+FalkWoldmann@users.noreply.github.com>
Date: Thu, 25 Sep 2025 17:37:58 +0200
Subject: [PATCH 2/3] Re-add tokio-util dependency since it's needed for
 doctests

---
 Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Cargo.toml b/Cargo.toml
index 9a74d90c7..b966d9b3b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -220,6 +220,7 @@ regex = "1.6.0"
 reqwest = { version = "0.12.2", features = ["rustls-tls"] }
 serde-hex = "0.1.0"
 serde_path_to_error = "0.1"
+tokio-util = {version = "0.7.0", features = ["io", "compat"] }
 
 [dev-dependencies.bson3]
 git = "https://github.com/mongodb/bson-rust"

From 338ff8ef11fd0c9f3307ba9855d08d9f00e2841b Mon Sep 17 00:00:00 2001
From: Falk Woldmann <52786457+FalkWoldmann@users.noreply.github.com>
Date: Fri, 26 Sep 2025 22:49:30 +0200
Subject: [PATCH 3/3] Make tokio-util a normal dependency again and remove
 unneeded feature

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index b966d9b3b..d72b373b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -117,6 +117,7 @@ webpki-roots = "0.26"
 zstd = { version = "0.11.2", optional = true }
 macro_magic = "0.5.1"
 rustversion = "1.0.20"
+tokio-util = { version = "0.7.0", features = ["compat"] }
 
 [dependencies.aws-config]
 version = "1"
@@ -220,7 +221,6 @@ regex = "1.6.0"
 reqwest = { version = "0.12.2", features = ["rustls-tls"] }
 serde-hex = "0.1.0"
 serde_path_to_error = "0.1"
-tokio-util = {version = "0.7.0", features = ["io", "compat"] }
 
 [dev-dependencies.bson3]
 git = "https://github.com/mongodb/bson-rust"