From cb402f074cfbd33156105e3170f97ec8d995aee2 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Mon, 13 Jan 2025 23:06:16 +0100
Subject: [PATCH] fix: remove duplicated redis dependencies

---
 Cargo.lock | 55 ++----------------------------------------------------
 Cargo.toml |  5 +++--
 2 files changed, 5 insertions(+), 55 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9836761..ff66e5f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -24,7 +24,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -57,7 +56,6 @@ dependencies = [
  "envy",
  "metrics",
  "metrics-exporter-prometheus",
- "redis 0.27.6",
  "redis-macros",
  "regex",
  "reqwest 0.12.12",
@@ -208,7 +206,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3428672918816ef7533c206902630ccaceebf69ca8831a30c18eacf5cb619070"
 dependencies = [
  "bb8",
- "redis 0.28.1",
+ "redis",
 ]
 
 [[package]]
@@ -358,12 +356,6 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.34"
@@ -756,15 +748,6 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -1158,31 +1141,6 @@ dependencies = [
  "bitflags 2.6.0",
 ]
 
-[[package]]
-name = "redis"
-version = "0.27.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d8f99a4090c89cc489a94833c901ead69bfbf3877b4867d5482e321ee875bc"
-dependencies = [
- "ahash",
- "arc-swap",
- "async-trait",
- "bytes",
- "combine",
- "futures-util",
- "itertools",
- "itoa",
- "num-bigint",
- "percent-encoding",
- "pin-project-lite",
- "ryu",
- "sha1_smol",
- "socket2",
- "tokio",
- "tokio-util",
- "url",
-]
-
 [[package]]
 name = "redis"
 version = "0.28.1"
@@ -1209,10 +1167,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f102a93c3cd3f779677fe128cec47a963c9743f8d26fa338efd366f92e248bc"
 dependencies = [
- "redis 0.27.6",
  "redis-macros-derive",
- "serde",
- "serde_json",
 ]
 
 [[package]]
@@ -1619,12 +1574,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "sha1_smol"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
-
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
diff --git a/Cargo.toml b/Cargo.toml
index 8373b81..740c671 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,8 +14,9 @@ dotenvy = "0.15.7"
 envy = "0.4.2"
 metrics = "0.24.1"
 metrics-exporter-prometheus = { version = "0.16.1", default-features = false }
-redis = { version = "0.27.6", features = ["ahash", "tokio-comp"] }
-redis-macros = "0.4.3"
+redis-macros = { version = "0.4.3", default-features = false, features = [
+    "macros",
+] }
 regex = "1.11.1"
 reqwest = { version = "0.12.12", default-features = false, features = [
     "http2",